[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57784] trunk/blender/source/blender: remove bmesh arg from BM_face_legal_splits(), don't use a bmesh iterator.

[Campbell Barton]

Revision: 57784
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57784
Author:   campbellbarton
Date:     2013-06-26 20:15:02 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
remove bmesh arg from BM_face_legal_splits(), don't use a bmesh iterator.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
    trunk/blender/source/blender/bmesh/intern/bmesh_polygon.h
    trunk/blender/source/blender/bmesh/operators/bmo_connect.c
    trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_vertex_proj.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c	2013-06-26 20:07:49 UTC (rev 57783)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c	2013-06-26 20:15:02 UTC (rev 57784)
@@ -1025,9 +1025,8 @@
  * intersecting splits, only the first of the set of intersecting
  * splits survives
  */
-void BM_face_legal_splits(BMesh *bm, BMFace *f, BMLoop *(*loops)[2], int len)
+void BM_face_legal_splits(BMFace *f, BMLoop *(*loops)[2], int len)
 {
-	BMIter iter;
 	BMLoop *l;
 	float v1[3], v2[3], v3[3] /*, v4[3 */, no[3], mid[3], *p1, *p2, *p3, *p4;
 	float out[3] = {-FLT_MAX, -FLT_MAX, 0.0f};
@@ -1036,12 +1035,9 @@
 	float fac1 = 1.0000001f, fac2 = 0.9f; //9999f; //0.999f;
 	int i, j, a = 0, clen;
 	
-	i = 0;
-	l = BM_iter_new(&iter, bm, BM_LOOPS_OF_FACE, f);
-	for ( ; l; l = BM_iter_step(&iter)) {
+	for (i = 0, l = BM_FACE_FIRST_LOOP(f); i < f->len; i++, l = l->next) {
 		BM_elem_index_set(l, i); /* set_loop */
 		copy_v3_v3(projverts[i], l->v->co);
-		i++;
 	}
 	
 	for (i = 0; i < len; i++) {

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_polygon.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_polygon.h	2013-06-26 20:07:49 UTC (rev 57783)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_polygon.h	2013-06-26 20:15:02 UTC (rev 57784)
@@ -55,7 +55,7 @@
 void  BM_face_triangulate(BMesh *bm, BMFace *f, BMFace **newfaces,
                           const bool use_beauty, const bool use_tag);
 
-void  BM_face_legal_splits(BMesh *bm, BMFace *f, BMLoop *(*loops)[2], int len);
+void  BM_face_legal_splits(BMFace *f, BMLoop *(*loops)[2], int len);
 
 void BM_face_as_array_vert_tri(BMFace *f, BMVert *r_verts[3]);
 void BM_face_as_array_vert_quad(BMFace *f, BMVert *r_verts[4]);

Modified: trunk/blender/source/blender/bmesh/operators/bmo_connect.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_connect.c	2013-06-26 20:07:49 UTC (rev 57783)
+++ trunk/blender/source/blender/bmesh/operators/bmo_connect.c	2013-06-26 20:15:02 UTC (rev 57784)
@@ -83,7 +83,7 @@
 		l_pair[1] = loops_split[0][0];
 	}
 
-	BM_face_legal_splits(bm, f, loops_split, STACK_SIZE(loops_split));
+	BM_face_legal_splits(f, loops_split, STACK_SIZE(loops_split));
 
 	for (i = 0; i < STACK_SIZE(loops_split); i++) {
 		BMVert **v_pair;

Modified: trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c	2013-06-26 20:07:49 UTC (rev 57783)
+++ trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c	2013-06-26 20:15:02 UTC (rev 57784)
@@ -1112,7 +1112,7 @@
 			 * - concave corner of an ngon.
 			 * - 2 edges being used in 2+ ngons.
 			 */
-//			BM_face_legal_splits(bm, face, loops_split, BLI_array_count(loops_split));
+//			BM_face_legal_splits(face, loops_split, BLI_array_count(loops_split));
 
 			for (j = 0; j < BLI_array_count(loops_split); j++) {
 				if (loops_split[j][0]) {

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_vertex_proj.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_vertex_proj.c	2013-06-26 20:07:49 UTC (rev 57783)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_vertex_proj.c	2013-06-26 20:15:02 UTC (rev 57784)
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * The Original Code is Copyright (C) 2009 Blender Foundation.
+ * The Original Code is Copyright (C) 2013 Blender Foundation.
  * All rights reserved.
  *
  *
@@ -187,8 +187,6 @@
 	}
 
 	dm->release(dm);
-
-	(void)mval_fl;
 }