[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56190] trunk/blender/source/blender/bmesh /operators/bmo_join_triangles.c: missed this previous commit (r56188), using normalized angle function.

[Campbell Barton]

Revision: 56190
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56190
Author:   campbellbarton
Date:     2013-04-21 13:29:24 +0000 (Sun, 21 Apr 2013)
Log Message:
-----------
missed this previous commit (r56188), using normalized angle function.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56188

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/operators/bmo_join_triangles.c

Modified: trunk/blender/source/blender/bmesh/operators/bmo_join_triangles.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_join_triangles.c	2013-04-21 13:24:45 UTC (rev 56189)
+++ trunk/blender/source/blender/bmesh/operators/bmo_join_triangles.c	2013-04-21 13:29:24 UTC (rev 56190)
@@ -55,16 +55,12 @@
 	/* First Test: Normal difference */
 	normal_tri_v3(n1, v1, v2, v3);
 	normal_tri_v3(n2, v1, v3, v4);
+	angle1 = (compare_v3v3(n1, n2, FLT_EPSILON)) ? 0.0f : angle_normalized_v3v3(n1, n2);
 
-	if (n1[0] == n2[0] && n1[1] == n2[1] && n1[2] == n2[2]) angle1 = 0.0f;
-	else angle1 = angle_v3v3(n1, n2);
-
 	normal_tri_v3(n1, v2, v3, v4);
 	normal_tri_v3(n2, v4, v1, v2);
+	angle2 = (compare_v3v3(n1, n2, FLT_EPSILON)) ? 0.0f : angle_normalized_v3v3(n1, n2);
 
-	if (n1[0] == n2[0] && n1[1] == n2[1] && n1[2] == n2[2]) angle2 = 0.0f;
-	else angle2 = angle_normalized_v3v3(n1, n2);
-
 	measure += (angle1 + angle2) * 0.5f;
 	if (measure > limit) {
 		return measure;