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>2020-01-27 23:43:12 +0300
committermano-wii <germano.costa@ig.com.br>2020-01-27 23:43:12 +0300
commit944956aba87daf4156f4cff615a089503302d47e (patch)
tree45aeb7fe28423209457232c6c58f81ff5bd72031 /source/blender/bmesh
parent9291558b63fb5f0abae5370cfbac4e28f6035491 (diff)
bmesh_intersect_edges: Improve detection of the best_face
`lambda_a` made it more restricted than it should be.
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r--source/blender/bmesh/tools/bmesh_intersect_edges.c10
1 files changed, 4 insertions, 6 deletions
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);
}
}
}