style cleanup: BM_ITER / BM_ITER_INDEX / BMO_ITER

1 files changed, 22 insertions, 22 deletions

diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c
index d126da52b22..3eec9437299 100644
--- a/source/blender/bmesh/operators/bmo_removedoubles.c
+++ b/source/blender/bmesh/operators/bmo_removedoubles.c
@@ -43,7 +43,7 @@ static void remdoubles_splitface(BMFace *f, BMesh *bm, BMOperator *op)
 	BMVert *v2, *doub;
 	int split = FALSE;
 
-	BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, f) {
+	BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, f) {
 		v2 = BMO_slot_map_ptr_get(bm, op, "targetmap", l->v);
 		/* ok: if v2 is NULL (e.g. not in the map) then it's
 		 *     a target vert, otherwise it's a double */
@@ -108,7 +108,7 @@ void bmo_weldverts_exec(BMesh *bm, BMOperator *op)
 	int a, b;
 
 	/* mark merge verts for deletion */
-	BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
+	BM_ITER (v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
 		if ((v2 = BMO_slot_map_ptr_get(bm, op, "targetmap", v))) {
 			BMO_elem_flag_enable(bm, v, ELE_DEL);
 
@@ -119,11 +119,11 @@ void bmo_weldverts_exec(BMesh *bm, BMOperator *op)
 
 	/* check if any faces are getting their own corners merged
 	   together, split face if so */
-	BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) {
 		remdoubles_splitface(f, bm, op);
 	}
 
-	BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
+	BM_ITER (e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
 		if (BMO_elem_flag_test(bm, e->v1, ELE_DEL) || BMO_elem_flag_test(bm, e->v2, ELE_DEL)) {
 			v = BMO_slot_map_ptr_get(bm, op, "targetmap", e->v1);
 			v2 = BMO_slot_map_ptr_get(bm, op, "targetmap", e->v2);
@@ -143,9 +143,9 @@ void bmo_weldverts_exec(BMesh *bm, BMOperator *op)
 	}
 
 	/* BMESH_TODO, stop abusing face index here */
-	BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) {
 		BM_elem_index_set(f, 0); /* set_dirty! */
-		BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, f) {
+		BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, f) {
 			if (BMO_elem_flag_test(bm, l->v, ELE_DEL)) {
 				BMO_elem_flag_enable(bm, f, FACE_MARK|ELE_DEL);
 			}
@@ -158,7 +158,7 @@ void bmo_weldverts_exec(BMesh *bm, BMOperator *op)
 
 	/* faces get "modified" by creating new faces here, then at the
 	   end the old faces are deleted */
-	BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) {
 		if (!BMO_elem_flag_test(bm, f, FACE_MARK))
 			continue;
 
@@ -170,7 +170,7 @@ void bmo_weldverts_exec(BMesh *bm, BMOperator *op)
 		BLI_array_empty(edges);
 		BLI_array_empty(loops);
 		a = 0;
-		BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, f) {
+		BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, f) {
 			v = l->v;
 			v2 = l->next->v;
 			if (BMO_elem_flag_test(bm, v, ELE_DEL)) {
@@ -218,7 +218,7 @@ void bmo_weldverts_exec(BMesh *bm, BMOperator *op)
 			BM_elem_attrs_copy(bm, bm, f, f2);
 
 			a = 0;
-			BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, f2) {
+			BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, f2) {
 				l2 = loops[a];
 				BM_elem_attrs_copy(bm, bm, l2, l);
 
@@ -269,7 +269,7 @@ void bmo_pointmerge_facedata_exec(BMesh *bm, BMOperator *op)
 		return;
 
 	fac = 1.0f / tot;
-	BM_ITER(l, &iter, bm, BM_LOOPS_OF_VERT, snapv) {
+	BM_ITER (l, &iter, bm, BM_LOOPS_OF_VERT, snapv) {
 		if (!firstl) {
 			firstl = l;
 		}
@@ -290,8 +290,8 @@ void bmo_pointmerge_facedata_exec(BMesh *bm, BMOperator *op)
 		}
 	}
 
-	BMO_ITER(v, &siter, bm, op, "verts", BM_VERT) {
-		BM_ITER(l, &iter, bm, BM_LOOPS_OF_VERT, v) {
+	BMO_ITER (v, &siter, bm, op, "verts", BM_VERT) {
+		BM_ITER (l, &iter, bm, BM_LOOPS_OF_VERT, v) {
 			if (l == firstl) {
 				continue;
 			}
@@ -318,8 +318,8 @@ void bmo_vert_average_facedata_exec(BMesh *bm, BMOperator *op)
 		type = bm->ldata.layers[i].type;
 		CustomData_data_initminmax(type, &min, &max);
 
-		BMO_ITER(v, &siter, bm, op, "verts", BM_VERT) {
-			BM_ITER(l, &iter, bm, BM_LOOPS_OF_VERT, v) {
+		BMO_ITER (v, &siter, bm, op, "verts", BM_VERT) {
+			BM_ITER (l, &iter, bm, BM_LOOPS_OF_VERT, v) {
 				block = CustomData_bmesh_get_layer_n(&bm->ldata, l->head.data, i);
 				CustomData_data_dominmax(type, block, &min, &max);
 			}
@@ -329,8 +329,8 @@ void bmo_vert_average_facedata_exec(BMesh *bm, BMOperator *op)
 		CustomData_data_multiply(type, &max, 0.5f);
 		CustomData_data_add(type, &min, &max);
 
-		BMO_ITER(v, &siter, bm, op, "verts", BM_VERT) {
-			BM_ITER(l, &iter, bm, BM_LOOPS_OF_VERT, v) {
+		BMO_ITER (v, &siter, bm, op, "verts", BM_VERT) {
+			BM_ITER (l, &iter, bm, BM_LOOPS_OF_VERT, v) {
 				block = CustomData_bmesh_get_layer_n(&bm->ldata, l->head.data, i);
 				CustomData_data_copy_value(type, &min, block);
 			}
@@ -350,7 +350,7 @@ void bmo_pointmerge_exec(BMesh *bm, BMOperator *op)
 	//BMO_op_callf(bm, "collapse_uvs edges=%s", op, "edges");
 	BMO_op_init(bm, &weldop, "weldverts");
 	
-	BMO_ITER(v, &siter, bm, op, "verts", BM_VERT) {
+	BMO_ITER (v, &siter, bm, op, "verts", BM_VERT) {
 		if (!snapv) {
 			snapv = v;
 			copy_v3_v3(snapv->co, vec);
@@ -384,7 +384,7 @@ void bmo_collapse_exec(BMesh *bm, BMOperator *op)
 	         BMW_FLAG_NOP, /* no need to use BMW_FLAG_TEST_HIDDEN, already marked data */
 	         BMW_NIL_LAY);
 
-	BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
+	BM_ITER (e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
 		if (!BMO_elem_flag_test(bm, e, EDGE_MARK))
 			continue;
 
@@ -444,8 +444,8 @@ static void bmo_collapsecon_do_layer(BMesh *bm, BMOperator *op, int layer)
 	         BMW_FLAG_NOP, /* no need to use BMW_FLAG_TEST_HIDDEN, already marked data */
 	         layer);
 
-	BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) {
-		BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, f) {
+	BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) {
+		BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, f) {
 			if (BMO_elem_flag_test(bm, l->e, EDGE_MARK)) {
 				/* walk */
 				BLI_array_empty(blocks);
@@ -500,7 +500,7 @@ void bmesh_finddoubles_common(BMesh *bm, BMOperator *op, BMOperator *optarget, c
 	dist3 = dist * 3.0f;
 
 	i = 0;
-	BMO_ITER(v, &oiter, bm, op, "verts", BM_VERT) {
+	BMO_ITER (v, &oiter, bm, op, "verts", BM_VERT) {
 		BLI_array_growone(verts);
 		verts[i++] = v;
 	}
@@ -583,7 +583,7 @@ void bmo_automerge_exec(BMesh *bm, BMOperator *op)
 	 * can be merged away into any other verts. Mark all other verts
 	 * as VERT_KEEP. */
 	BMO_slot_buffer_flag_enable(bm, op, "verts", BM_VERT, VERT_IN);
-	BM_ITER(v, &viter, bm, BM_VERTS_OF_MESH, NULL) {
+	BM_ITER (v, &viter, bm, BM_VERTS_OF_MESH, NULL) {
 		if (!BMO_elem_flag_test(bm, v, VERT_IN)) {
 			BMO_elem_flag_enable(bm, v, VERT_KEEP);
 		}