[Bf-blender-cvs] [8ea588043ce] newboolean: Regression tests 0-25 all pass.

Howard Trickey noreply at git.blender.org
Mon Dec 2 15:05:37 CET 2019


Commit: 8ea588043ce15f7c5af940959121255cc2932d1f
Author: Howard Trickey
Date:   Wed Nov 6 09:17:25 2019 -0500
Branches: newboolean
https://developer.blender.org/rB8ea588043ce15f7c5af940959121255cc2932d1f

Regression tests 0-25 all pass.

Code was working but had commented out actual apply of meshchange.

===================================================================

M	source/blender/bmesh/tools/bmesh_boolean.c

===================================================================

diff --git a/source/blender/bmesh/tools/bmesh_boolean.c b/source/blender/bmesh/tools/bmesh_boolean.c
index 05bf2c4a5a2..5c90affc5f0 100644
--- a/source/blender/bmesh/tools/bmesh_boolean.c
+++ b/source/blender/bmesh/tools/bmesh_boolean.c
@@ -3370,7 +3370,7 @@ static double generalized_winding_number(BoolState *bs, int side, const double c
   double p1[3], p2[3], p3[3], a[3], b[3], c[3], bxc[3];
   double alen, blen, clen, num, denom, t, x;
 #  ifdef BOOLDEBUG
-  int dbg_level = 1;
+  int dbg_level = 0;
 
   if (dbg_level > 0) {
     printf("generalized_winding_number, side=%d, co=(%f,%f,%f)\n", side, F3(co));
@@ -3472,7 +3472,7 @@ static void do_boolean_op(BoolState *bs, const int boolean_mode)
   bool do_remove, do_flip, inside;
   MeshChange meshchange;
 #  ifdef BOOLDEBUG
-  bool dbg_level = 1;
+  bool dbg_level = 0;
 
   if (dbg_level > 0) {
     printf("\nDO_BOOLEAN_OP, boolean_mode=%d\n\n", boolean_mode);
@@ -3575,7 +3575,7 @@ static void do_boolean_op(BoolState *bs, const int boolean_mode)
   }
 #  endif
 
-  // apply_meshchange_to_imesh(&bs->im, &meshchange);
+  apply_meshchange_to_imesh(&bs->im, &meshchange);
   MEM_freeN(group_index);
 }



More information about the Bf-blender-cvs mailing list