[Bf-blender-cvs] [d07fea2] master: Screen Resize: minor code cleanup

Campbell Barton noreply at git.blender.org
Tue Dec 10 13:55:38 CET 2013


Commit: d07fea243907c6db6290a6efacddfd202809e5de
Author: Campbell Barton
Date:   Tue Dec 10 23:52:19 2013 +1100
http://developer.blender.org/rBd07fea243907c6db6290a6efacddfd202809e5de

Screen Resize: minor code cleanup

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

M	source/blender/editors/screen/screen_edit.c

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

diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 876c054..006cda1 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -662,6 +662,7 @@ void select_connected_scredge(bScreen *sc, ScrEdge *edge)
 /* test if screen vertices should be scaled */
 static void screen_test_scale(bScreen *sc, int winsizex, int winsizey)
 {
+	const int headery_init = ED_area_headersize();
 	ScrVert *sv = NULL;
 	ScrArea *sa;
 	int sizex, sizey;
@@ -714,7 +715,7 @@ static void screen_test_scale(bScreen *sc, int winsizex, int winsizey)
 	
 	/* make each window at least ED_area_headersize() high */
 	for (sa = sc->areabase.first; sa; sa = sa->next) {
-		int headery = ED_area_headersize();
+		int headery = headery_init;
 		
 		/* adjust headery if verts are along the edge of window */
 		if (sa->v1->vec.y > 0)
@@ -732,13 +733,13 @@ static void screen_test_scale(bScreen *sc, int winsizex, int winsizey)
 				
 				/* all selected vertices get the right offset */
 				yval = sa->v2->vec.y - headery + 1;
-				sv = sc->vertbase.first;
-				while (sv) {
+				for (sv = sc->vertbase.first; sv; sv = sv->next) {
 					/* if is a collapsed area */
 					if (sv != sa->v2 && sv != sa->v3) {
-						if (sv->flag) sv->vec.y = yval;
+						if (sv->flag) {
+							sv->vec.y = yval;
+						}
 					}
-					sv = sv->next;
 				}
 			}
 		}




More information about the Bf-blender-cvs mailing list