[Bf-blender-cvs] [b1079ec3f28] master: Edit Mesh: AutoMerge and Split: Improve detection of the best split face

[mano-wii]

Commit: b1079ec3f289e172d305110a71ee49f0812cd48b
Author: mano-wii
Date:   Wed Aug 28 20:07:43 2019 -0300
Branches: master
https://developer.blender.org/rBb1079ec3f289e172d305110a71ee49f0812cd48b

Edit Mesh: AutoMerge and Split: Improve detection of the best split face

===================================================================

M	source/blender/editors/mesh/editmesh_automerge.c

===================================================================

diff --git a/source/blender/editors/mesh/editmesh_automerge.c b/source/blender/editors/mesh/editmesh_automerge.c
index 0ca86e2f4eb..62f4fc6bb7d 100644
--- a/source/blender/editors/mesh/editmesh_automerge.c
+++ b/source/blender/editors/mesh/editmesh_automerge.c
@@ -170,9 +170,10 @@ static bool edbm_vert_pair_share_splittable_face_cb(BMFace *UNUSED(f),
   float lambda;
   if (isect_ray_seg_v3(v_a_co, v_a_b_dir, l_a->prev->v->co, l_a->next->v->co, &lambda)) {
     if (IN_RANGE(lambda, 0.0f, 1.0f)) {
-      if (isect_ray_seg_v3(v_a_co, v_a_b_dir, l_b->prev->v->co, l_b->next->v->co, &lambda)) {
-        return IN_RANGE(lambda, 0.0f, 1.0f);
-      }
+      return true;
+    }
+    else if (isect_ray_seg_v3(v_a_co, v_a_b_dir, l_b->prev->v->co, l_b->next->v->co, &lambda)) {
+      return IN_RANGE(lambda, 0.0f, 1.0f);
     }
   }
   return false;