[Bf-blender-cvs] [6822102] bmesh-boolean-experiment: Intersect operator was performing boolean, also correct NULL pointer free

Campbell Barton noreply at git.blender.org
Thu Nov 26 01:30:37 CET 2015


Commit: 68221027de5b41dd3a83e1f7e9fef609a8823015
Author: Campbell Barton
Date:   Thu Nov 26 11:24:08 2015 +1100
Branches: bmesh-boolean-experiment
https://developer.blender.org/rB68221027de5b41dd3a83e1f7e9fef609a8823015

Intersect operator was performing boolean, also correct NULL pointer free

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

M	source/blender/bmesh/tools/bmesh_intersect.c
M	source/blender/editors/mesh/editmesh_intersect.c

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

diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c
index f69a7b6..9ddc8aa 100644
--- a/source/blender/bmesh/tools/bmesh_intersect.c
+++ b/source/blender/bmesh/tools/bmesh_intersect.c
@@ -1666,9 +1666,9 @@ bool BM_mesh_intersect(
 		}
 	}
 
-	MEM_freeN(looptri_coords);
-
 	if (boolean_mode != BOOLEAN_NONE) {
+		MEM_freeN(looptri_coords);
+
 		/* no booleans, just free immediate */
 		BLI_bvhtree_free(tree_a);
 		if (tree_a != tree_b) {
diff --git a/source/blender/editors/mesh/editmesh_intersect.c b/source/blender/editors/mesh/editmesh_intersect.c
index 34989df..72783fe 100644
--- a/source/blender/editors/mesh/editmesh_intersect.c
+++ b/source/blender/editors/mesh/editmesh_intersect.c
@@ -124,7 +124,7 @@ static int edbm_intersect_exec(bContext *C, wmOperator *op)
 	        em->looptris, em->tottri,
 	        test_fn, NULL,
 	        use_self, use_separate, false,
-	        0,
+	        -1,
 	        eps);




More information about the Bf-blender-cvs mailing list