From b84fad2ba3920f3e337dc9084a30f1ea38f39fc2 Mon Sep 17 00:00:00 2001 From: Howard Trickey Date: Fri, 15 Jun 2018 08:48:45 -0400 Subject: Fix T55490, intersect two triangles fails. Need to use the 'use_partial_connect' option in island connect, so changed signatures of various functions to pass that into and then down from BM_mesh_intersect (making true for intersect, false for boolean). Then fix bm_face_split_edgenet_partial_connect to work when input edges are not necessarily wire, but at least not in the face they are being connected in. That caused generalization of core BM_vert_separate_hflag_wire (which is only used in this one place in all Blender). --- source/blender/editors/mesh/editmesh_intersect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 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 d681d904e74..86b1a58dd1e 100644 --- a/source/blender/editors/mesh/editmesh_intersect.c +++ b/source/blender/editors/mesh/editmesh_intersect.c @@ -191,7 +191,7 @@ static int edbm_intersect_exec(bContext *C, wmOperator *op) bm, em->looptris, em->tottri, test_fn, NULL, - use_self, use_separate_all, true, true, true, + use_self, use_separate_all, true, true, true, true, -1, eps); @@ -281,7 +281,7 @@ static int edbm_intersect_boolean_exec(bContext *C, wmOperator *op) bm, em->looptris, em->tottri, test_fn, NULL, - false, false, true, true, true, + false, false, true, true, false, true, boolean_operation, eps); -- cgit v1.2.3