[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42120] branches/bmesh/blender/source/ blender/bmesh/operators/join_triangles.c: fix [#28676] Tris to Quads: " Max Angle" is not interpreted correctly

[Campbell Barton]

Revision: 42120
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42120
Author:   campbellbarton
Date:     2011-11-24 06:59:29 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
fix [#28676] Tris to Quads: "Max Angle" is not interpreted correctly

the angle should be more meaningful now.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c

Modified: branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c	2011-11-24 06:55:53 UTC (rev 42119)
+++ branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c	2011-11-24 06:59:29 UTC (rev 42120)
@@ -65,7 +65,7 @@
 	if(n1[0] == n2[0] && n1[1] == n2[1] && n1[2] == n2[2]) angle2 = 0.0f;
 	else angle2 = angle_v3v3(n1, n2);
 
-	measure += angle1 + angle2;
+	measure += (angle1 + angle2) * 0.5f;
 	if(measure > limit) return measure;
 
 	/*Second test: Colinearity*/