[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39468] branches/bmesh/blender/source/ blender/bmesh/operators/utils.c: fix edge_angle, was compating angles in 2d

Campbell Barton ideasman42 at gmail.com
Tue Aug 16 21:18:24 CEST 2011


Revision: 39468
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39468
Author:   campbellbarton
Date:     2011-08-16 19:18:23 +0000 (Tue, 16 Aug 2011)
Log Message:
-----------
fix edge_angle, was compating angles in 2d

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

Modified: branches/bmesh/blender/source/blender/bmesh/operators/utils.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/utils.c	2011-08-16 19:12:36 UTC (rev 39467)
+++ branches/bmesh/blender/source/blender/bmesh/operators/utils.c	2011-08-16 19:18:23 UTC (rev 39468)
@@ -668,26 +668,20 @@
 static float edge_angle(BMesh *bm, BMEdge *e)
 {
 	BMIter	fiter;
-	BMFace	*f;
-	int		num_faces = 0;
-	float	n1[3], n2[3];
-	float	angle = 0.0f;
+	BMFace	*f, *f_prev = NULL;
 
-	/* this is a bit odd, n2 keeps getting written into */
+	/* first edge faces, dont account for 3+ */
 
 	BM_ITER(f, &fiter, bm, BM_FACES_OF_EDGE, e) {
-		if( num_faces == 0 ) {
-			copy_v3_v3(n1, f->no);
-			num_faces++;
-		} else {
-			copy_v3_v3(n2, f->no);
-			num_faces++;
+		if(f_prev == NULL) {
+			f_prev= f;
 		}
+		else {
+			return angle_v3v3(f_prev->no, f->no);
+		}
 	}
 
-	angle = angle_v2v2(n1, n2);
-
-	return angle;
+	return 0.0f;
 }
 /*
 ** extra edge information




More information about the Bf-blender-cvs mailing list