style cleanup: BM_ITER / BM_ITER_INDEX / BMO_ITER

4 files changed, 35 insertions, 35 deletions

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index bb1800a79cf..7c198cce746 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -4318,7 +4318,7 @@ static BMEdge *get_other_edge(BMesh *bm, BMVert *v, BMEdge *e)
 	BMIter iter;
 	BMEdge *e2;
 
-	BM_ITER(e2, &iter, bm, BM_EDGES_OF_VERT, v) {
+	BM_ITER (e2, &iter, bm, BM_EDGES_OF_VERT, v) {
 		if (BM_elem_flag_test(e2, BM_ELEM_SELECT) && e2 != e)
 			return e2;
 	}
@@ -4419,10 +4419,10 @@ static int createSlideVerts(TransInfo *t)
 	BLI_smallhash_init(&table);
 	
 	/*ensure valid selection*/
-	BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+	BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
 		if (BM_elem_flag_test(v, BM_ELEM_SELECT)) {
 			numsel = 0;
-			BM_ITER(e, &iter2, em->bm, BM_EDGES_OF_VERT, v) {
+			BM_ITER (e, &iter2, em->bm, BM_EDGES_OF_VERT, v) {
 				if (BM_elem_flag_test(e, BM_ELEM_SELECT)) {
 					/* BMESH_TODO: this is probably very evil,
 					 * set v->e to a selected edge*/
@@ -4440,7 +4440,7 @@ static int createSlideVerts(TransInfo *t)
 		}
 	}
 
-	BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
+	BM_ITER (e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
 		if (BM_elem_flag_test(e, BM_ELEM_SELECT)) {
 			if (!BM_edge_is_manifold(e)) {
 				MEM_freeN(sld);
@@ -4451,7 +4451,7 @@ static int createSlideVerts(TransInfo *t)
 	}
 
 	j = 0;
-	BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+	BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
 		if (BM_elem_flag_test(v, BM_ELEM_SELECT)) {
 			BM_elem_flag_enable(v, BM_ELEM_TAG);
 			BLI_smallhash_insert(&table, (uintptr_t)v, SET_INT_IN_POINTER(j));
@@ -4473,7 +4473,7 @@ static int createSlideVerts(TransInfo *t)
 	j = 0;
 	while (1) {
 		v = NULL;
-		BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+		BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
 			if (BM_elem_flag_test(v, BM_ELEM_TAG))
 				break;
 
@@ -4591,7 +4591,7 @@ static int createSlideVerts(TransInfo *t)
 	/* size = 50.0; */ /* UNUSED */
 	zero_v3(lastvec); zero_v3(dir);
 	/* ee = le = NULL; */ /* UNUSED */
-	BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
+	BM_ITER (e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
 		if (BM_elem_flag_test(e, BM_ELEM_SELECT)) {
 			BMIter iter2;
 			BMEdge *e2;
@@ -4602,7 +4602,7 @@ static int createSlideVerts(TransInfo *t)
 			dis2 = -1.0f;
 			for (i=0; i<2; i++) {
 				v = i?e->v1:e->v2;
-				BM_ITER(e2, &iter2, em->bm, BM_EDGES_OF_VERT, v) {
+				BM_ITER (e2, &iter2, em->bm, BM_EDGES_OF_VERT, v) {
 					if (BM_elem_flag_test(e2, BM_ELEM_SELECT))
 						continue;
 					
@@ -4648,14 +4648,14 @@ static int createSlideVerts(TransInfo *t)
 		BMFace *f;
 		BMLoop *l;
 		
-		BM_ITER(f, &fiter, em->bm, BM_FACES_OF_VERT, tempsv->v) {
+		BM_ITER (f, &fiter, em->bm, BM_FACES_OF_VERT, tempsv->v) {
 			
 			if (!BLI_smallhash_haskey(&sld->origfaces, (uintptr_t)f)) {
 				BMFace *copyf = BM_face_copy(em->bm, f, TRUE, TRUE);
 				
 				BM_elem_select_set(em->bm, copyf, FALSE);
 				BM_elem_flag_enable(copyf, BM_ELEM_HIDDEN);
-				BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, copyf) {
+				BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, copyf) {
 					BM_elem_select_set(em->bm, l->v, FALSE);
 					BM_elem_flag_enable(l->v, BM_ELEM_HIDDEN);
 					BM_elem_select_set(em->bm, l->e, FALSE);
@@ -4720,7 +4720,7 @@ void projectSVData(TransInfo *t, int final)
 		BMIter fiter;
 		BMFace *f;
 		
-		BM_ITER(f, &fiter, em->bm, BM_FACES_OF_VERT, tempsv->v) {
+		BM_ITER (f, &fiter, em->bm, BM_FACES_OF_VERT, tempsv->v) {
 			BMIter liter2;
 			BMFace *copyf, *copyf2;
 			BMLoop *l2;
@@ -4740,7 +4740,7 @@ void projectSVData(TransInfo *t, int final)
 			copyf2 = BLI_smallhash_lookup(&sld->origfaces, (uintptr_t)f);
 			
 			/* project onto copied projection face */
-			BM_ITER(l2, &liter2, em->bm, BM_LOOPS_OF_FACE, f) {
+			BM_ITER (l2, &liter2, em->bm, BM_LOOPS_OF_FACE, f) {
 				copyf = copyf2;
 				
 				if (BM_elem_flag_test(l2->e, BM_ELEM_SELECT) || BM_elem_flag_test(l2->prev->e, BM_ELEM_SELECT)) {
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index a6f26f4a5d1..ff5ce9af596 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -309,7 +309,7 @@ static void createTransEdge(TransInfo *t)
 	int count=0, countsel=0;
 	int propmode = t->flag & T_PROP_EDIT;
 
-	BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
+	BM_ITER (eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
 		if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
 			if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) countsel++;
 			if (propmode) count++;
@@ -331,7 +331,7 @@ static void createTransEdge(TransInfo *t)
 	copy_m3_m4(mtx, t->obedit->obmat);
 	invert_m3_m3(smtx, mtx);
 
-	BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
+	BM_ITER (eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
 		if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && (BM_elem_flag_test(eed, BM_ELEM_SELECT) || propmode)) { 
 			float *bweight = CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_BWEIGHT);
 			float *crease = CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_CREASE);
@@ -1888,7 +1888,7 @@ static void editmesh_set_connectivity_distance(BMEditMesh *em, float mtx[][3], f
 
 	BLI_smallhash_init(visit);
 
-	BM_ITER(v, &viter, em->bm, BM_VERTS_OF_MESH, NULL) {
+	BM_ITER (v, &viter, em->bm, BM_VERTS_OF_MESH, NULL) {
 		if (BM_elem_flag_test(v, BM_ELEM_SELECT)==0 || BM_elem_flag_test(v, BM_ELEM_HIDDEN))
 			continue;
 			
@@ -1909,7 +1909,7 @@ static void editmesh_set_connectivity_distance(BMEditMesh *em, float mtx[][3], f
 		v2 = queue[start];
 		d = dqueue[start];
 		
-		BM_ITER(e, &eiter, em->bm, BM_EDGES_OF_VERT, v2) {
+		BM_ITER (e, &eiter, em->bm, BM_EDGES_OF_VERT, v2) {
 			float d2;
 			v3 = BM_edge_other_vert(e, v2);
 			
@@ -1959,7 +1959,7 @@ static void editmesh_set_connectivity_distance(BMEditMesh *em, float mtx[][3], f
 	BMFace *efa;
 	BMIter iter;
 
-	BM_ITER(efa, &iter, bm, BM_FACES_OF_VERT, eve) {
+	BM_ITER (efa, &iter, bm, BM_FACES_OF_VERT, eve) {
 		if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
 			BM_face_center_mean_calc(bm, efa, cent_r);
 			break;
@@ -1972,7 +1972,7 @@ static void get_edge_center(float cent_r[3], BMesh *bm, BMVert *eve)
 	BMEdge *eed;
 	BMIter iter;
 
-	BM_ITER(eed, &iter, bm, BM_EDGES_OF_VERT, eve) {
+	BM_ITER (eed, &iter, bm, BM_EDGES_OF_VERT, eve) {
 		if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
 			mid_v3_v3v3(cent_r, eed->v1->co, eed->v2->co);
 			break;
@@ -2051,7 +2051,7 @@ static void createTransEditVerts(bContext *C, TransInfo *t)
 
 	// transform now requires awareness for select mode, so we tag the f1 flags in verts
 	if (selectmode & SCE_SELECT_VERTEX) {
-		BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
+		BM_ITER (eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
 			BM_elem_flag_set(eve, BM_ELEM_TAG, BM_elem_flag_test(eve, BM_ELEM_SELECT));
 		}
 	}
@@ -2452,7 +2452,7 @@ static void createTransUVs(bContext *C, TransInfo *t)
 	if (!ED_space_image_show_uvedit(sima, t->obedit)) return;
 
 	/* count */
-	BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
 		tf= CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY);
 
 		if (!uvedit_face_visible(scene, ima, efa, tf)) {
@@ -2461,7 +2461,7 @@ static void createTransUVs(bContext *C, TransInfo *t)
 		}
 		
 		BM_elem_flag_enable(efa, BM_ELEM_TAG);
-		BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
+		BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
 			if (uvedit_uv_selected(em, scene, l)) 
 				countsel++;
 
@@ -2485,11 +2485,11 @@ static void createTransUVs(bContext *C, TransInfo *t)
 	td= t->data;
 	td2d= t->data2d;
 
-	BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
 		if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
 			continue;
 
-		BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
+		BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
 			if (!propmode && !uvedit_uv_selected(em, scene, l))
 				continue;
 			
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index c6b8403d54f..4d7c1338f30 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -315,7 +315,7 @@ int calc_manipulator_stats(const bContext *C)
 				 * mode. note we can't use just vertex selection flag because
 				 * it is not flush down on changes */
 				if (ts->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)) {
 							if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
 								totsel++;
@@ -327,10 +327,10 @@ int calc_manipulator_stats(const bContext *C)
 				else if (ts->selectmode & SCE_SELECT_EDGE) {
 					BMIter itersub;
 					BMEdge *eed;
-					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)) {
 							/* check the vertex has a selected edge, only add it once */
-							BM_ITER(eed, &itersub, bm, BM_EDGES_OF_VERT, eve) {
+							BM_ITER (eed, &itersub, bm, BM_EDGES_OF_VERT, eve) {
 								if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
 									totsel++;
 									calc_tw_center(scene, eve->co);
@@ -343,10 +343,10 @@ int calc_manipulator_stats(const bContext *C)
 				else {
 					BMIter itersub;
 					BMFace *efa;
-					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)) {
 							/* check the vertex has a selected face, only add it once */
-							BM_ITER(efa, &itersub, bm, BM_FACES_OF_VERT, eve) {
+							BM_ITER (efa, &itersub, bm, BM_FACES_OF_VERT, eve) {
 								if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
 									totsel++;
 									calc_tw_center(scene, eve->co);
diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c
index d822bb0aaf7..968b3fd6993 100644
--- a/source/blender/editors/transform/transform_orientations.c
+++ b/source/blender/editors/transform/transform_orientations.c
@@ -599,7 +599,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 					BMFace *efa;
 					BMIter iter;
 
-					BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+					BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
 						if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
 							add_v3_v3(normal, efa->no);
 							sub_v3_v3v3(vec,
@@ -616,7 +616,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 					BMIter iter;
 					float cotangent[3];
 					
-					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)) {
 							if (v1 == NULL) {
 								v1 = eve; 
@@ -640,7 +640,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 						BMEdge *eed = NULL;
 						BMIter iter;
 						
-						BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
+						BM_ITER (eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
 							if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
 								sub_v3_v3v3(plane, eed->v2->co, eed->v1->co);
 								break;
@@ -654,7 +654,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 					BMEdge *eed = NULL;
 					BMIter iter;
 					
-					BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
+					BM_ITER (eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
 						if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
 							/* use average vert normals as plane and edge vector as normal */
 							copy_v3_v3(plane, eed->v1->no);
@@ -669,7 +669,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 					BMVert *v1 = NULL, *v2 = NULL;
 					BMIter iter;
 
-					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)) {
 							if (v1 == NULL) {
 								v1 = eve; 
@@ -689,7 +689,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 				else if (em->bm->totvertsel == 1) {
 					BMIter iter;
 
-					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)) {
 							copy_v3_v3(normal, eve->no);
 							break;
@@ -702,7 +702,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 
 					zero_v3(normal);
 
-					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)) {
 							add_v3_v3(normal, eve->no);
 						}