diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-15 16:42:42 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-15 16:42:42 +0300 |
| commit | 0b8c2eed7561e951ecd99421a8d05fffbf28a48b (patch) | |
| tree | fd1d3a514dc555bf4fdf0c1d879878ef12266952 /source/blender/editors/mesh | |
| parent | 8166d0affdac7da7a17aa2e178baa34a8afd82f1 (diff) | |
| parent | b84fad2ba3920f3e337dc9084a30f1ea38f39fc2 (diff) | |
Merge branch 'master' into blender28
Diffstat (limited to 'source/blender/editors/mesh')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_intersect.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/editors/mesh/editmesh_intersect.c b/source/blender/editors/mesh/editmesh_intersect.c index ad76f0c66f1..9af700aa6bf 100644 --- a/source/blender/editors/mesh/editmesh_intersect.c +++ b/source/blender/editors/mesh/editmesh_intersect.c @@ -197,18 +197,18 @@ static int edbm_intersect_exec(bContext *C, wmOperator *op) } has_isect = BM_mesh_intersect( - em->bm, - em->looptris, em->tottri, - test_fn, NULL, - use_self, use_separate_all, true, true, true, - -1, - eps); + em->bm, + em->looptris, em->tottri, + test_fn, NULL, + use_self, use_separate_all, true, true, true, true, + -1, + eps); if (use_separate_cut) { /* detach selected/un-selected faces */ BM_mesh_separate_faces( - em->bm, - BM_elem_cb_check_hflag_enabled_simple(const BMFace *, BM_ELEM_SELECT)); + em->bm, + BM_elem_cb_check_hflag_enabled_simple(const BMFace *, BM_ELEM_SELECT)); } if (has_isect) { @@ -300,12 +300,12 @@ static int edbm_intersect_boolean_exec(bContext *C, wmOperator *op) } has_isect = BM_mesh_intersect( - em->bm, - em->looptris, em->tottri, - test_fn, NULL, - false, false, true, true, true, - boolean_operation, - eps); + em->bm, + em->looptris, em->tottri, + test_fn, NULL, + false, false, true, true, false, true, + boolean_operation, + eps); if (has_isect) { |