1 files changed, 29 insertions, 30 deletions

diff --git a/source/blender/editors/screen/screen_geometry.c b/source/blender/editors/screen/screen_geometry.c
index 25855382307..9169bf37116 100644
--- a/source/blender/editors/screen/screen_geometry.c
+++ b/source/blender/editors/screen/screen_geometry.c
@@ -163,7 +163,6 @@ void screen_geom_vertices_scale(const wmWindow *win, bScreen *sc)
   const int screen_size_x = BLI_rcti_size_x(&screen_rect);
   const int screen_size_y = BLI_rcti_size_y(&screen_rect);
   ScrVert *sv = NULL;
-  ScrArea *sa;
   int screen_size_x_prev, screen_size_y_prev;
   float min[2], max[2];
 
@@ -199,19 +198,19 @@ void screen_geom_vertices_scale(const wmWindow *win, bScreen *sc)
 
     if (facy > 1) {
       /* Keep timeline small in video edit workspace. */
-      for (sa = sc->areabase.first; sa; sa = sa->next) {
-        if (sa->spacetype == SPACE_ACTION && sa->v1->vec.y == screen_rect.ymin &&
-            screen_geom_area_height(sa) <= headery * facy + 1) {
-          ScrEdge *se = BKE_screen_find_edge(sc, sa->v2, sa->v3);
+      for (ScrArea *area = sc->areabase.first; area; area = area->next) {
+        if (area->spacetype == SPACE_ACTION && area->v1->vec.y == screen_rect.ymin &&
+            screen_geom_area_height(area) <= headery * facy + 1) {
+          ScrEdge *se = BKE_screen_find_edge(sc, area->v2, area->v3);
           if (se) {
-            const int yval = sa->v1->vec.y + headery - 1;
+            const int yval = area->v1->vec.y + headery - 1;
 
             screen_geom_select_connected_edge(win, se);
 
             /* all selected vertices get the right offset */
             for (sv = sc->vertbase.first; sv; sv = sv->next) {
               /* if is a collapsed area */
-              if (sv != sa->v1 && sv != sa->v4) {
+              if (sv != area->v1 && sv != area->v4) {
                 if (sv->flag) {
                   sv->vec.y = yval;
                 }
@@ -223,19 +222,19 @@ void screen_geom_vertices_scale(const wmWindow *win, bScreen *sc)
     }
     if (facy < 1) {
       /* make each window at least ED_area_headersize() high */
-      for (sa = sc->areabase.first; sa; sa = sa->next) {
-        if (screen_geom_area_height(sa) < headery) {
+      for (ScrArea *area = sc->areabase.first; area; area = area->next) {
+        if (screen_geom_area_height(area) < headery) {
           /* lower edge */
-          ScrEdge *se = BKE_screen_find_edge(sc, sa->v4, sa->v1);
-          if (se && sa->v1 != sa->v2) {
-            const int yval = sa->v2->vec.y - headery + 1;
+          ScrEdge *se = BKE_screen_find_edge(sc, area->v4, area->v1);
+          if (se && area->v1 != area->v2) {
+            const int yval = area->v2->vec.y - headery + 1;
 
             screen_geom_select_connected_edge(win, se);
 
             /* all selected vertices get the right offset */
             for (sv = sc->vertbase.first; sv; sv = sv->next) {
               /* if is not a collapsed area */
-              if (sv != sa->v2 && sv != sa->v3) {
+              if (sv != area->v2 && sv != area->v3) {
                 if (sv->flag) {
                   sv->vec.y = yval;
                 }
@@ -284,14 +283,14 @@ void screen_geom_vertices_scale(const wmWindow *win, bScreen *sc)
 /**
  * \return 0 if no split is possible, otherwise the screen-coordinate at which to split.
  */
-short screen_geom_find_area_split_point(const ScrArea *sa,
+short screen_geom_find_area_split_point(const ScrArea *area,
                                         const rcti *window_rect,
                                         char dir,
                                         float fac)
 {
   short x, y;
-  const int cur_area_width = screen_geom_area_width(sa);
-  const int cur_area_height = screen_geom_area_height(sa);
+  const int cur_area_width = screen_geom_area_width(area);
+  const int cur_area_height = screen_geom_area_height(area);
   const short area_min_x = AREAMINX;
   const short area_min_y = ED_area_headersize();
   int area_min;
@@ -308,43 +307,43 @@ short screen_geom_find_area_split_point(const ScrArea *sa,
   CLAMP(fac, 0.0f, 1.0f);
 
   if (dir == 'h') {
-    y = sa->v1->vec.y + round_fl_to_short(fac * cur_area_height);
+    y = area->v1->vec.y + round_fl_to_short(fac * cur_area_height);
 
     area_min = area_min_y;
 
-    if (sa->v1->vec.y > window_rect->ymin) {
+    if (area->v1->vec.y > window_rect->ymin) {
       area_min += U.pixelsize;
     }
-    if (sa->v2->vec.y < (window_rect->ymax - 1)) {
+    if (area->v2->vec.y < (window_rect->ymax - 1)) {
       area_min += U.pixelsize;
     }
 
-    if (y - sa->v1->vec.y < area_min) {
-      y = sa->v1->vec.y + area_min;
+    if (y - area->v1->vec.y < area_min) {
+      y = area->v1->vec.y + area_min;
     }
-    else if (sa->v2->vec.y - y < area_min) {
-      y = sa->v2->vec.y - area_min;
+    else if (area->v2->vec.y - y < area_min) {
+      y = area->v2->vec.y - area_min;
     }
 
     return y;
   }
   else {
-    x = sa->v1->vec.x + round_fl_to_short(fac * cur_area_width);
+    x = area->v1->vec.x + round_fl_to_short(fac * cur_area_width);
 
     area_min = area_min_x;
 
-    if (sa->v1->vec.x > window_rect->xmin) {
+    if (area->v1->vec.x > window_rect->xmin) {
       area_min += U.pixelsize;
     }
-    if (sa->v4->vec.x < (window_rect->xmax - 1)) {
+    if (area->v4->vec.x < (window_rect->xmax - 1)) {
       area_min += U.pixelsize;
     }
 
-    if (x - sa->v1->vec.x < area_min) {
-      x = sa->v1->vec.x + area_min;
+    if (x - area->v1->vec.x < area_min) {
+      x = area->v1->vec.x + area_min;
     }
-    else if (sa->v4->vec.x - x < area_min) {
-      x = sa->v4->vec.x - area_min;
+    else if (area->v4->vec.x - x < area_min) {
+      x = area->v4->vec.x - area_min;
     }
 
     return x;