[Bf-blender-cvs] [668250d] master: BMesh: minor change to looping

[Campbell Barton]

Commit: 668250deb8c6374b8c6064265fc83c78e00305f2
Author: Campbell Barton
Date:   Fri Apr 11 20:28:31 2014 +1000
https://developer.blender.org/rB668250deb8c6374b8c6064265fc83c78e00305f2

BMesh: minor change to looping

===================================================================

M	source/blender/bmesh/intern/bmesh_core.c
M	source/blender/bmesh/intern/bmesh_mods.c
M	source/blender/bmesh/intern/bmesh_walkers_impl.c

===================================================================

diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c
index bd86f49..bf19be1 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -800,13 +800,13 @@ void BM_edge_kill(BMesh *bm, BMEdge *e)
 void BM_vert_kill(BMesh *bm, BMVert *v)
 {
 	if (v->e) {
-		BMEdge *e, *nexte;
+		BMEdge *e, *e_next;
 		
 		e = v->e;
 		while (v->e) {
-			nexte = bmesh_disk_edge_next(e, v);
+			e_next = bmesh_disk_edge_next(e, v);
 			BM_edge_kill(bm, e);
-			e = nexte;
+			e = e_next;
 		}
 	}
 
@@ -1023,12 +1023,8 @@ static bool disk_is_flagged(BMVert *v, int flag)
 		do {
 			if (!BM_ELEM_API_FLAG_TEST(l->f, flag))
 				return false;
-
-			l = l->radial_next;
-		} while (l != e->l);
-
-		e = bmesh_disk_edge_next(e, v);
-	} while (e != v->e);
+		} while ((l = l->radial_next) != e->l);
+	} while ((e = bmesh_disk_edge_next(e, v)) != v->e);
 
 	return true;
 }
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c
index 3b63931..f6b91d8 100644
--- a/source/blender/bmesh/intern/bmesh_mods.c
+++ b/source/blender/bmesh/intern/bmesh_mods.c
@@ -192,8 +192,7 @@ bool BM_disk_dissolve(BMesh *bm, BMVert *v)
 					done = false;
 					break;
 				}
-				e = bmesh_disk_edge_next(e, v);
-			} while (e != v->e);
+			} while ((e = bmesh_disk_edge_next(e, v)) != v->e);
 		}
 
 		/* collapse the vertex */
diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c
index ee0e35b..d530980 100644
--- a/source/blender/bmesh/intern/bmesh_walkers_impl.c
+++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c
@@ -211,8 +211,7 @@ static void *bmw_ShellWalker_step(BMWalker *walker)
 				newState->curedge = curedge;
 			}
 		}
-		curedge = bmesh_disk_edge_next(curedge, shellWalk.base);
-	} while (curedge != shellWalk.curedge);
+	} while ((curedge = bmesh_disk_edge_next(curedge, shellWalk.base)) != shellWalk.curedge);
 	
 	return shellWalk.curedge;
 }