kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

missed this previous commit (r56188), using normalized angle function.

Browse Source
This commit is contained in:
Campbell Barton 2013-04-21 13:29:24 +00:00
parent c667f1ff10
commit d404f7fbe4
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/bmesh/operators/bmo_join_triangles.c
View File

@ -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) {