From 06dac0a453208a81ea6386aa2c648d096f6b6366 Mon Sep 17 00:00:00 2001 From: Howard Trickey Date: Sun, 8 Nov 2020 08:39:01 -0500 Subject: Fix T81651, exact boolean modifier incorrect if operand hidden. The code was trying to ignore hidden geometry when doing boolean, which is correct when used as a tool, but not when a modifier. Added a "keep_hidden" argument to bmesh_boolean to distinguish the two cases. Also fixed a bug when the tool is used with hidden geometry that is attached to unhidden geometry that is deleted by the operation. --- source/blender/editors/mesh/editmesh_intersect.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/mesh') diff --git a/source/blender/editors/mesh/editmesh_intersect.c b/source/blender/editors/mesh/editmesh_intersect.c index 528ad57b9bf..2083c52b885 100644 --- a/source/blender/editors/mesh/editmesh_intersect.c +++ b/source/blender/editors/mesh/editmesh_intersect.c @@ -205,8 +205,15 @@ static int edbm_intersect_exec(bContext *C, wmOperator *op) if (exact) { int nshapes = use_self ? 1 : 2; - has_isect = BM_mesh_boolean_knife( - em->bm, em->looptris, em->tottri, test_fn, NULL, nshapes, use_self, use_separate_all); + has_isect = BM_mesh_boolean_knife(em->bm, + em->looptris, + em->tottri, + test_fn, + NULL, + nshapes, + use_self, + use_separate_all, + true); } else { has_isect = BM_mesh_intersect(em->bm, @@ -374,7 +381,7 @@ static int edbm_intersect_boolean_exec(bContext *C, wmOperator *op) if (use_exact) { has_isect = BM_mesh_boolean( - em->bm, em->looptris, em->tottri, test_fn, NULL, 2, use_self, boolean_operation); + em->bm, em->looptris, em->tottri, test_fn, NULL, 2, use_self, true, boolean_operation); } else { has_isect = BM_mesh_intersect(em->bm, -- cgit v1.2.3