[Bf-blender-cvs] [f740b68] bmesh-boolean-experiment: Perform boolean test even when theres no intersections

Campbell Barton noreply at git.blender.org
Fri Nov 27 06:54:55 CET 2015


Commit: f740b68073e3c6b1e237a7eeaf0d2a07f12e4fda
Author: Campbell Barton
Date:   Fri Nov 27 16:40:33 2015 +1100
Branches: bmesh-boolean-experiment
https://developer.blender.org/rBf740b68073e3c6b1e237a7eeaf0d2a07f12e4fda

Perform boolean test even when theres no intersections

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

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

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

diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c
index dd551be..fe96c34 100644
--- a/source/blender/bmesh/tools/bmesh_intersect.c
+++ b/source/blender/bmesh/tools/bmesh_intersect.c
@@ -1594,9 +1594,10 @@ bool BM_mesh_intersect(
 	(void)use_separate;
 #endif  /* USE_SEPARATE */
 
-	if ((boolean_mode != BOOLEAN_NONE) && BLI_gset_size(s.wire_edges)) {
+	if ((boolean_mode != BOOLEAN_NONE)) {
 
-		{
+		/* any intersections? */
+		if (BLI_gset_size(s.wire_edges)) {
 			GSetIterator gs_iter;
 
 			/* TODO, avoid calling? */




More information about the Bf-blender-cvs mailing list