From 944956aba87daf4156f4cff615a089503302d47e Mon Sep 17 00:00:00 2001 From: mano-wii Date: Mon, 27 Jan 2020 17:43:12 -0300 Subject: bmesh_intersect_edges: Improve detection of the best_face `lambda_a` made it more restricted than it should be. --- source/blender/bmesh/tools/bmesh_intersect_edges.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'source/blender/bmesh/tools/bmesh_intersect_edges.c') diff --git a/source/blender/bmesh/tools/bmesh_intersect_edges.c b/source/blender/bmesh/tools/bmesh_intersect_edges.c index 0f9bc68afeb..75cfd99489b 100644 --- a/source/blender/bmesh/tools/bmesh_intersect_edges.c +++ b/source/blender/bmesh/tools/bmesh_intersect_edges.c @@ -119,21 +119,19 @@ static bool bm_vert_pair_share_splittable_face_cb(BMFace *UNUSED(f), float co[3]; float dir[3]; - float lambda_a; float lambda_b; copy_v3_v3(co, l_a->prev->v->co); sub_v3_v3v3(dir, l_a->next->v->co, co); - if (isect_ray_ray_v3(v_a_co, v_a_b_dir, co, dir, &lambda_a, &lambda_b)) { - if (IN_RANGE(lambda_a, range_min, range_max) && IN_RANGE(lambda_b, range_min, range_max)) { + if (isect_ray_ray_v3(v_a_co, v_a_b_dir, co, dir, NULL, &lambda_b)) { + if (IN_RANGE(lambda_b, range_min, range_max)) { return true; } else { copy_v3_v3(co, l_b->prev->v->co); sub_v3_v3v3(dir, l_b->next->v->co, co); - if (isect_ray_ray_v3(v_a_co, v_a_b_dir, co, dir, &lambda_a, &lambda_b)) { - return IN_RANGE(lambda_a, range_min, range_max) && - IN_RANGE(lambda_b, range_min, range_max); + if (isect_ray_ray_v3(v_a_co, v_a_b_dir, co, dir, NULL, &lambda_b)) { + return IN_RANGE(lambda_b, range_min, range_max); } } } -- cgit v1.2.3