diff options
| author | Howard Trickey <howard.trickey@gmail.com> | 2020-09-13 23:57:27 +0300 |
|---|---|---|
| committer | Howard Trickey <howard.trickey@gmail.com> | 2020-09-13 23:57:27 +0300 |
| commit | ab7608af1bd40548cb79a0312f318a32d2fe8596 (patch) | |
| tree | 7c547603b7c8de350044aaf4c237d1f0f630caa5 /source/blender/editors/mesh/editmesh_intersect.c | |
| parent | 9d674708ea7e0a5d7ac698784a7649d2ee73e4f8 (diff) | |
Apply patch D8816, from Zachary(AFWS) for collection boolean operand.
Also added code so that exact solver does the whole collection at once.
This patch allows users to use a collection (as an alternative to Object)
for the boolean modifier operand, and therefore get rid of a long modifier stack.
Diffstat (limited to 'source/blender/editors/mesh/editmesh_intersect.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_intersect.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/editmesh_intersect.c b/source/blender/editors/mesh/editmesh_intersect.c index 1b5e374b2a7..528ad57b9bf 100644 --- a/source/blender/editors/mesh/editmesh_intersect.c +++ b/source/blender/editors/mesh/editmesh_intersect.c @@ -204,8 +204,9 @@ 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, use_self, use_separate_all); + em->bm, em->looptris, em->tottri, test_fn, NULL, nshapes, use_self, use_separate_all); } else { has_isect = BM_mesh_intersect(em->bm, @@ -373,7 +374,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, use_self, boolean_operation); + em->bm, em->looptris, em->tottri, test_fn, NULL, 2, use_self, boolean_operation); } else { has_isect = BM_mesh_intersect(em->bm, |