Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormano-wii <germano.costa@ig.com.br>2019-08-29 02:07:43 +0300
committermano-wii <germano.costa@ig.com.br>2019-08-29 02:07:43 +0300
commitb1079ec3f289e172d305110a71ee49f0812cd48b (patch)
treeea24f8a76b3c3b55abe637bda04691a80a08f56c /source/blender/editors/mesh/editmesh_automerge.c
parent7aed8f69d14db5b9d8c438c126f552c85ecb274e (diff)
Edit Mesh: AutoMerge and Split: Improve detection of the best split face
Diffstat (limited to 'source/blender/editors/mesh/editmesh_automerge.c')
-rw-r--r--source/blender/editors/mesh/editmesh_automerge.c7
1 files changed, 4 insertions, 3 deletions
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;