[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45783] trunk/blender/source/blender: remove BM_ITER, BM_ITER_INDEX macros, use ELEM or MESH variants only ( the maceros had unused args in both cases).

Campbell Barton ideasman42 at gmail.com
Thu Apr 19 15:47:58 CEST 2012


Revision: 45783
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45783
Author:   campbellbarton
Date:     2012-04-19 13:47:58 +0000 (Thu, 19 Apr 2012)
Log Message:
-----------
remove BM_ITER, BM_ITER_INDEX macros, use ELEM or MESH variants only (the maceros had unused args in both cases).

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/bvhutils.c
    trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    trunk/blender/source/blender/blenkernel/intern/customdata.c
    trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
    trunk/blender/source/blender/blenkernel/intern/key.c
    trunk/blender/source/blender/blenkernel/intern/object.c
    trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
    trunk/blender/source/blender/bmesh/intern/bmesh_core.c
    trunk/blender/source/blender/bmesh/intern/bmesh_interp.c
    trunk/blender/source/blender/bmesh/intern/bmesh_iterators.h
    trunk/blender/source/blender/bmesh/intern/bmesh_marking.c
    trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
    trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
    trunk/blender/source/blender/bmesh/intern/bmesh_mesh_validate.c
    trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
    trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
    trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
    trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
    trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
    trunk/blender/source/blender/bmesh/operators/bmo_bevel.c
    trunk/blender/source/blender/bmesh/operators/bmo_connect.c
    trunk/blender/source/blender/bmesh/operators/bmo_create.c
    trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
    trunk/blender/source/blender/bmesh/operators/bmo_dupe.c
    trunk/blender/source/blender/bmesh/operators/bmo_edgesplit.c
    trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
    trunk/blender/source/blender/bmesh/operators/bmo_inset.c
    trunk/blender/source/blender/bmesh/operators/bmo_join_triangles.c
    trunk/blender/source/blender/bmesh/operators/bmo_mirror.c
    trunk/blender/source/blender/bmesh/operators/bmo_primitive.c
    trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c
    trunk/blender/source/blender/bmesh/operators/bmo_slide.c
    trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
    trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
    trunk/blender/source/blender/bmesh/operators/bmo_utils.c
    trunk/blender/source/blender/bmesh/tools/BME_bevel.c
    trunk/blender/source/blender/editors/mesh/editface.c
    trunk/blender/source/blender/editors/mesh/editmesh_bvh.c
    trunk/blender/source/blender/editors/mesh/editmesh_knife.c
    trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c
    trunk/blender/source/blender/editors/mesh/editmesh_rip.c
    trunk/blender/source/blender/editors/mesh/editmesh_select.c
    trunk/blender/source/blender/editors/mesh/editmesh_slide.c
    trunk/blender/source/blender/editors/mesh/editmesh_tools.c
    trunk/blender/source/blender/editors/mesh/editmesh_utils.c
    trunk/blender/source/blender/editors/mesh/mesh_data.c
    trunk/blender/source/blender/editors/mesh/mesh_navmesh.c
    trunk/blender/source/blender/editors/mesh/meshtools.c
    trunk/blender/source/blender/editors/object/object_hook.c
    trunk/blender/source/blender/editors/object/object_relations.c
    trunk/blender/source/blender/editors/object/object_transform.c
    trunk/blender/source/blender/editors/object/object_vgroup.c
    trunk/blender/source/blender/editors/render/render_shading.c
    trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c
    trunk/blender/source/blender/editors/space_view3d/drawobject.c
    trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
    trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
    trunk/blender/source/blender/editors/transform/transform.c
    trunk/blender/source/blender/editors/transform/transform_conversions.c
    trunk/blender/source/blender/editors/transform/transform_manipulator.c
    trunk/blender/source/blender/editors/transform/transform_orientations.c
    trunk/blender/source/blender/editors/util/crazyspace.c
    trunk/blender/source/blender/editors/uvedit/uvedit_buttons.c
    trunk/blender/source/blender/editors/uvedit/uvedit_draw.c
    trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
    trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
    trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    trunk/blender/source/blender/modifiers/intern/MOD_array.c
    trunk/blender/source/blender/modifiers/intern/MOD_bevel.c
    trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c
    trunk/blender/source/blender/python/bmesh/bmesh_py_types.c
    trunk/blender/source/blender/python/bmesh/bmesh_py_types.h

