diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-04-21 17:29:24 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-21 17:29:24 +0400 |
| commit | d404f7fbe4b39d8bf52b0cc3b4d838e6e40c9e70 (patch) | |
| tree | fb26a0dc31a9186a10889089a7e6b37731e7d236 /source/blender/bmesh/operators/bmo_join_triangles.c | |
| parent | c667f1ff10c872a894fa7a102e3c254e4cac1386 (diff) | |
missed this previous commit (r56188), using normalized angle function.
Diffstat (limited to 'source/blender/bmesh/operators/bmo_join_triangles.c')
| -rw-r--r-- | source/blender/bmesh/operators/bmo_join_triangles.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/bmesh/operators/bmo_join_triangles.c b/source/blender/bmesh/operators/bmo_join_triangles.c index 04631f1d22f..39f7b0953b1 100644 --- a/source/blender/bmesh/operators/bmo_join_triangles.c +++ b/source/blender/bmesh/operators/bmo_join_triangles.c @@ -55,15 +55,11 @@ static float measure_facepair(const float v1[3], const float v2[3], /* First Test: Normal difference */ normal_tri_v3(n1, v1, v2, v3); normal_tri_v3(n2, v1, v3, v4); - - if (n1[0] == n2[0] && n1[1] == n2[1] && n1[2] == n2[2]) angle1 = 0.0f; - else angle1 = angle_v3v3(n1, n2); + angle1 = (compare_v3v3(n1, n2, FLT_EPSILON)) ? 0.0f : angle_normalized_v3v3(n1, n2); normal_tri_v3(n1, v2, v3, v4); normal_tri_v3(n2, v4, v1, v2); - - if (n1[0] == n2[0] && n1[1] == n2[1] && n1[2] == n2[2]) angle2 = 0.0f; - else angle2 = angle_normalized_v3v3(n1, n2); + angle2 = (compare_v3v3(n1, n2, FLT_EPSILON)) ? 0.0f : angle_normalized_v3v3(n1, n2); measure += (angle1 + angle2) * 0.5f; if (measure > limit) { |