[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56772] trunk/blender/source/blender/bmesh /intern/bmesh_walkers_impl.c: code cleanup: remove duplicate calls to ' BMW_current_state'

Campbell Barton ideasman42 at gmail.com
Mon May 13 18:35:29 CEST 2013


Revision: 56772
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56772
Author:   campbellbarton
Date:     2013-05-13 16:35:28 +0000 (Mon, 13 May 2013)
Log Message:
-----------
code cleanup: remove duplicate calls to 'BMW_current_state'

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c	2013-05-13 15:31:59 UTC (rev 56771)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c	2013-05-13 16:35:28 UTC (rev 56772)
@@ -430,7 +430,7 @@
  */
 static void bmw_LoopWalker_begin(BMWalker *walker, void *data)
 {
-	BMwLoopWalker *lwalk = NULL, owalk;
+	BMwLoopWalker *lwalk = NULL, owalk, *owalk_pt;
 	BMEdge *e = data;
 	BMVert *v;
 	int vert_edge_count[2] = {BM_vert_edge_count_nonwire(e->v1),
@@ -475,8 +475,8 @@
 	}
 
 	/* rewind */
-	while (BMW_current_state(walker)) {
-		owalk = *((BMwLoopWalker *)BMW_current_state(walker));
+	while ((owalk_pt = BMW_current_state(walker))) {
+		owalk = *((BMwLoopWalker *)owalk_pt);
 		BMW_walk(walker);
 	}
 
@@ -687,7 +687,7 @@
 
 static void bmw_FaceLoopWalker_begin(BMWalker *walker, void *data)
 {
-	BMwFaceLoopWalker *lwalk, owalk;
+	BMwFaceLoopWalker *lwalk, owalk, *owalk_pt;
 	BMEdge *e = data;
 	/* BMesh *bm = walker->bm; */ /* UNUSED */
 	/* int fcount = BM_edge_face_count(e); */ /* UNUSED */
@@ -701,8 +701,8 @@
 	BLI_ghash_insert(walker->visithash, lwalk->l->f, NULL);
 
 	/* rewin */
-	while (BMW_current_state(walker)) {
-		owalk = *((BMwFaceLoopWalker *)BMW_current_state(walker));
+	while ((owalk_pt = BMW_current_state(walker))) {
+		owalk = *((BMwFaceLoopWalker *)owalk_pt);
 		BMW_walk(walker);
 	}
 
@@ -783,7 +783,7 @@
  */
 static void bmw_EdgeringWalker_begin(BMWalker *walker, void *data)
 {
-	BMwEdgeringWalker *lwalk, owalk;
+	BMwEdgeringWalker *lwalk, owalk, *owalk_pt;
 	BMEdge *e = data;
 
 	lwalk = BMW_state_add(walker);
@@ -799,9 +799,9 @@
 
 	BLI_ghash_insert(walker->visithash, lwalk->l->e, NULL);
 
-	/* rewin */
-	while (BMW_current_state(walker)) {
-		owalk = *((BMwEdgeringWalker *)BMW_current_state(walker));
+	/* rewind */
+	while ((owalk_pt = BMW_current_state(walker))) {
+		owalk = *((BMwEdgeringWalker *)owalk_pt);
 		BMW_walk(walker);
 	}
 




More information about the Bf-blender-cvs mailing list