1 files changed, 17 insertions, 17 deletions

diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 6d074661dcc..00276f9c4a9 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -101,11 +101,11 @@ static void blo_update_defaults_screen(bScreen *screen,
 {
   /* For all app templates. */
   for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
-    for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) {
+    for (ARegion *region = sa->regionbase.first; region; region = region->next) {
       /* Some toolbars have been saved as initialized,
        * we don't want them to have odd zoom-level or scrolling set, see: T47047 */
-      if (ELEM(ar->regiontype, RGN_TYPE_UI, RGN_TYPE_TOOLS, RGN_TYPE_TOOL_PROPS)) {
-        ar->v2d.flag &= ~V2D_IS_INITIALISED;
+      if (ELEM(region->regiontype, RGN_TYPE_UI, RGN_TYPE_TOOLS, RGN_TYPE_TOOL_PROPS)) {
+        region->v2d.flag &= ~V2D_IS_INITIALISED;
       }
     }
 
@@ -130,15 +130,15 @@ static void blo_update_defaults_screen(bScreen *screen,
   }
 
   for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
-    for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) {
+    for (ARegion *region = sa->regionbase.first; region; region = region->next) {
       /* Remove all stored panels, we want to use defaults
        * (order, open/closed) as defined by UI code here! */
-      BKE_area_region_panels_free(&ar->panels);
-      BLI_freelistN(&ar->panels_category_active);
+      BKE_area_region_panels_free(&region->panels);
+      BLI_freelistN(&region->panels_category_active);
 
       /* Reset size so it uses consistent defaults from the region types. */
-      ar->sizex = 0;
-      ar->sizey = 0;
+      region->sizex = 0;
+      region->sizey = 0;
     }
 
     if (sa->spacetype == SPACE_IMAGE) {
@@ -156,9 +156,9 @@ static void blo_update_defaults_screen(bScreen *screen,
       if (saction->mode == SACTCONT_TIMELINE) {
         saction->ads.flag |= ADS_FLAG_SUMMARY_COLLAPSED;
 
-        for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) {
-          if (ar->regiontype == RGN_TYPE_CHANNELS) {
-            ar->flag |= RGN_FLAG_HIDDEN;
+        for (ARegion *region = sa->regionbase.first; region; region = region->next) {
+          if (region->regiontype == RGN_TYPE_CHANNELS) {
+            region->flag |= RGN_FLAG_HIDDEN;
           }
         }
       }
@@ -213,13 +213,13 @@ static void blo_update_defaults_screen(bScreen *screen,
     for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
       ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
 
-      for (ARegion *ar = regionbase->first; ar; ar = ar->next) {
-        if (ar->regiontype == RGN_TYPE_TOOL_HEADER) {
+      for (ARegion *region = regionbase->first; region; region = region->next) {
+        if (region->regiontype == RGN_TYPE_TOOL_HEADER) {
           if ((sl->spacetype == SPACE_IMAGE) && hide_image_tool_header) {
-            ar->flag |= RGN_FLAG_HIDDEN;
+            region->flag |= RGN_FLAG_HIDDEN;
           }
           else {
-            ar->flag &= ~(RGN_FLAG_HIDDEN | RGN_FLAG_HIDDEN_BY_USER);
+            region->flag &= ~(RGN_FLAG_HIDDEN | RGN_FLAG_HIDDEN_BY_USER);
           }
         }
       }
@@ -229,7 +229,7 @@ static void blo_update_defaults_screen(bScreen *screen,
   /* 2D animation template. */
   if (app_template && STREQ(app_template, "2D_Animation")) {
     for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
-      for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) {
+      for (ARegion *region = sa->regionbase.first; region; region = region->next) {
         if (sa->spacetype == SPACE_ACTION) {
           SpaceAction *saction = sa->spacedata.first;
           /* Enable Sliders. */
@@ -266,7 +266,7 @@ void BLO_update_defaults_workspace(WorkSpace *workspace, const char *app_templat
         bScreen *screen = layout->screen;
         if (screen) {
           for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
-            for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) {
+            for (ARegion *region = sa->regionbase.first; region; region = region->next) {
               if (sa->spacetype == SPACE_VIEW3D) {
                 View3D *v3d = sa->spacedata.first;
                 v3d->shading.flag &= ~V3D_SHADING_CAVITY;