[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40922] branches/bmesh/blender/source/ blender: a few trivial bug fixes

[Andrew Wiggin]

Revision: 40922
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40922
Author:   ender79
Date:     2011-10-11 04:30:04 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
a few trivial bug fixes

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
    branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
    branches/bmesh/blender/source/blender/editors/mesh/meshtools.c

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c	2011-10-11 04:21:06 UTC (rev 40921)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c	2011-10-11 04:30:04 UTC (rev 40922)
@@ -439,6 +439,8 @@
 				fac = saacos(-dot_v3v3(vec1, vec2));
 				
 				madd_v3_v3fl(v->no, l->f->no, fac);
+
+				len++;
 			}
 		}
 	}
@@ -454,17 +456,12 @@
 	BMFace *f;
 	int len=0;
 
-	zero_v3(v->no);
-
 	f = BMIter_New(&iter, bm, BM_FACES_OF_VERT, v);
 	for (; f; f=BMIter_Step(&iter), len++) {
 		BM_Face_UpdateNormal(bm, f);
-		add_v3_v3v3(v->no, f->no, v->no);
 	}
 
-	if (!len) return;
-
-	mul_v3_fl(v->no, 1.0f/(float)len);
+	BM_Vert_UpdateNormal(bm, v);
 }
 
 void bmesh_update_face_normal(BMesh *bm, BMFace *f, float (*projectverts)[3])

Modified: branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c	2011-10-11 04:21:06 UTC (rev 40921)
+++ branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c	2011-10-11 04:30:04 UTC (rev 40922)
@@ -212,7 +212,7 @@
 			vec1[2]+= fac*nor2[2];
 	
 			/* falloff for multi subdivide */
-			smooth *= sqrtf(fabsf(1.0f - 2.0f*fabsf(perc)));
+			smooth *= sqrtf(fabsf(1.0f - 2.0f*fabsf(0.5f-perc)));
 	
 			vec1[0]*= smooth*len;
 			vec1[1]*= smooth*len;

Modified: branches/bmesh/blender/source/blender/editors/mesh/meshtools.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/meshtools.c	2011-10-11 04:21:06 UTC (rev 40921)
+++ branches/bmesh/blender/source/blender/editors/mesh/meshtools.c	2011-10-11 04:30:04 UTC (rev 40922)
@@ -1162,7 +1162,7 @@
 		BMVert *v;
 		
 		index = 0;
-		BM_ITER(v, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
+		BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
 			if (v == eve)
 				break;
 			index++;