style cleanup: BM_ITER / BM_ITER_INDEX / BMO_ITER

3 files changed, 23 insertions, 22 deletions

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index bdc07ccc98c..d520c98c6d0 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -2957,7 +2957,7 @@ static void draw_em_indices(BMEditMesh *em)
 	i = 0;
 	if (em->selectmode & SCE_SELECT_VERTEX) {
 		UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEANG, col);
-		BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
+		BM_ITER (v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
 			if (BM_elem_flag_test(v, BM_ELEM_SELECT)) {
 				sprintf(numstr, "%d", i);
 				view3d_cached_text_draw_add(v->co, numstr, 0, txt_flag, col);
@@ -2969,7 +2969,7 @@ static void draw_em_indices(BMEditMesh *em)
 	if (em->selectmode & SCE_SELECT_EDGE) {
 		i = 0;
 		UI_GetThemeColor3ubv(TH_DRAWEXTRA_EDGELEN, col);
-		BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
+		BM_ITER (e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
 			if (BM_elem_flag_test(e, BM_ELEM_SELECT)) {
 				sprintf(numstr, "%d", i);
 				mid_v3_v3v3(pos, e->v1->co, e->v2->co);
@@ -2982,7 +2982,7 @@ static void draw_em_indices(BMEditMesh *em)
 	if (em->selectmode & SCE_SELECT_FACE) {
 		i = 0;
 		UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEAREA, col);
-		BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) {
+		BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) {
 			if (BM_elem_flag_test(f, BM_ELEM_SELECT)) {
 				BM_face_center_mean_calc(bm, f, pos);
 				sprintf(numstr, "%d", i);
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c
index b1cddf5b6c5..a3bf0d40c43 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.c
+++ b/source/blender/editors/space_view3d/view3d_buttons.c
@@ -157,7 +157,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
 		BMEdge *eed;
 		BMIter iter;
 
-		BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
+		BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
 			if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
 				evedef = eve;
 				tot++;
@@ -165,7 +165,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
 			}
 		}
 
-		BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
+		BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
 			if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
 				float *f;
 
@@ -404,7 +404,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
 
 			if (len_v3(median) > 0.000001f) {
 
-				BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
+				BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
 					if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
 						add_v3_v3(eve->co, median);
 					}
@@ -418,7 +418,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
 				const float sca = compute_scale_factor(ve_median[3], median[3]);
 
 				if (ELEM(sca, 0.0f, 1.0f)) {
-					BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
+					BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
 						if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
 							float *crease = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_CREASE);
 							if (crease) {
@@ -428,7 +428,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
 					}
 				}
 				else if (sca > 0.0f) {
-					BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
+					BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
 						if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
 							float *crease = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_CREASE);
 							if (crease) {
@@ -439,7 +439,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
 					}
 				}
 				else {
-					BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
+					BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
 						if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
 							float *crease = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_CREASE);
 							if (crease) {
@@ -456,7 +456,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
 				const float sca = compute_scale_factor(ve_median[6], median[6]);
 
 				if (ELEM(sca, 0.0f, 1.0f)) {
-					BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
+					BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
 						if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
 							float *bweight = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_BWEIGHT);
 							if (bweight) {
@@ -466,7 +466,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
 					}
 				}
 				else if (sca > 0.0f) {
-					BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
+					BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
 						if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
 							float *bweight = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_BWEIGHT);
 							if (bweight) {
@@ -477,7 +477,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
 					}
 				}
 				else {
-					BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
+					BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
 						if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
 							float *bweight = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_BWEIGHT);
 							if (bweight) {
@@ -678,7 +678,7 @@ static void vgroup_copy_active_to_sel(Object *ob)
 		MDeformVert *dvert;
 		int index = 0;
 
-		BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+		BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
 			if (BM_elem_flag_test(eve, BM_ELEM_SELECT) && eve != eve_act) {
 				dvert = CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT);
 				if (dvert) {
diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c
index faf765fdaef..4943d5c5281 100644
--- a/source/blender/editors/space_view3d/view3d_snap.c
+++ b/source/blender/editors/space_view3d/view3d_snap.c
@@ -242,7 +242,7 @@ static void make_trans_verts(Object *obedit, float *min, float *max, int mode)
 		// transform now requires awareness for select mode, so we tag the f1 flags in verts
 		tottrans = 0;
 		if (em->selectmode & SCE_SELECT_VERTEX) {
-			BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
+			BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
 				if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
 					BM_elem_index_set(eve, 1); /* set_dirty! */
 					tottrans++;
@@ -253,41 +253,42 @@ static void make_trans_verts(Object *obedit, float *min, float *max, int mode)
 		else if (em->selectmode & SCE_SELECT_EDGE) {
 			BMEdge *eed;
 
-			BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
+			BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
 				BM_elem_index_set(eve, 0);     /* set_dirty! */
 			}
 
-			BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
+			BM_ITER (eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
 				if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
 					BM_elem_index_set(eed->v1, 1); /* set_dirty! */
 					BM_elem_index_set(eed->v2, 1); /* set_dirty! */
 				}
 			}
 
-			BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
+			BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
 				if (BM_elem_index_get(eve)) tottrans++;
 			}
 		}
 		else {
 			BMFace *efa;
 
-			BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
+			BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
 				BM_elem_index_set(eve, 0); /* set_dirty! */
 			}
 
-			BM_ITER(efa, &iter, bm, BM_FACES_OF_MESH, NULL) {
+			BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) {
 				if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
 					BMIter liter;
 					BMLoop *l;
 					
-					BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, efa) {
+					BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, efa) {
 						BM_elem_index_set(l->v, 1); /* set_dirty! */
 					}
 				}
 			}
 
-			BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL)
+			BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
 				if (BM_elem_index_get(eve)) tottrans++;
+			}
 		}
 		/* for any of the 3 loops above which all dirty the indices */
 		bm->elem_index_dirty |= BM_VERT;
@@ -297,7 +298,7 @@ static void make_trans_verts(Object *obedit, float *min, float *max, int mode)
 			tv = transvmain = MEM_callocN(tottrans * sizeof(TransVert), "maketransverts");
 		
 			a = 0;
-			BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
+			BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
 				if (BM_elem_index_get(eve)) {
 					BM_elem_index_set(eve, a); /* set_dirty! */
 					copy_v3_v3(tv->oldloc, eve->co);