[Bf-blender-cvs] [fa32cde] master: BMesh: boolean wasn't ignoring hidden faces
Campbell Barton
noreply at git.blender.org
Fri Dec 11 14:59:34 CET 2015
Commit: fa32cde8a82c2c1b3ada9387f5833586a42a4965
Author: Campbell Barton
Date: Sat Dec 12 00:51:45 2015 +1100
Branches: master
https://developer.blender.org/rBfa32cde8a82c2c1b3ada9387f5833586a42a4965
BMesh: boolean wasn't ignoring hidden faces
Needed for editmode use
===================================================================
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 3398422..5ff0fcd 100644
--- a/source/blender/bmesh/tools/bmesh_intersect.c
+++ b/source/blender/bmesh/tools/bmesh_intersect.c
@@ -1554,7 +1554,12 @@ bool BM_mesh_intersect(
BMFace *f = ftable[groups_array[fg]];
float co[3];
int hits;
- int side = test_fn(f, user_data) == 0;
+ int side = test_fn(f, user_data);
+
+ if (side == -1) {
+ continue;
+ }
+ BLI_assert(ELEM(side, 0, 1));
// BM_face_calc_center_mean(f, co);
BM_face_calc_point_in_face(f, co);
More information about the Bf-blender-cvs
mailing list