Modified: trunk/blender/source/blender/blenkernel/intern/bvhutils.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/bvhutils.c	2012-04-19 13:44:28 UTC (rev 45782)
+++ trunk/blender/source/blender/blenkernel/intern/bvhutils.c	2012-04-19 13:47:58 UTC (rev 45783)
@@ -572,7 +572,7 @@
 							insert = 0;
 						}
 						else {
-							BM_ITER (v, &iter, em->bm, BM_VERTS_OF_FACE, f) {
+							BM_ITER_ELEM (v, &iter, f, BM_VERTS_OF_FACE) {
 								if (BM_elem_flag_test(v, BM_ELEM_SELECT)) {
 									/* Don't insert triangles tessellated from faces that have
 									 * any selected verts.*/

Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2012-04-19 13:44:28 UTC (rev 45782)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2012-04-19 13:47:58 UTC (rev 45783)
@@ -1929,7 +1929,7 @@
 		mp->loopstart = j;
 		mp->mat_nr = efa->mat_nr;
 		
-		BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, efa) {
+		BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
 			mloop->v = BM_elem_index_get(l->v);
 			mloop->e = BM_elem_index_get(l->e);
 			CustomData_from_bmesh_block(&bm->ldata, &dm->loopData, l->head.data, j);

Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c	2012-04-19 13:44:28 UTC (rev 45782)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c	2012-04-19 13:47:58 UTC (rev 45783)
@@ -2204,8 +2204,8 @@
 		BMIter liter;
 
 		/*ensure all current elements follow new customdata layout*/
-		BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) {
-			BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, f) {
+		BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
+			BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) {
 				tmp = NULL;
 				CustomData_bmesh_copy_data(&destold, dest, l->head.data, &tmp);
 				CustomData_bmesh_free_block(&destold, &l->head.data);

Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c	2012-04-19 13:44:28 UTC (rev 45782)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c	2012-04-19 13:47:58 UTC (rev 45783)
@@ -493,7 +493,7 @@
 	BMIter iter;
 
 	glBegin(GL_LINES);
-	BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
 		BMIter liter;
 		BMLoop *l;
 		MLoopUV *lastluv = NULL, *firstluv = NULL;
@@ -501,7 +501,7 @@
 		if (BM_elem_flag_test(efa, BM_ELEM_HIDDEN))
 			continue;
 
-		BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
+		BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
 			MLoopUV *luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV);
 
 			if (luv) {
@@ -1468,8 +1468,8 @@
 
 	BM_mesh_elem_index_ensure(bm, BM_VERT | BM_EDGE);
 
-	BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) {
-		BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, f) {
+	BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
+		BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) {
 			loop_r->v = BM_elem_index_get(l->v);
 			loop_r->e = BM_elem_index_get(l->e);
 			loop_r++;
@@ -1486,7 +1486,7 @@
 	int i;
 
 	i = 0;
-	BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
 		poly_r->flag = BM_face_flag_to_mflag(f);
 		poly_r->loopstart = i;
 		poly_r->totloop = f->len;
@@ -1559,7 +1559,7 @@
 	int i;
 
 	i= 0;
-	BM_ITER (eve, &iter, emdm->tc->bm, BM_VERTS_OF_MESH, NULL) {
+	BM_ITER_MESH (eve, &iter, emdm->tc->bm, BM_VERTS_OF_MESH) {
 		if (emdm->vertexCos) {
 			copy_v3_v3(cos_r[i], emdm->vertexCos[i]);
 		}
@@ -1709,7 +1709,7 @@
 		bmdm->polyNos = MEM_mallocN(sizeof(*bmdm->polyNos)*bm->totface, "bmdm_pno");
 
 		i = 0;
-		BM_ITER (efa, &fiter, bm, BM_FACES_OF_MESH, NULL) {
+		BM_ITER_MESH (efa, &fiter, bm, BM_FACES_OF_MESH) {
 			BM_elem_index_set(efa, i); /* set_inline */
 			BM_face_normal_update_vcos(bm, efa, bmdm->polyNos[i], (float const (*)[3])vertexCos);
 			i++;
@@ -1719,7 +1719,7 @@
 		eve=BM_iter_new(&viter, bm, BM_VERTS_OF_MESH, NULL);
 		for (i=0; eve; eve=BM_iter_step(&viter), i++) {
 			float *no = bmdm->vertexNos[i];
-			BM_ITER (efa, &fiter, bm, BM_FACES_OF_VERT, eve) {
+			BM_ITER_ELEM (efa, &fiter, eve, BM_FACES_OF_VERT) {
 				add_v3_v3(no, bmdm->polyNos[BM_elem_index_get(efa)]);
 			}
 

Modified: trunk/blender/source/blender/blenkernel/intern/key.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/key.c	2012-04-19 13:44:28 UTC (rev 45782)
+++ trunk/blender/source/blender/blenkernel/intern/key.c	2012-04-19 13:47:58 UTC (rev 45783)
@@ -520,7 +520,7 @@
 				a = 0;
 				co = MEM_callocN(sizeof(float) * 3 * me->edit_btmesh->bm->totvert, "key_block_get_data");
 
-				BM_ITER (eve, &iter, me->edit_btmesh->bm, BM_VERTS_OF_MESH, NULL) {
+				BM_ITER_MESH (eve, &iter, me->edit_btmesh->bm, BM_VERTS_OF_MESH) {
 					copy_v3_v3(co[a], eve->co);
 					a++;
 				}

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2012-04-19 13:44:28 UTC (rev 45782)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2012-04-19 13:47:58 UTC (rev 45783)
@@ -1770,7 +1770,7 @@
 			BMVert *eve;
 			BMIter iter;
 
-			BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+			BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {
 				int *keyindex = CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_SHAPE_KEYINDEX);
 				
 				if (keyindex && *keyindex==nr) {

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_construct.c	2012-04-19 13:44:28 UTC (rev 45782)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_construct.c	2012-04-19 13:47:58 UTC (rev 45783)
@@ -495,7 +495,7 @@
 	BMFace *f;
 	BMIter iter;
 
-	BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
 		if (BMO_elem_flag_test(bm, f, oflag)) {
 			BM_face_kill(bm, f);
 		}
@@ -507,7 +507,7 @@
 	BMEdge *e;
 	BMIter iter;
 
-	BM_ITER (e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
+	BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
 		if (BMO_elem_flag_test(bm, e, oflag)) {
 			BM_edge_kill(bm, e);
 		}
@@ -519,7 +519,7 @@
 	BMVert *v;
 	BMIter iter;
 
-	BM_ITER (v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
+	BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
 		if (BMO_elem_flag_test(bm, v, oflag)) {
 			BM_vert_kill(bm, v);
 		}
@@ -545,14 +545,14 @@
 	BMIter iter;
 	BMIter itersub;
 
-	BM_ITER (v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
+	BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
 		if (BMO_elem_flag_test(bm, v, oflag)) {
 			/* Visit edge */
-			BM_ITER (e, &itersub, bm, BM_EDGES_OF_VERT, v) {
+			BM_ITER_ELEM (e, &itersub, v, BM_EDGES_OF_VERT) {
 				BMO_elem_flag_enable(bm, e, oflag);
 			}
 			/* Visit face */
-			BM_ITER (f, &itersub, bm, BM_FACES_OF_VERT, v) {
+			BM_ITER_ELEM (f, &itersub, v, BM_FACES_OF_VERT) {
 				BMO_elem_flag_enable(bm, f, oflag);
 			}
 		}
@@ -571,9 +571,9 @@
 	BMIter iter;
 	BMIter itersub;
 
-	BM_ITER (e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
+	BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
 		if (BMO_elem_flag_test(bm, e, oflag)) {
-			BM_ITER (f, &itersub, bm, BM_FACES_OF_EDGE, e) {
+			BM_ITER_ELEM (f, &itersub, e, BM_FACES_OF_EDGE) {
 				BMO_elem_flag_enable(bm, f, oflag);
 			}
 		}
@@ -610,7 +610,7 @@
 		case DEL_EDGES:
 		{
 			/* flush down to vert */
-			BM_ITER (e, &eiter, bm, BM_EDGES_OF_MESH, NULL) {
+			BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) {
 				if (BMO_elem_flag_test(bm, e, oflag)) {
 					BMO_elem_flag_enable(bm, e->v1, oflag);
 					BMO_elem_flag_enable(bm, e->v2, oflag);
@@ -618,7 +618,7 @@
 			}
 			bmo_remove_tagged_context_edges(bm, oflag);
 			/* remove loose vertice */
-			BM_ITER (v, &viter, bm, BM_VERTS_OF_MESH, NULL) {
+			BM_ITER_MESH (v, &viter, bm, BM_VERTS_OF_MESH) {
 				if (BMO_elem_flag_test(bm, v, oflag) && (!(v->e)))
 					BMO_elem_flag_enable(bm, v, DEL_WIREVERT);
 			}
@@ -649,7 +649,7 @@
 		case DEL_FACES:
 		{
 			/* go through and mark all edges and all verts of all faces for delet */
-			BM_ITER (f, &fiter, bm, BM_FACES_OF_MESH, NULL) {
+			BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) {
 				if (BMO_elem_flag_test(bm, f, oflag)) {
 					for (e = BM_iter_new(&eiter, bm, BM_EDGES_OF_FACE, f); e; e = BM_iter_step(&eiter))
 						BMO_elem_flag_enable(bm, e, oflag);
@@ -658,7 +658,7 @@
 				}
 			}
 			/* now go through and mark all remaining faces all edges for keeping */
-			BM_ITER (f, &fiter, bm, BM_FACES_OF_MESH, NULL) {
+			BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) {
 				if (!BMO_elem_flag_test(bm, f, oflag)) {
 					for (e = BM_iter_new(&eiter, bm, BM_EDGES_OF_FACE, f); e; e = BM_iter_step(&eiter)) {
 						BMO_elem_flag_disable(bm, e, oflag);
@@ -669,7 +669,7 @@
 				}
 			}
 			/* also mark all the vertices of remaining edges for keeping */
-			BM_ITER (e, &eiter, bm, BM_EDGES_OF_MESH, NULL) {
+			BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) {
 				if (!BMO_elem_flag_test(bm, e, oflag)) {
 					BMO_elem_flag_disable(bm, e->v1, oflag);
 					BMO_elem_flag_disable(bm, e->v2, oflag);
@@ -687,13 +687,13 @@
 		case DEL_ALL:
 		{
 			/* does this option even belong in here? */
-			BM_ITER (f, &fiter, bm, BM_FACES_OF_MESH, NULL) {
+			BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) {
 				BMO_elem_flag_enable(bm, f, oflag);
 			}
-			BM_ITER (e, &eiter, bm, BM_EDGES_OF_MESH, NULL) {
+			BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) {
 				BMO_elem_flag_enable(bm, e, oflag);
 			}
-			BM_ITER (v, &viter, bm, BM_VERTS_OF_MESH, NULL) {
+			BM_ITER_MESH (v, &viter, bm, BM_VERTS_OF_MESH) {
 				BMO_elem_flag_enable(bm, v, oflag);
 			}
 

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_core.c	2012-04-19 13:44:28 UTC (rev 45782)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_core.c	2012-04-19 13:47:58 UTC (rev 45783)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list