style cleanup: BM_ITER / BM_ITER_INDEX / BMO_ITER

12 files changed, 129 insertions, 137 deletions

diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c
index d4a799764df..f1d0d63ba03 100644
--- a/source/blender/editors/mesh/editface.c
+++ b/source/blender/editors/mesh/editface.c
@@ -814,7 +814,7 @@ void ED_mesh_mirrtopo_init(Mesh *me, const int ob_mode, MirrTopoStore_t *mesh_to
 	if (em) {
 		totedge = me->edit_btmesh->bm->totedge;
 
-		BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
+		BM_ITER (eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
 			topo_hash[BM_elem_index_get(eed->v1)]++;
 			topo_hash[BM_elem_index_get(eed->v2)]++;
 		}
@@ -835,7 +835,7 @@ void ED_mesh_mirrtopo_init(Mesh *me, const int ob_mode, MirrTopoStore_t *mesh_to
 		/* use the number of edges per vert to give verts unique topology IDs */
 
 		if (em) {
-			BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
+			BM_ITER (eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
 				topo_hash[BM_elem_index_get(eed->v1)] += topo_hash_prev[BM_elem_index_get(eed->v2)];
 				topo_hash[BM_elem_index_get(eed->v2)] += topo_hash_prev[BM_elem_index_get(eed->v1)];
 			}
diff --git a/source/blender/editors/mesh/editmesh_bvh.c b/source/blender/editors/mesh/editmesh_bvh.c
index 4b21b6b2a8e..9f5ab8a20d8 100644
--- a/source/blender/editors/mesh/editmesh_bvh.c
+++ b/source/blender/editors/mesh/editmesh_bvh.c
@@ -125,7 +125,7 @@ BMBVHTree *BMBVH_NewBVH(BMEditMesh *em, int flag, Scene *scene, Object *obedit)
 		void *data[3];
 		
 		tree->cos = MEM_callocN(sizeof(float) * 3 * em->bm->totvert, "bmbvh cos");
-		BM_ITER_INDEX(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL, i) {
+		BM_ITER_INDEX (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL, i) {
 			BM_elem_index_set(v, i); /* set_inline */
 			copy_v3_v3(tree->cos[i], v->co);
 		}
diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c
index 39b214289dc..dc0d8f13a2a 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -556,7 +556,7 @@ static void knife_get_vert_faces(knifetool_opdata *kcd, KnifeVert *kfv, BMFace *
 	}
 	else if (kfv->v) {
 		BMesh *bm = kcd->em->bm;
-		BM_ITER(f, &bmiter, bm, BM_FACES_OF_VERT, kfv->v) {
+		BM_ITER (f, &bmiter, bm, BM_FACES_OF_VERT, kfv->v) {
 			knife_append_list(kcd, lst, f);
 		}
 	}
@@ -569,7 +569,7 @@ static void knife_get_edge_faces(knifetool_opdata *kcd, KnifeEdge *kfe, ListBase
 
 	if (kfe->e) {
 		BMesh *bm = kcd->em->bm;
-		BM_ITER(f, &bmiter, bm, BM_FACES_OF_EDGE, kfe->e) {
+		BM_ITER (f, &bmiter, bm, BM_FACES_OF_EDGE, kfe->e) {
 			knife_append_list(kcd, lst, f);
 		}
 	}
@@ -1681,7 +1681,7 @@ static void remerge_faces(knifetool_opdata *kcd)
 	BMO_op_finish(bm, &bmop);
 
 	BLI_smallhash_init(visit);
-	BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) {
 		BMIter eiter;
 		BMEdge *e;
 		BMFace *f2;
@@ -1702,14 +1702,14 @@ static void remerge_faces(knifetool_opdata *kcd)
 
 			BLI_array_append(faces, f2);
 
-			BM_ITER(e, &eiter, bm, BM_EDGES_OF_FACE, f2) {
+			BM_ITER (e, &eiter, bm, BM_EDGES_OF_FACE, f2) {
 				BMIter fiter;
 				BMFace *f3;
 
 				if (BMO_elem_flag_test(bm, e, BOUNDARY))
 					continue;
 
-				BM_ITER(f3, &fiter, bm, BM_FACES_OF_EDGE, e) {
+				BM_ITER (f3, &fiter, bm, BM_FACES_OF_EDGE, e) {
 					if (!BMO_elem_flag_test(bm, f3, FACE_NEW))
 						continue;
 					if (BLI_smallhash_haskey(visit, (intptr_t)f3))
@@ -1764,14 +1764,14 @@ static void knifenet_fill_faces(knifetool_opdata *kcd)
 
 	/* BMESH_TODO this should be valid now, leaving here until we can ensure this - campbell */
 	i = 0;
-	BM_ITER(f, &bmiter, bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER (f, &bmiter, bm, BM_FACES_OF_MESH, NULL) {
 		BM_elem_index_set(f, i); /* set_inline */
 		faces[i] = f;
 		i++;
 	}
 	bm->elem_index_dirty &= ~BM_FACE;
 
-	BM_ITER(e, &bmiter, bm, BM_EDGES_OF_MESH, NULL) {
+	BM_ITER (e, &bmiter, bm, BM_EDGES_OF_MESH, NULL) {
 		BMO_elem_flag_enable(bm, e, BOUNDARY);
 	}
 
@@ -1959,7 +1959,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd)
 	bm->elem_index_dirty |= BM_FACE;
 
 	/* interpolate customdata */
-	BM_ITER(f, &bmiter, bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER (f, &bmiter, bm, BM_FACES_OF_MESH, NULL) {
 		BMLoop *l1;
 		BMFace *f2;
 		BMIter liter1;
@@ -1974,7 +1974,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd)
 
 		BM_elem_attrs_copy(bm, bm, f2, f);
 
-		BM_ITER(l1, &liter1, bm, BM_LOOPS_OF_FACE, f) {
+		BM_ITER (l1, &liter1, bm, BM_LOOPS_OF_FACE, f) {
 			BM_loop_interp_from_face(bm, l1, f2, TRUE, TRUE);
 		}
 	}
@@ -2281,7 +2281,7 @@ static int find_hole_chains(knifetool_opdata *kcd, ListBase *hole, BMFace *f, Li
 	}
 
 	j = 0;
-	BM_ITER(v, &iter, kcd->em->bm, BM_VERTS_OF_FACE, f) {
+	BM_ITER (v, &iter, kcd->em->bm, BM_VERTS_OF_FACE, f) {
 		fco[j] = BLI_memarena_alloc(kcd->arena, 2 * sizeof(float));
 		fco[j][0] = v->co[ax];
 		fco[j][1] = v->co[ay];
@@ -2388,7 +2388,7 @@ static int knife_edge_in_face(knifetool_opdata *kcd, KnifeEdge *kfe, BMFace *f)
 	l2 = NULL;
 
 	/* find out if v1 and v2, if set, are part of the face */
-	BM_ITER(l, &iter, bm, BM_LOOPS_OF_FACE, f) {
+	BM_ITER (l, &iter, bm, BM_LOOPS_OF_FACE, f) {
 		if (v1 && l->v == v1)
 			l1 = l;
 		if (v2 && l->v == v2)
diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c
index 90f88abe141..a41059ef3ca 100644
--- a/source/blender/editors/mesh/editmesh_loopcut.c
+++ b/source/blender/editors/mesh/editmesh_loopcut.c
@@ -145,7 +145,7 @@ static void edgering_find_order(BMEditMesh *em, BMEdge *lasteed, BMEdge *eed,
 
 	/* find correct order for v[1] */
 	if (!(BM_edge_in_face(l->f, eed) && BM_edge_in_face(l->f, lasteed))) {
-		BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_LOOP, l) {
+		BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_LOOP, l) {
 			if (BM_edge_in_face(l->f, eed) && BM_edge_in_face(l->f, lasteed))
 				break;
 		}
diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c
index f22a4ae9a97..7904c6f8c36 100644
--- a/source/blender/editors/mesh/editmesh_rip.c
+++ b/source/blender/editors/mesh/editmesh_rip.c
@@ -158,7 +158,7 @@ static BMEdge *edbm_ripsel_edge_mark_step(BMesh *bm, BMVert *v, const int uid)
 {
 	BMIter iter;
 	BMEdge *e;
-	BM_ITER(e, &iter, bm, BM_EDGES_OF_VERT, v) {
+	BM_ITER (e, &iter, bm, BM_EDGES_OF_VERT, v) {
 		if (IS_VISIT_POSSIBLE(e) && !IS_VISIT_DONE(e)) {
 			BMLoop *l_a, *l_b;
 
@@ -196,8 +196,8 @@ static EdgeLoopPair *edbm_ripsel_looptag_helper(BMesh *bm)
 	EdgeLoopPair *lp;
 
 	/* initialize loops with dummy invalid index values */
-	BM_ITER(f, &fiter, bm, BM_FACES_OF_MESH, NULL) {
-		BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, f) {
+	BM_ITER (f, &fiter, bm, BM_FACES_OF_MESH, NULL) {
+		BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, f) {
 			BM_elem_index_set(l, INVALID_UID);
 		}
 	}
@@ -213,7 +213,7 @@ static EdgeLoopPair *edbm_ripsel_looptag_helper(BMesh *bm)
 		BMEdge *e_last;
 
 		e_first = NULL;
-		BM_ITER(e, &eiter, bm, BM_EDGES_OF_MESH, NULL) {
+		BM_ITER (e, &eiter, bm, BM_EDGES_OF_MESH, NULL) {
 			if (IS_VISIT_POSSIBLE(e) && !IS_VISIT_DONE(e)) {
 				e_first = e;
 				break;
@@ -290,7 +290,7 @@ static BMEdge *edbm_ripsel_edge_uid_step(BMesh *bm, BMEdge *e_orig, BMVert **v_p
 	BMVert *v = BM_edge_other_vert(e_orig, *v_prev);
 	const int uid_cmp = BM_elem_index_get(e_orig->l) - 1;
 
-	BM_ITER(e, &eiter, bm, BM_EDGES_OF_VERT, v) {
+	BM_ITER (e, &eiter, bm, BM_EDGES_OF_VERT, v) {
 		if (BM_elem_index_get(e->l) == uid_cmp) {
 			*v_prev = v;
 			return e;
@@ -374,7 +374,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	ED_view3d_ob_project_mat_get(rv3d, obedit, projectMat);
 
 	/* BM_ELEM_SELECT --> BM_ELEM_TAG */
-	BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
+	BM_ITER (e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
 		BM_elem_flag_set(e, BM_ELEM_TAG, BM_elem_flag_test(e, BM_ELEM_SELECT));
 	}
 
@@ -393,7 +393,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, wmEvent *event)
 		else {
 			ese.ele = NULL;
 
-			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))
 					break;
 			}
@@ -407,7 +407,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, wmEvent *event)
 
 		if (v->e) {
 			/* find closest edge to mouse cursor */
-			BM_ITER(e, &iter, bm, BM_EDGES_OF_VERT, v) {
+			BM_ITER (e, &iter, bm, BM_EDGES_OF_VERT, v) {
 				int is_boundary = BM_edge_is_boundary(e);
 				/* consider wire as boundary for this purpose,
 				 * otherwise we can't a face away from a wire edge */
@@ -455,7 +455,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, wmEvent *event)
 				dist = FLT_MAX;
 
 				for (i = 0; i < vout_len; i++) {
-					BM_ITER(l, &iter, bm, BM_LOOPS_OF_VERT, vout[i]) {
+					BM_ITER (l, &iter, bm, BM_LOOPS_OF_VERT, vout[i]) {
 						if (!BM_elem_flag_test(l->f, BM_ELEM_HIDDEN)) {
 							float l_mid_co[3];
 							BM_loop_face_tangent(l, l_mid_co);
@@ -534,10 +534,10 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	}
 	else {
 		/* expand edge selection */
-		BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
+		BM_ITER (v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
 			e2 = NULL;
 			i = 0;
-			BM_ITER(e, &eiter, bm, BM_EDGES_OF_VERT, v) {
+			BM_ITER (e, &eiter, bm, BM_EDGES_OF_VERT, v) {
 				/* important to check selection rather then tag here
 				 * else we get feedback loop */
 				if (BM_elem_flag_test(e, BM_ELEM_SELECT)) {
@@ -584,7 +584,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	{
 		/* simple per edge selection check, saves a lot of code and is almost good enough */
 		BMOIter siter;
-		BMO_ITER(e, &siter, bm, &bmop, "edgeout", BM_EDGE) {
+		BMO_ITER (e, &siter, bm, &bmop, "edgeout", BM_EDGE) {
 			if (edbm_rip_edge_side_measure(e, ar, projectMat, fmval) > 0.0f) {
 				BM_elem_select_set(bm, e, FALSE);
 			}
@@ -604,12 +604,12 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, wmEvent *event)
 #else
 
 		dist = FLT_MAX;
-		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)) {
 				/* disable by default, re-enable winner at end */
 				BM_elem_select_set(bm, v, FALSE);
 
-				BM_ITER(l, &liter, bm, BM_LOOPS_OF_VERT, v) {
+				BM_ITER (l, &liter, bm, BM_LOOPS_OF_VERT, v) {
 					/* calculate a point in the face, rather then calculate the middle,
 					 * make a vector pointing between the 2 edges attached to this loop */
 					sub_v3_v3v3(l_prev_co, l->prev->v->co, l->v->co);
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c
index 6505337d1a4..df1775c3f07 100644
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@ -75,7 +75,7 @@ void EDBM_select_mirrored(Object *UNUSED(obedit), BMEditMesh *em, int extend)
 	BMVert *v1, *v2;
 	BMIter iter;
 
-	BM_ITER(v1, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+	BM_ITER (v1, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
 		if (!BM_elem_flag_test(v1, BM_ELEM_SELECT) || BM_elem_flag_test(v1, BM_ELEM_HIDDEN)) {
 			BM_elem_flag_disable(v1, BM_ELEM_TAG);
 		}
@@ -89,7 +89,7 @@ void EDBM_select_mirrored(Object *UNUSED(obedit), BMEditMesh *em, int extend)
 	if (!extend)
 		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
 
-	BM_ITER(v1, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+	BM_ITER (v1, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
 		if (!BM_elem_flag_test(v1, BM_ELEM_TAG) || BM_elem_flag_test(v1, BM_ELEM_HIDDEN))
 			continue;
 
@@ -1221,7 +1221,7 @@ static int edgetag_shortest_path(Scene *scene, BMEditMesh *em, BMEdge *source, B
 	/* note, would pass BM_EDGE except we are looping over all edges anyway */
 	BM_mesh_elem_index_ensure(em->bm, BM_VERT /* | BM_EDGE */);
 
-	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_HIDDEN)) {
 			BLI_smallhash_insert(&visithash, (uintptr_t)e, NULL);
 		}
@@ -1239,7 +1239,7 @@ static int edgetag_shortest_path(Scene *scene, BMEditMesh *em, BMEdge *source, B
 	cost = MEM_mallocN(sizeof(*cost) * totedge, "SeamPathCost");
 
 	/* count edges, compute adjacent edges offsets and fill adjacent */
-	BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
+	BM_ITER (e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
 		nedges[BM_elem_index_get(e->v1) + 1]++;
 		nedges[BM_elem_index_get(e->v2) + 1]++;
 	}
@@ -1252,7 +1252,7 @@ static int edgetag_shortest_path(Scene *scene, BMEditMesh *em, BMEdge *source, B
 	nedges[0] = nedges[1] = 0;
 
 	i = 0;
-	BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
+	BM_ITER (e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
 		edges[nedges[BM_elem_index_get(e->v1) + 1]++] = i;
 		edges[nedges[BM_elem_index_get(e->v2) + 1]++] = i;
 
@@ -1643,7 +1643,7 @@ void EDBM_deselect_by_material(BMEditMesh *em, const short index, const short se
 	BMIter iter;
 	BMFace *efa;
 
-	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_HIDDEN))
 			continue;
 		if (efa->mat_nr == index) {
@@ -1668,21 +1668,21 @@ void EDBM_select_swap(BMEditMesh *em) /* exported for UV */
 	BMFace *efa;
 	
 	if (em->bm->selectmode & SCE_SELECT_VERTEX) {
-		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_HIDDEN))
 				continue;
 			BM_elem_select_set(em->bm, eve, !BM_elem_flag_test(eve, BM_ELEM_SELECT));
 		}
 	}
 	else if (em->selectmode & SCE_SELECT_EDGE) {
-		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))
 				continue;
 			BM_elem_select_set(em->bm, eed, !BM_elem_flag_test(eed, BM_ELEM_SELECT));
 		}
 	}
 	else {
-		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_HIDDEN))
 				continue;
 			BM_elem_select_set(em->bm, efa, !BM_elem_flag_test(efa, BM_ELEM_SELECT));
@@ -1702,13 +1702,13 @@ int EDBM_select_interior_faces(BMEditMesh *em)
 	int ok;
 	int change = FALSE;
 
-	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_HIDDEN))
 			continue;
 
 
 		ok = TRUE;
-		BM_ITER(eed, &eiter, bm, BM_EDGES_OF_FACE, efa) {
+		BM_ITER (eed, &eiter, bm, BM_EDGES_OF_FACE, efa) {
 			if (BM_edge_face_count(eed) < 3) {
 				ok = FALSE;
 				break;
@@ -1785,7 +1785,7 @@ static int edbm_select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent *
 
 		if (limit) {
 			/* hflag no-seam --> bmo-tag */
-			BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
+			BM_ITER (e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
 				/* BMESH_TODO, don't use 'BM_ELEM_SELECT' here, its a HFLAG only! */
 				BMO_elem_flag_set(bm, e, BM_ELEM_SELECT, !BM_elem_flag_test(e, BM_ELEM_SEAM));
 			}
@@ -1870,13 +1870,13 @@ static int edbm_select_linked_exec(bContext *C, wmOperator *op)
 	if (em->selectmode == SCE_SELECT_FACE) {
 		BMFace *efa;
 
-		BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+		BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
 			BM_elem_flag_set(efa, BM_ELEM_TAG, (BM_elem_flag_test(efa, BM_ELEM_SELECT) &&
 			                                    !BM_elem_flag_test(efa, BM_ELEM_HIDDEN)));
 		}
 
 		if (limit) {
-			BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
+			BM_ITER (e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
 				/* BMESH_TODO, don't use 'BM_ELEM_SELECT' here, its a HFLAG only! */
 				BMO_elem_flag_set(bm, e, BM_ELEM_SELECT, !BM_elem_flag_test(e, BM_ELEM_SEAM));
 			}
@@ -1887,7 +1887,7 @@ static int edbm_select_linked_exec(bContext *C, wmOperator *op)
 		         BMW_FLAG_TEST_HIDDEN,
 		         BMW_NIL_LAY);
 
-		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)) {
 				e = BMW_begin(&walker, efa);
 				for (; efa; efa = BMW_step(&walker)) {
@@ -1898,7 +1898,7 @@ static int edbm_select_linked_exec(bContext *C, wmOperator *op)
 		BMW_end(&walker);
 	}
 	else  {
-		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);
 			}
@@ -1912,7 +1912,7 @@ static int edbm_select_linked_exec(bContext *C, wmOperator *op)
 		         BMW_FLAG_TEST_HIDDEN,
 		         BMW_NIL_LAY);
 
-		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)) {
 				e = BMW_begin(&walker, v);
 				for (; e; e = BMW_step(&walker)) {
@@ -2044,8 +2044,7 @@ static void walker_deselect_nth(BMEditMesh *em, int nth, int offset, BMHeader *h
 	/* Walker restrictions uses BMO flags, not header flags,
 	 * so transfer BM_ELEM_SELECT from HFlags onto a BMO flag layer. */
 	BMO_push(bm, NULL);
-	BM_ITER(ele, &iter, bm, itertype, NULL)
-	{
+	BM_ITER (ele, &iter, bm, itertype, NULL) {
 		if (BM_elem_flag_test(ele, BM_ELEM_SELECT)) {
 			/* BMESH_TODO, don't use 'BM_ELEM_SELECT' here, its a HFLAG only! */
 			BMO_elem_flag_enable(bm, (BMElemF *)ele, BM_ELEM_SELECT);
@@ -2103,7 +2102,7 @@ static void deselect_nth_active(BMEditMesh *em, BMVert **r_eve, BMEdge **r_eed,
 	}
 
 	if (em->selectmode & SCE_SELECT_VERTEX) {
-		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)) {
 				*r_eve = v;
 				return;
@@ -2111,7 +2110,7 @@ static void deselect_nth_active(BMEditMesh *em, BMVert **r_eve, BMEdge **r_eed,
 		}
 	}
 	else if (em->selectmode & SCE_SELECT_EDGE) {
-		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)) {
 				*r_eed = e;
 				return;
@@ -2224,7 +2223,7 @@ static int edbm_select_sharp_edges_exec(bContext *C, wmOperator *op)
 
 	sharp = DEG2RADF(sharp);
 
-	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_HIDDEN) || !e->l)
 			continue;
 
@@ -2279,11 +2278,11 @@ static int edbm_select_linked_flat_faces_exec(bContext *C, wmOperator *op)
 
 	sharp = (sharp * M_PI) / 180.0;
 
-	BM_ITER(f, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER (f, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
 		BM_elem_flag_disable(f, BM_ELEM_TAG);
 	}
 
-	BM_ITER(f, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER (f, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
 		if (BM_elem_flag_test(f, BM_ELEM_HIDDEN) || !BM_elem_flag_test(f, BM_ELEM_SELECT) || BM_elem_flag_test(f, BM_ELEM_TAG))
 			continue;
 
@@ -2301,8 +2300,8 @@ static int edbm_select_linked_flat_faces_exec(bContext *C, wmOperator *op)
 
 			BM_elem_flag_enable(f, BM_ELEM_TAG);
 
-			BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, f) {
-				BM_ITER(l2, &liter2, em->bm, BM_LOOPS_OF_LOOP, l) {
+			BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, f) {
+				BM_ITER (l2, &liter2, em->bm, BM_LOOPS_OF_LOOP, l) {
 					float angle;
 
 					if (BM_elem_flag_test(l2->f, BM_ELEM_TAG) || BM_elem_flag_test(l2->f, BM_ELEM_HIDDEN))
@@ -2364,13 +2363,13 @@ static int edbm_select_non_manifold_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 	
-	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_HIDDEN) && !BM_vert_is_manifold(v)) {
 			BM_elem_select_set(em->bm, v, TRUE);
 		}
 	}
 	
-	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_HIDDEN) && !BM_edge_is_manifold(e)) {
 			BM_elem_select_set(em->bm, e, TRUE);
 		}
@@ -2412,7 +2411,7 @@ static int edbm_select_random_exec(bContext *C, wmOperator *op)
 		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
 
 	if (em->selectmode & SCE_SELECT_VERTEX) {
-		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_HIDDEN) && BLI_frand() < randfac) {
 				BM_elem_select_set(em->bm, eve, TRUE);
 			}
@@ -2420,7 +2419,7 @@ static int edbm_select_random_exec(bContext *C, wmOperator *op)
 		EDBM_selectmode_flush(em);
 	}
 	else if (em->selectmode & SCE_SELECT_EDGE) {
-		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) && BLI_frand() < randfac) {
 				BM_elem_select_set(em->bm, eed, TRUE);
 			}
@@ -2428,7 +2427,7 @@ static int edbm_select_random_exec(bContext *C, wmOperator *op)
 		EDBM_selectmode_flush(em);
 	}
 	else {
-		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_HIDDEN) && BLI_frand() < randfac) {
 				BM_elem_select_set(em->bm, efa, TRUE);
 			}
@@ -2470,15 +2469,15 @@ static int edbm_select_next_loop_exec(bContext *C, wmOperator *UNUSED(op))
 	BMVert *v;
 	BMIter iter;
 	
-	BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+	BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
 		BM_elem_flag_disable(v, BM_ELEM_TAG);
 	}
 	
-	BM_ITER(f, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER (f, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
 		BMLoop *l;
 		BMIter liter;
 		
-		BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, f) {
+		BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, f) {
 			if (BM_elem_flag_test(l->v, BM_ELEM_SELECT)) {
 				BM_elem_flag_enable(l->next->v, BM_ELEM_TAG);
 				BM_elem_select_set(em->bm, l->v, FALSE);
@@ -2486,7 +2485,7 @@ static int edbm_select_next_loop_exec(bContext *C, wmOperator *UNUSED(op))
 		}
 	}
 
-	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)) {
 			BM_elem_select_set(em->bm, v, TRUE);
 		}
@@ -2523,18 +2522,18 @@ static int edbm_region_to_loop_exec(bContext *C, wmOperator *UNUSED(op))
 	
 	em_setup_viewcontext(C, &vc);
 	
-	BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
+	BM_ITER (e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
 		BM_elem_flag_disable(e, BM_ELEM_TAG);
 	}
 
-	BM_ITER(f, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER (f, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
 		BMLoop *l1, *l2;
 		BMIter liter1, liter2;
 		
-		BM_ITER(l1, &liter1, em->bm, BM_LOOPS_OF_FACE, f) {
+		BM_ITER (l1, &liter1, em->bm, BM_LOOPS_OF_FACE, f) {
 			int tot = 0, totsel = 0;
 			
-			BM_ITER(l2, &liter2, em->bm, BM_LOOPS_OF_EDGE, l1->e) {
+			BM_ITER (l2, &liter2, em->bm, BM_LOOPS_OF_EDGE, l1->e) {
 				tot++;
 				totsel += BM_elem_flag_test(l2->f, BM_ELEM_SELECT) != 0;
 			}
@@ -2546,7 +2545,7 @@ static int edbm_region_to_loop_exec(bContext *C, wmOperator *UNUSED(op))
 
 	EDBM_flag_disable_all(em, BM_ELEM_SELECT);
 	
-	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_TAG) && !BM_elem_flag_test(e, BM_ELEM_HIDDEN))
 			BM_edge_select_set(em->bm, e, TRUE);
 	}
@@ -2598,11 +2597,11 @@ static int loop_find_region(BMEditMesh *em, BMLoop *l, int flag,
 		f = BLI_array_pop(stack);
 		BLI_array_append(region, f);
 		
-		BM_ITER(l1, &liter1, em->bm, BM_LOOPS_OF_FACE, f) {
+		BM_ITER (l1, &liter1, em->bm, BM_LOOPS_OF_FACE, f) {
 			if (BM_elem_flag_test(l1->e, flag))
 				continue;
 			
-			BM_ITER(l2, &liter2, em->bm, BM_LOOPS_OF_EDGE, l1->e) {
+			BM_ITER (l2, &liter2, em->bm, BM_LOOPS_OF_EDGE, l1->e) {
 				if (BLI_smallhash_haskey(fhash, (uintptr_t)l2->f))
 					continue;
 				
@@ -2645,11 +2644,11 @@ static int loop_find_regions(BMEditMesh *em, int selbigger)
 	
 	BLI_smallhash_init(&visithash);
 	
-	BM_ITER(f, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER (f, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
 		BM_elem_flag_disable(f, BM_ELEM_TAG);
 	}
 
-	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)) {
 			BLI_array_append(edges, e);
 			BM_elem_flag_enable(e, BM_ELEM_TAG);
@@ -2673,7 +2672,7 @@ static int loop_find_regions(BMEditMesh *em, int selbigger)
 		if (!BM_elem_flag_test(e, BM_ELEM_TAG))
 			continue;
 		
-		BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_EDGE, e) {
+		BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_EDGE, e) {
 			if (BLI_smallhash_haskey(&visithash, (uintptr_t)l->f))
 				continue;
 						
@@ -2700,7 +2699,7 @@ static int loop_find_regions(BMEditMesh *em, int selbigger)
 			
 			for (j = 0; j < tot; j++) {
 				BM_elem_flag_enable(region[j], BM_ELEM_TAG);
-				BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, region[j]) {
+				BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, region[j]) {
 					BM_elem_flag_disable(l->e, BM_ELEM_TAG);
 				}
 			}
@@ -2736,7 +2735,7 @@ static int edbm_loop_to_region_exec(bContext *C, wmOperator *op)
 	
 	EDBM_flag_disable_all(em, BM_ELEM_SELECT);
 	
-	BM_ITER(f, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER (f, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
 		if (BM_elem_flag_test(f, BM_ELEM_TAG) && !BM_elem_flag_test(f, BM_ELEM_HIDDEN)) {
 			BM_face_select_set(em->bm, f, TRUE);
 		}
diff --git a/source/blender/editors/mesh/editmesh_slide.c b/source/blender/editors/mesh/editmesh_slide.c
index 266117ec9a5..f678999311d 100644
--- a/source/blender/editors/mesh/editmesh_slide.c
+++ b/source/blender/editors/mesh/editmesh_slide.c
@@ -504,8 +504,7 @@ static int vtx_slide_set_frame(VertexSlideOp *vso)
 	}
 
 	/* Iterate over edges of vertex and copy them */
-	BM_ITER_INDEX(edge, &iter, bm, BM_EDGES_OF_VERT, sel_vtx, idx)
-	{
+	BM_ITER_INDEX (edge, &iter, bm, BM_EDGES_OF_VERT, sel_vtx, idx) {
 		curr_vert = BM_edge_other_vert(edge, sel_vtx);
 		if (curr_vert) {
 			BLI_array_growone(vtx_frame);
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 12cd7893f5a..e5eb7ad11fd 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -159,7 +159,7 @@ void EMBM_project_snap_verts(bContext *C, ARegion *ar, Object *obedit, BMEditMes
 	BMIter iter;
 	BMVert *eve;
 
-	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)) {
 			float mval[2], vec[3], no_dummy[3];
 			int dist_dummy;
@@ -190,11 +190,11 @@ static short edbm_extrude_face_indiv(BMEditMesh *em, wmOperator *op, const char
 
 	BMO_op_exec(em->bm, &bmop);
 	
-	BMO_ITER(f, &siter, em->bm, &bmop, "faceout", BM_FACE) {
+	BMO_ITER (f, &siter, em->bm, &bmop, "faceout", BM_FACE) {
 		BM_elem_select_set(em->bm, f, TRUE);
 
 		/* set face vertex normals to face normal */
-		BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, f) {
+		BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, f) {
 			copy_v3_v3(l->v->no, f->no);
 		}
 	}
@@ -327,7 +327,7 @@ static short edbm_extrude_edge(Object *obedit, BMEditMesh *em, const char hflag,
 
 	zero_v3(nor);
 	
-	BMO_ITER(ele, &siter, bm, &extop, "geomout", BM_ALL) {
+	BMO_ITER (ele, &siter, bm, &extop, "geomout", BM_ALL) {
 		BM_elem_select_set(bm, ele, TRUE);
 
 		if (ele->head.htype == BM_FACE) {
@@ -735,7 +735,7 @@ static int edbm_dupli_extrude_cursor_invoke(bContext *C, wmOperator *op, wmEvent
 
 	INIT_MINMAX(min, max);
 	
-	BM_ITER(v1, &iter, vc.em->bm, BM_VERTS_OF_MESH, NULL) {
+	BM_ITER (v1, &iter, vc.em->bm, BM_VERTS_OF_MESH, NULL) {
 		if (BM_elem_flag_test(v1, BM_ELEM_SELECT)) {
 			DO_MINMAX(v1->co, min, max);
 			done = 1;
@@ -757,7 +757,7 @@ static int edbm_dupli_extrude_cursor_invoke(bContext *C, wmOperator *op, wmEvent
 
 		/* check for edges that are half selected, use for rotation */
 		done = 0;
-		BM_ITER(eed, &iter, vc.em->bm, BM_EDGES_OF_MESH, NULL) {
+		BM_ITER (eed, &iter, vc.em->bm, BM_EDGES_OF_MESH, NULL) {
 			if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
 				float co1[3], co2[3];
 				mul_v3_m4v3(co1, vc.obedit->obmat, eed->v1->co);
@@ -859,7 +859,7 @@ static int edbm_dupli_extrude_cursor_invoke(bContext *C, wmOperator *op, wmEvent
 		EDBM_op_init(vc.em, &bmop, op, "makevert co=%v", min);
 		BMO_op_exec(vc.em->bm, &bmop);
 
-		BMO_ITER(v1, &oiter, vc.em->bm, &bmop, "newvertout", BM_VERT) {
+		BMO_ITER (v1, &oiter, vc.em->bm, &bmop, "newvertout", BM_VERT) {
 			BM_elem_select_set(vc.em->bm, v1, TRUE);
 		}
 
@@ -1075,7 +1075,7 @@ static int edbm_mark_seam(bContext *C, wmOperator *op)
 	}
 
 	if (clear) {
-		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))
 				continue;
 			
@@ -1083,7 +1083,7 @@ static int edbm_mark_seam(bContext *C, wmOperator *op)
 		}
 	}
 	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))
 				continue;
 			BM_elem_flag_enable(eed, BM_ELEM_SEAM);
@@ -1129,7 +1129,7 @@ static int edbm_mark_sharp(bContext *C, wmOperator *op)
 	}
 
 	if (!clear) {
-		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))
 				continue;
 			
@@ -1137,7 +1137,7 @@ static int edbm_mark_sharp(bContext *C, wmOperator *op)
 		}
 	}
 	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))
 				continue;
 			
@@ -1341,7 +1341,7 @@ static int edbm_edge_rotate_selected_exec(bContext *C, wmOperator *op)
 	}
 
 	/* first see if we have two adjacent faces */
-	BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
+	BM_ITER (eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
 		BM_elem_flag_disable(eed, BM_ELEM_TAG);
 		if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
 			BMFace *fa, *fb;
@@ -1581,7 +1581,7 @@ static void mesh_set_smooth_faces(BMEditMesh *em, short smooth)
 
 	if (em == NULL) return;
 	
-	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)) {
 			BM_elem_flag_set(efa, BM_ELEM_SMOOTH, smooth);
 		}
@@ -1863,7 +1863,7 @@ static int merge_target(BMEditMesh *em, Scene *scene, View3D *v3d, Object *ob,
 	else {
 		float fac;
 		int i = 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))
 				continue;
 			add_v3_v3(cent, v->co);
@@ -2149,7 +2149,7 @@ static void shape_propagate(BMEditMesh *em, wmOperator *op)
 		return;
 	}
 	
-	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) || BM_elem_flag_test(eve, BM_ELEM_HIDDEN))
 			continue;
 
@@ -2218,7 +2218,7 @@ static int edbm_blend_from_shape_exec(bContext *C, wmOperator *op)
 	if (totshape == 0 || shape < 0 || shape >= totshape)
 		return OPERATOR_CANCELLED;
 
-	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) || BM_elem_flag_test(eve, BM_ELEM_HIDDEN))
 			continue;
 
@@ -2323,7 +2323,7 @@ static int edbm_select_axis_exec(bContext *C, wmOperator *op)
 		else if (mode == 1)
 			value += limit;
 
-		BM_ITER(ev, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+		BM_ITER (ev, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
 			if (!BM_elem_flag_test(ev, BM_ELEM_HIDDEN)) {
 				switch (mode) {
 					case -1: /* aligned */
@@ -2797,7 +2797,7 @@ static int mesh_separate_selected(Main *bmain, Scene *scene, Base *editbase, wmO
 	EDBM_op_callf(em, wmop, "del geom=%hvef context=%i", BM_ELEM_SELECT, DEL_FACES);
 
 	/* clean up any loose edges */
-	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_HIDDEN))
 			continue;
 
@@ -2808,7 +2808,7 @@ static int mesh_separate_selected(Main *bmain, Scene *scene, Base *editbase, wmO
 	EDBM_op_callf(em, wmop, "del geom=%hvef context=%i", BM_ELEM_SELECT, DEL_EDGES);
 
 	/* clean up any loose verts */
-	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_HIDDEN))
 			continue;
 
@@ -2844,7 +2844,7 @@ static int mesh_separate_material(Main *bmain, Scene *scene, Base *editbase, wmO
 		const short mat_nr = f_cmp->mat_nr;
 		int tot = 0;
 
-		BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) {
+		BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) {
 			if (f->mat_nr == mat_nr) {
 				BM_face_select_set(bm, f, TRUE);
 				tot++;
@@ -2888,7 +2888,7 @@ static int mesh_separate_loose(Main *bmain, Scene *scene, Base *editbase, wmOper
 	for (i = 0; i < max_iter; i++) {
 		/* Get a seed vertex to start the walk */
 		v_seed = NULL;
-		BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
+		BM_ITER (v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
 			v_seed = v;
 			break;
 		}
@@ -3664,8 +3664,7 @@ static void xsortvert_flag(bContext *UNUSED(C), int UNUSED(flag))
 
 	amount = em->bm->totvert;
 	sortblock = MEM_callocN(sizeof(xvertsort) * amount, "xsort");
-	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))
 			sortblock[i].v1 = eve;
 	}
@@ -4012,7 +4011,7 @@ static int edbm_noise_exec(bContext *C, wmOperator *op)
 	if (tex->type == TEX_STUCCI) {
 		float b2, vec[3];
 		float ofs = tex->turbul / 200.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)) {
 				b2 = BLI_hnoise(tex->noisesize, eve->co[0], eve->co[1], eve->co[2]);
 				if (tex->stype) ofs *= (b2 * b2);
@@ -4025,7 +4024,7 @@ static int edbm_noise_exec(bContext *C, wmOperator *op)
 		}
 	}
 	else {
-		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)) {
 				float tin, dum;
 				externtex(ma->mtex[0], eve->co, &tin, &dum, &dum, &dum, &dum, 0);
@@ -4076,7 +4075,7 @@ static int edbm_bevel_exec(bContext *C, wmOperator *op)
 	BM_data_layer_add(em->bm, &em->bm->edata, CD_PROP_FLT);
 	li = CustomData_number_of_layers(&em->bm->edata, CD_PROP_FLT) - 1;
 	
-	BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
+	BM_ITER (eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
 		float d = len_v3v3(eed->v1->co, eed->v2->co);
 		float *dv = CustomData_bmesh_get_n(&em->bm->edata, eed->head.data, CD_PROP_FLT, li);
 		
diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c
index 6511cc713e3..d48f1776c59 100644
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@ -614,7 +614,7 @@ UvVertMap *EDBM_uv_vert_map_create(BMEditMesh *em, int selected, int do_face_idx
 	totuv = 0;
 
 	/* generate UvMapVert array */
-	BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
 		if (!selected || ((!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) && BM_elem_flag_test(efa, BM_ELEM_SELECT)))
 			totuv += efa->len;
 	}
@@ -642,10 +642,10 @@ UvVertMap *EDBM_uv_vert_map_create(BMEditMesh *em, int selected, int do_face_idx
 	}
 	
 	a = 0;
-	BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
 		if (!selected || ((!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) && BM_elem_flag_test(efa, BM_ELEM_SELECT))) {
 			i = 0;
-			BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
+			BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
 				buf->tfindex = i;
 				buf->f = a;
 				buf->separate = 0;
@@ -663,7 +663,7 @@ UvVertMap *EDBM_uv_vert_map_create(BMEditMesh *em, int selected, int do_face_idx
 	
 	/* sort individual uvs for each vert */
 	a = 0;
-	BM_ITER(ev, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+	BM_ITER (ev, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
 		UvMapVert *newvlist = NULL, *vlist = vmap->vert[a];
 		UvMapVert *iterv, *v, *lastv, *next;
 		float *uv, *uv2, uvdiff[2];
@@ -762,7 +762,7 @@ UvElementMap *EDBM_uv_element_map_create(BMEditMesh *em, int selected, int do_is
 	}
 
 	/* generate UvElement array */
-	BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
 		if (!selected || ((!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) && BM_elem_flag_test(efa, BM_ELEM_SELECT)))
 			totuv += efa->len;
 	}
@@ -787,10 +787,10 @@ UvElementMap *EDBM_uv_element_map_create(BMEditMesh *em, int selected, int do_is
 	}
 
 	j = 0;
-	BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
 		island_number[j++] = INVALID_ISLAND;
 		if (!selected || ((!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) && BM_elem_flag_test(efa, BM_ELEM_SELECT))) {
-			BM_ITER_INDEX(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa, i) {
+			BM_ITER_INDEX (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa, i) {
 				buf->l = l;
 				buf->face = efa;
 				buf->separate = 0;
@@ -807,7 +807,7 @@ UvElementMap *EDBM_uv_element_map_create(BMEditMesh *em, int selected, int do_is
 
 	/* sort individual uvs for each vert */
 	i = 0;
-	BM_ITER(ev, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+	BM_ITER (ev, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
 		UvElement *newvlist = NULL, *vlist = element_map->vert[i];
 		UvElement *iterv, *v, *lastv, *next;
 		float *uv, *uv2, uvdiff[2];
@@ -871,7 +871,7 @@ UvElementMap *EDBM_uv_element_map_create(BMEditMesh *em, int selected, int do_is
 				while (stacksize > 0) {
 					efa = stack[--stacksize];
 
-					BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
+					BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
 						UvElement *element, *initelement = element_map->vert[BM_elem_index_get(l->v)];
 
 						for (element = initelement; element; element = element->next) {
@@ -1019,7 +1019,7 @@ static BMVert *cache_mirr_intptr_as_bmvert(intptr_t *index_lookup, int index)
  *  EDBM_verts_mirror_cache_begin(em);
  *  ...
  *  ...
- *  BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+ *  BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
  *     mirrorv = EDBM_verts_mirror_get(em, v);
  *  }
  *  ...
@@ -1071,7 +1071,7 @@ void EDBM_verts_mirror_cache_begin(BMEditMesh *em, const short use_select)
 		tree = BMBVH_NewBVH(em, 0, NULL, NULL);
 	}
 
-	BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
+	BM_ITER (v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
 
 		/* temporary for testing, check for selection */
 		if (use_select && !BM_elem_flag_test(v, BM_ELEM_SELECT)) {
@@ -1159,7 +1159,7 @@ void EDBM_verts_mirror_apply(BMEditMesh *em, const int sel_from, const int sel_t
 
 	BLI_assert(em->vert_index != 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_SELECT) == sel_from) {
 			BMVert *mirr = EDBM_verts_mirror_get(em, v);
 			if (mirr) {
@@ -1189,7 +1189,7 @@ void EDBM_mesh_hide(BMEditMesh *em, int swap)
 	else
 		itermode = BM_FACES_OF_MESH;
 
-	BM_ITER(ele, &iter, em->bm, itermode, NULL) {
+	BM_ITER (ele, &iter, em->bm, itermode, NULL) {
 		if (BM_elem_flag_test(ele, BM_ELEM_SELECT) ^ swap)
 			BM_elem_hide_set(em->bm, ele, TRUE);
 	}
@@ -1223,7 +1223,7 @@ void EDBM_mesh_reveal(BMEditMesh *em)
 	/* Use tag flag to remember what was hidden before all is revealed.
 	 * BM_ELEM_HIDDEN --> BM_ELEM_TAG */
 	for (i = 0; i < 3; i++) {
-		BM_ITER(ele, &iter, em->bm, iter_types[i], NULL) {
+		BM_ITER (ele, &iter, em->bm, iter_types[i], NULL) {
 			BM_elem_flag_set(ele, BM_ELEM_TAG, BM_elem_flag_test(ele, BM_ELEM_HIDDEN));
 		}
 	}
@@ -1237,7 +1237,7 @@ void EDBM_mesh_reveal(BMEditMesh *em)
 			continue;
 		}
 
-		BM_ITER(ele, &iter, em->bm, iter_types[i], NULL) {
+		BM_ITER (ele, &iter, em->bm, iter_types[i], NULL) {
 			if (BM_elem_flag_test(ele, BM_ELEM_TAG)) {
 				BM_elem_select_set(em->bm, ele, TRUE);
 			}
diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c
index b2d37e8fc67..d3c0a1245fc 100644
--- a/source/blender/editors/mesh/mesh_data.c
+++ b/source/blender/editors/mesh/mesh_data.c
@@ -199,7 +199,7 @@ static void editmesh_face_copy_customdata(BMEditMesh *em, int type, int index)
 	const int n = CustomData_get_active_layer(pdata, type);
 
 	/* ensure all current elements follow new customdata layout */
-	BM_ITER(efa, &iter, bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) {
 		void *data = CustomData_bmesh_get_n(pdata, efa->head.data, type, n);
 		CustomData_bmesh_set_n(pdata, efa->head.data, type, index, data);
 	}
@@ -217,8 +217,8 @@ static void editmesh_loop_copy_customdata(BMEditMesh *em, int type, int index)
 	const int n = CustomData_get_active_layer(ldata, type);
 
 	/* ensure all current elements follow new customdata layout */
-	BM_ITER(efa, &iter, bm, BM_FACES_OF_MESH, NULL) {
-		BM_ITER(loop, &liter, bm, BM_LOOPS_OF_FACE, efa) {
+	BM_ITER (efa, &iter, bm, BM_FACES_OF_MESH, NULL) {
+		BM_ITER (loop, &liter, bm, BM_LOOPS_OF_FACE, efa) {
 			void *data = CustomData_bmesh_get_n(ldata, loop->head.data, type, n);
 			CustomData_bmesh_set_n(ldata, loop->head.data, type, index, data);
 		}
@@ -245,12 +245,12 @@ int ED_mesh_uv_loop_reset_ex(struct bContext *C, struct Mesh *me, const int laye
 
 		BLI_assert(CustomData_has_layer(&em->bm->ldata, CD_MLOOPUV));
 
-		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))
 				continue;
 
 			i = 0;
-			BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
+			BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
 				luv = CustomData_bmesh_get_n(&em->bm->ldata, l->head.data, CD_MLOOPUV, layernum);
 				BLI_array_append(uvs, luv->uv);
 				i++;
diff --git a/source/blender/editors/mesh/mesh_navmesh.c b/source/blender/editors/mesh/mesh_navmesh.c
index 7d78a527b06..3d57c5144de 100644
--- a/source/blender/editors/mesh/mesh_navmesh.c
+++ b/source/blender/editors/mesh/mesh_navmesh.c
@@ -500,7 +500,7 @@ static int navmesh_face_copy_exec(bContext *C, wmOperator *op)
 
 			if (targetPolyIdx > 0) {
 				/* set target poly idx to other selected faces */
-				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) && efa != efa_act) {
 						int *recastDataBlock = (int *)CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_RECAST);
 						*recastDataBlock = targetPolyIdx;
@@ -549,7 +549,7 @@ static int findFreeNavPolyIndex(BMEditMesh *em)
 	int i, idx = em->bm->totface - 1, freeIdx = 1;
 
 	/*XXX this originally went last to first, but that isn't possible anymore*/
-	BM_ITER(ef, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+	BM_ITER (ef, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
 		int polyIdx = *(int *)CustomData_bmesh_get(&em->bm->pdata, ef->head.data, CD_RECAST);
 		indices[idx] = polyIdx;
 		idx--;
@@ -585,7 +585,7 @@ static int navmesh_face_add_exec(bContext *C, wmOperator *UNUSED(op))
 			/* set target poly idx to selected faces */
 			/*XXX this originally went last to first, but that isn't possible anymore*/
 			
-			BM_ITER(ef, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+			BM_ITER (ef, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
 				if (BM_elem_flag_test(ef, BM_ELEM_SELECT)) {
 					int *recastDataBlock = (int *)CustomData_bmesh_get(&em->bm->pdata, ef->head.data, CD_RECAST);
 					*recastDataBlock = targetPolyIdx;
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c
index 87640c9d419..c10173ec19c 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -803,8 +803,7 @@ intptr_t mesh_octree_table(Object *ob, BMEditMesh *em, float *co, char mode)
 			BMIter iter;
 			BMVert *eve;
 			
-			BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL)
-			{
+			BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
 				DO_MINMAX(eve->co, min, max);
 			}
 		}
@@ -841,8 +840,7 @@ intptr_t mesh_octree_table(Object *ob, BMEditMesh *em, float *co, char mode)
 			BMVert *eve;
 			BMIter iter;
 
-			BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL)
-			{
+			BM_ITER (eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
 				mesh_octree_add_nodes(MeshOctree.table, eve->co, MeshOctree.offs, MeshOctree.div, (intptr_t)(eve));
 			}
 		}
@@ -955,8 +953,7 @@ static BMVert *editbmesh_get_x_mirror_vert_topo(Object *ob, struct BMEditMesh *e
 		BMVert *v;
 		
 		index = 0;
-		BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL)
-		{
+		BM_ITER (v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
 			if (v == eve)
 				break;
 			index++;
@@ -1018,16 +1015,14 @@ static float *editmesh_get_mirror_uv(BMEditMesh *em, int axis, float *uv, float
 		BMIter iter;
 		BMFace *efa;
 		
-		BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL)
-		{
+		BM_ITER (efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
 			poly_uv_center(em, efa, cent);
 			
 			if ( (fabs(cent[0] - cent_vec[0]) < 0.001) && (fabs(cent[1] - cent_vec[1]) < 0.001) ) {
 				BMIter liter;
 				BMLoop *l;
 				
-				BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa)
-				{
+				BM_ITER (l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
 					MLoopUV *luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV);
 					if ( (fabs(luv->uv[0] - vec[0]) < 0.001) && (fabs(luv->uv[1] - vec[1]) < 0.001) ) {
 						return luv->uv;