Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2020-03-06 18:56:42 +0300
committerJulian Eisel <julian@blender.org>2020-03-06 19:19:23 +0300
commitb2ee1770d4c31078518f4ec9edd5196a41345162 (patch)
tree6b7f6ff9057322245fc3b3407bece3f1c0cb3eb5 /source/blender/blenloader/intern
parentb825a95ec311a169d33fe21e28418f11a516c82f (diff)
Cleanup: Rename ARegion variables from ar to region
The old convention was easy to confuse with ScrArea. Part of https://developer.blender.org/T74432. This is mostly a batch rename with some manual fixing. Only single word variable names are changed, no prefixed/suffixed names. Brecht van Lommel and Campbell Barton both gave me a green light for this convention change. Also ran clan clang format on affected files.
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r--source/blender/blenloader/intern/readfile.c88
-rw-r--r--source/blender/blenloader/intern/versioning_250.c417
-rw-r--r--source/blender/blenloader/intern/versioning_260.c40
-rw-r--r--source/blender/blenloader/intern/versioning_270.c54
-rw-r--r--source/blender/blenloader/intern/versioning_280.c102
-rw-r--r--source/blender/blenloader/intern/versioning_defaults.c34
-rw-r--r--source/blender/blenloader/intern/writefile.c12
7 files changed, 376 insertions, 371 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index a0d661632f4..6cf8c968ed4 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7001,38 +7001,38 @@ static void direct_link_panel_list(FileData *fd, ListBase *lb)
}
}
-static void direct_link_region(FileData *fd, ARegion *ar, int spacetype)
+static void direct_link_region(FileData *fd, ARegion *region, int spacetype)
{
uiList *ui_list;
- direct_link_panel_list(fd, &ar->panels);
+ direct_link_panel_list(fd, &region->panels);
- link_list(fd, &ar->panels_category_active);
+ link_list(fd, &region->panels_category_active);
- link_list(fd, &ar->ui_lists);
+ link_list(fd, &region->ui_lists);
- for (ui_list = ar->ui_lists.first; ui_list; ui_list = ui_list->next) {
+ for (ui_list = region->ui_lists.first; ui_list; ui_list = ui_list->next) {
ui_list->type = NULL;
ui_list->dyn_data = NULL;
ui_list->properties = newdataadr(fd, ui_list->properties);
IDP_DirectLinkGroup_OrFree(&ui_list->properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
}
- link_list(fd, &ar->ui_previews);
+ link_list(fd, &region->ui_previews);
if (spacetype == SPACE_EMPTY) {
/* unknown space type, don't leak regiondata */
- ar->regiondata = NULL;
+ region->regiondata = NULL;
}
- else if (ar->flag & RGN_FLAG_TEMP_REGIONDATA) {
+ else if (region->flag & RGN_FLAG_TEMP_REGIONDATA) {
/* Runtime data, don't use. */
- ar->regiondata = NULL;
+ region->regiondata = NULL;
}
else {
- ar->regiondata = newdataadr(fd, ar->regiondata);
- if (ar->regiondata) {
+ region->regiondata = newdataadr(fd, region->regiondata);
+ if (region->regiondata) {
if (spacetype == SPACE_VIEW3D) {
- RegionView3D *rv3d = ar->regiondata;
+ RegionView3D *rv3d = region->regiondata;
rv3d->localvd = newdataadr(fd, rv3d->localvd);
rv3d->clipbb = newdataadr(fd, rv3d->clipbb);
@@ -7047,28 +7047,28 @@ static void direct_link_region(FileData *fd, ARegion *ar, int spacetype)
}
}
- ar->v2d.tab_offset = NULL;
- ar->v2d.tab_num = 0;
- ar->v2d.tab_cur = 0;
- ar->v2d.sms = NULL;
- ar->v2d.alpha_hor = ar->v2d.alpha_vert = 255; /* visible by default */
- BLI_listbase_clear(&ar->panels_category);
- BLI_listbase_clear(&ar->handlers);
- BLI_listbase_clear(&ar->uiblocks);
- ar->headerstr = NULL;
- ar->visible = 0;
- ar->type = NULL;
- ar->do_draw = 0;
- ar->gizmo_map = NULL;
- ar->regiontimer = NULL;
- ar->draw_buffer = NULL;
- memset(&ar->drawrct, 0, sizeof(ar->drawrct));
+ region->v2d.tab_offset = NULL;
+ region->v2d.tab_num = 0;
+ region->v2d.tab_cur = 0;
+ region->v2d.sms = NULL;
+ region->v2d.alpha_hor = region->v2d.alpha_vert = 255; /* visible by default */
+ BLI_listbase_clear(&region->panels_category);
+ BLI_listbase_clear(&region->handlers);
+ BLI_listbase_clear(&region->uiblocks);
+ region->headerstr = NULL;
+ region->visible = 0;
+ region->type = NULL;
+ region->do_draw = 0;
+ region->gizmo_map = NULL;
+ region->regiontimer = NULL;
+ region->draw_buffer = NULL;
+ memset(&region->drawrct, 0, sizeof(region->drawrct));
}
static void direct_link_area(FileData *fd, ScrArea *area)
{
SpaceLink *sl;
- ARegion *ar;
+ ARegion *region;
link_list(fd, &(area->spacedata));
link_list(fd, &(area->regionbase));
@@ -7094,8 +7094,8 @@ static void direct_link_area(FileData *fd, ScrArea *area)
area->spacetype = SPACE_EMPTY;
}
- for (ar = area->regionbase.first; ar; ar = ar->next) {
- direct_link_region(fd, ar, area->spacetype);
+ for (region = area->regionbase.first; region; region = region->next) {
+ direct_link_region(fd, region, area->spacetype);
}
/* accident can happen when read/save new file with older version */
@@ -7119,8 +7119,8 @@ static void direct_link_area(FileData *fd, ScrArea *area)
sl->spacetype = SPACE_EMPTY;
}
- for (ar = sl->regionbase.first; ar; ar = ar->next) {
- direct_link_region(fd, ar, sl->spacetype);
+ for (region = sl->regionbase.first; region; region = region->next) {
+ direct_link_region(fd, region, sl->spacetype);
}
if (sl->spacetype == SPACE_VIEW3D) {
@@ -7800,9 +7800,9 @@ static void lib_link_window_scene_data_restore(wmWindow *win, Scene *scene, View
/* Regionbase storage is different depending if the space is active. */
ListBase *regionbase = (sl == area->spacedata.first) ? &area->regionbase :
&sl->regionbase;
- for (ARegion *ar = regionbase->first; ar; ar = ar->next) {
- if (ar->regiontype == RGN_TYPE_WINDOW) {
- RegionView3D *rv3d = ar->regiondata;
+ for (ARegion *region = regionbase->first; region; region = region->next) {
+ if (region->regiontype == RGN_TYPE_WINDOW) {
+ RegionView3D *rv3d = region->regiondata;
if (rv3d->localvd) {
MEM_freeN(rv3d->localvd);
rv3d->localvd = NULL;
@@ -7828,16 +7828,16 @@ static void lib_link_workspace_layout_restore(struct IDNameLib_Map *id_map,
for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_VIEW3D) {
View3D *v3d = (View3D *)sl;
- ARegion *ar;
+ ARegion *region;
v3d->camera = restore_pointer_by_name(id_map, (ID *)v3d->camera, USER_REAL);
v3d->ob_centre = restore_pointer_by_name(id_map, (ID *)v3d->ob_centre, USER_REAL);
/* Free render engines for now. */
ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
- for (ar = regionbase->first; ar; ar = ar->next) {
- if (ar->regiontype == RGN_TYPE_WINDOW) {
- RegionView3D *rv3d = ar->regiondata;
+ for (region = regionbase->first; region; region = region->next) {
+ if (region->regiontype == RGN_TYPE_WINDOW) {
+ RegionView3D *rv3d = region->regiondata;
if (rv3d && rv3d->render_engine) {
RE_engine_free(rv3d->render_engine);
rv3d->render_engine = NULL;
@@ -8115,13 +8115,13 @@ void blo_lib_link_restore(Main *oldmain,
/* and as patch for 2.48 and older */
void blo_do_versions_view3d_split_250(View3D *v3d, ListBase *regions)
{
- ARegion *ar;
+ ARegion *region;
- for (ar = regions->first; ar; ar = ar->next) {
- if (ar->regiontype == RGN_TYPE_WINDOW && ar->regiondata == NULL) {
+ for (region = regions->first; region; region = region->next) {
+ if (region->regiontype == RGN_TYPE_WINDOW && region->regiondata == NULL) {
RegionView3D *rv3d;
- rv3d = ar->regiondata = MEM_callocN(sizeof(RegionView3D), "region v3d patch");
+ rv3d = region->regiondata = MEM_callocN(sizeof(RegionView3D), "region v3d patch");
rv3d->persp = (char)v3d->persp;
rv3d->view = (char)v3d->view;
rv3d->dist = v3d->dist;
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c
index cf4924eeb6d..6ff0f709361 100644
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@@ -90,119 +90,119 @@
/* 2.50 patch */
static void area_add_header_region(ScrArea *sa, ListBase *lb)
{
- ARegion *ar = MEM_callocN(sizeof(ARegion), "area region from do_versions");
+ ARegion *region = MEM_callocN(sizeof(ARegion), "area region from do_versions");
- BLI_addtail(lb, ar);
- ar->regiontype = RGN_TYPE_HEADER;
+ BLI_addtail(lb, region);
+ region->regiontype = RGN_TYPE_HEADER;
if (sa->headertype == 1) {
- ar->alignment = RGN_ALIGN_BOTTOM;
+ region->alignment = RGN_ALIGN_BOTTOM;
}
else {
- ar->alignment = RGN_ALIGN_TOP;
+ region->alignment = RGN_ALIGN_TOP;
}
/* initialize view2d data for header region, to allow panning */
/* is copy from ui_view2d.c */
- ar->v2d.keepzoom = (V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y | V2D_LIMITZOOM | V2D_KEEPASPECT);
- ar->v2d.keepofs = V2D_LOCKOFS_Y;
- ar->v2d.keeptot = V2D_KEEPTOT_STRICT;
- ar->v2d.align = V2D_ALIGN_NO_NEG_X | V2D_ALIGN_NO_NEG_Y;
- ar->v2d.flag = (V2D_PIXELOFS_X | V2D_PIXELOFS_Y);
+ region->v2d.keepzoom = (V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y | V2D_LIMITZOOM | V2D_KEEPASPECT);
+ region->v2d.keepofs = V2D_LOCKOFS_Y;
+ region->v2d.keeptot = V2D_KEEPTOT_STRICT;
+ region->v2d.align = V2D_ALIGN_NO_NEG_X | V2D_ALIGN_NO_NEG_Y;
+ region->v2d.flag = (V2D_PIXELOFS_X | V2D_PIXELOFS_Y);
}
-static void sequencer_init_preview_region(ARegion *ar)
+static void sequencer_init_preview_region(ARegion *region)
{
// XXX a bit ugly still, copied from space_sequencer
/* NOTE: if you change values here, also change them in space_sequencer.c, sequencer_new */
- ar->regiontype = RGN_TYPE_PREVIEW;
- ar->alignment = RGN_ALIGN_TOP;
- ar->flag |= RGN_FLAG_HIDDEN;
- ar->v2d.keepzoom = V2D_KEEPASPECT | V2D_KEEPZOOM;
- ar->v2d.minzoom = 0.00001f;
- ar->v2d.maxzoom = 100000.0f;
- ar->v2d.tot.xmin = -960.0f; /* 1920 width centered */
- ar->v2d.tot.ymin = -540.0f; /* 1080 height centered */
- ar->v2d.tot.xmax = 960.0f;
- ar->v2d.tot.ymax = 540.0f;
- ar->v2d.min[0] = 0.0f;
- ar->v2d.min[1] = 0.0f;
- ar->v2d.max[0] = 12000.0f;
- ar->v2d.max[1] = 12000.0f;
- ar->v2d.cur = ar->v2d.tot;
- ar->v2d.align = V2D_ALIGN_FREE; // (V2D_ALIGN_NO_NEG_X|V2D_ALIGN_NO_NEG_Y);
- ar->v2d.keeptot = V2D_KEEPTOT_FREE;
+ region->regiontype = RGN_TYPE_PREVIEW;
+ region->alignment = RGN_ALIGN_TOP;
+ region->flag |= RGN_FLAG_HIDDEN;
+ region->v2d.keepzoom = V2D_KEEPASPECT | V2D_KEEPZOOM;
+ region->v2d.minzoom = 0.00001f;
+ region->v2d.maxzoom = 100000.0f;
+ region->v2d.tot.xmin = -960.0f; /* 1920 width centered */
+ region->v2d.tot.ymin = -540.0f; /* 1080 height centered */
+ region->v2d.tot.xmax = 960.0f;
+ region->v2d.tot.ymax = 540.0f;
+ region->v2d.min[0] = 0.0f;
+ region->v2d.min[1] = 0.0f;
+ region->v2d.max[0] = 12000.0f;
+ region->v2d.max[1] = 12000.0f;
+ region->v2d.cur = region->v2d.tot;
+ region->v2d.align = V2D_ALIGN_FREE; // (V2D_ALIGN_NO_NEG_X|V2D_ALIGN_NO_NEG_Y);
+ region->v2d.keeptot = V2D_KEEPTOT_FREE;
}
static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
{
- ARegion *ar;
+ ARegion *region;
ARegion *ar_main;
if (sl) {
/* first channels for ipo action nla... */
switch (sl->spacetype) {
case SPACE_GRAPH:
- ar = MEM_callocN(sizeof(ARegion), "area region from do_versions");
- BLI_addtail(lb, ar);
- ar->regiontype = RGN_TYPE_CHANNELS;
- ar->alignment = RGN_ALIGN_LEFT;
- ar->v2d.scroll = (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM);
+ region = MEM_callocN(sizeof(ARegion), "area region from do_versions");
+ BLI_addtail(lb, region);
+ region->regiontype = RGN_TYPE_CHANNELS;
+ region->alignment = RGN_ALIGN_LEFT;
+ region->v2d.scroll = (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM);
/* for some reason, this doesn't seem to go auto like for NLA... */
- ar = MEM_callocN(sizeof(ARegion), "area region from do_versions");
- BLI_addtail(lb, ar);
- ar->regiontype = RGN_TYPE_UI;
- ar->alignment = RGN_ALIGN_RIGHT;
- ar->v2d.scroll = V2D_SCROLL_RIGHT;
- ar->v2d.flag = RGN_FLAG_HIDDEN;
+ region = MEM_callocN(sizeof(ARegion), "area region from do_versions");
+ BLI_addtail(lb, region);
+ region->regiontype = RGN_TYPE_UI;
+ region->alignment = RGN_ALIGN_RIGHT;
+ region->v2d.scroll = V2D_SCROLL_RIGHT;
+ region->v2d.flag = RGN_FLAG_HIDDEN;
break;
case SPACE_ACTION:
- ar = MEM_callocN(sizeof(ARegion), "area region from do_versions");
- BLI_addtail(lb, ar);
- ar->regiontype = RGN_TYPE_CHANNELS;
- ar->alignment = RGN_ALIGN_LEFT;
- ar->v2d.scroll = V2D_SCROLL_BOTTOM;
- ar->v2d.flag = V2D_VIEWSYNC_AREA_VERTICAL;
+ region = MEM_callocN(sizeof(ARegion), "area region from do_versions");
+ BLI_addtail(lb, region);
+ region->regiontype = RGN_TYPE_CHANNELS;
+ region->alignment = RGN_ALIGN_LEFT;
+ region->v2d.scroll = V2D_SCROLL_BOTTOM;
+ region->v2d.flag = V2D_VIEWSYNC_AREA_VERTICAL;
break;
case SPACE_NLA:
- ar = MEM_callocN(sizeof(ARegion), "area region from do_versions");
- BLI_addtail(lb, ar);
- ar->regiontype = RGN_TYPE_CHANNELS;
- ar->alignment = RGN_ALIGN_LEFT;
- ar->v2d.scroll = V2D_SCROLL_BOTTOM;
- ar->v2d.flag = V2D_VIEWSYNC_AREA_VERTICAL;
+ region = MEM_callocN(sizeof(ARegion), "area region from do_versions");
+ BLI_addtail(lb, region);
+ region->regiontype = RGN_TYPE_CHANNELS;
+ region->alignment = RGN_ALIGN_LEFT;
+ region->v2d.scroll = V2D_SCROLL_BOTTOM;
+ region->v2d.flag = V2D_VIEWSYNC_AREA_VERTICAL;
/* for some reason, some files still don't get this auto */
- ar = MEM_callocN(sizeof(ARegion), "area region from do_versions");
- BLI_addtail(lb, ar);
- ar->regiontype = RGN_TYPE_UI;
- ar->alignment = RGN_ALIGN_RIGHT;
- ar->v2d.scroll = V2D_SCROLL_RIGHT;
- ar->v2d.flag = RGN_FLAG_HIDDEN;
+ region = MEM_callocN(sizeof(ARegion), "area region from do_versions");
+ BLI_addtail(lb, region);
+ region->regiontype = RGN_TYPE_UI;
+ region->alignment = RGN_ALIGN_RIGHT;
+ region->v2d.scroll = V2D_SCROLL_RIGHT;
+ region->v2d.flag = RGN_FLAG_HIDDEN;
break;
case SPACE_NODE:
- ar = MEM_callocN(sizeof(ARegion), "nodetree area for node");
- BLI_addtail(lb, ar);
- ar->regiontype = RGN_TYPE_UI;
- ar->alignment = RGN_ALIGN_LEFT;
- ar->v2d.scroll = (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM);
- ar->v2d.flag = V2D_VIEWSYNC_AREA_VERTICAL;
+ region = MEM_callocN(sizeof(ARegion), "nodetree area for node");
+ BLI_addtail(lb, region);
+ region->regiontype = RGN_TYPE_UI;
+ region->alignment = RGN_ALIGN_LEFT;
+ region->v2d.scroll = (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM);
+ region->v2d.flag = V2D_VIEWSYNC_AREA_VERTICAL;
/* temporarily hide it */
- ar->flag = RGN_FLAG_HIDDEN;
+ region->flag = RGN_FLAG_HIDDEN;
break;
case SPACE_FILE:
- ar = MEM_callocN(sizeof(ARegion), "nodetree area for node");
- BLI_addtail(lb, ar);
- ar->regiontype = RGN_TYPE_CHANNELS;
- ar->alignment = RGN_ALIGN_LEFT;
-
- ar = MEM_callocN(sizeof(ARegion), "ui area for file");
- BLI_addtail(lb, ar);
- ar->regiontype = RGN_TYPE_UI;
- ar->alignment = RGN_ALIGN_TOP;
+ region = MEM_callocN(sizeof(ARegion), "nodetree area for node");
+ BLI_addtail(lb, region);
+ region->regiontype = RGN_TYPE_CHANNELS;
+ region->alignment = RGN_ALIGN_LEFT;
+
+ region = MEM_callocN(sizeof(ARegion), "ui area for file");
+ BLI_addtail(lb, region);
+ region->regiontype = RGN_TYPE_UI;
+ region->alignment = RGN_ALIGN_TOP;
break;
case SPACE_SEQ:
ar_main = (ARegion *)lb->first;
@@ -211,41 +211,41 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
break;
}
}
- ar = MEM_callocN(sizeof(ARegion), "preview area for sequencer");
- BLI_insertlinkbefore(lb, ar_main, ar);
- sequencer_init_preview_region(ar);
+ region = MEM_callocN(sizeof(ARegion), "preview area for sequencer");
+ BLI_insertlinkbefore(lb, ar_main, region);
+ sequencer_init_preview_region(region);
break;
case SPACE_VIEW3D:
/* toolbar */
- ar = MEM_callocN(sizeof(ARegion), "toolbar for view3d");
+ region = MEM_callocN(sizeof(ARegion), "toolbar for view3d");
- BLI_addtail(lb, ar);
- ar->regiontype = RGN_TYPE_TOOLS;
- ar->alignment = RGN_ALIGN_LEFT;
- ar->flag = RGN_FLAG_HIDDEN;
+ BLI_addtail(lb, region);
+ region->regiontype = RGN_TYPE_TOOLS;
+ region->alignment = RGN_ALIGN_LEFT;
+ region->flag = RGN_FLAG_HIDDEN;
/* tool properties */
- ar = MEM_callocN(sizeof(ARegion), "tool properties for view3d");
+ region = MEM_callocN(sizeof(ARegion), "tool properties for view3d");
- BLI_addtail(lb, ar);
- ar->regiontype = RGN_TYPE_TOOL_PROPS;
- ar->alignment = RGN_ALIGN_BOTTOM | RGN_SPLIT_PREV;
- ar->flag = RGN_FLAG_HIDDEN;
+ BLI_addtail(lb, region);
+ region->regiontype = RGN_TYPE_TOOL_PROPS;
+ region->alignment = RGN_ALIGN_BOTTOM | RGN_SPLIT_PREV;
+ region->flag = RGN_FLAG_HIDDEN;
/* buttons/list view */
- ar = MEM_callocN(sizeof(ARegion), "buttons for view3d");
+ region = MEM_callocN(sizeof(ARegion), "buttons for view3d");
- BLI_addtail(lb, ar);
- ar->regiontype = RGN_TYPE_UI;
- ar->alignment = RGN_ALIGN_RIGHT;
- ar->flag = RGN_FLAG_HIDDEN;
+ BLI_addtail(lb, region);
+ region->regiontype = RGN_TYPE_UI;
+ region->alignment = RGN_ALIGN_RIGHT;
+ region->flag = RGN_FLAG_HIDDEN;
#if 0
case SPACE_PROPERTIES:
/* context UI region */
- ar = MEM_callocN(sizeof(ARegion), "area region from do_versions");
- BLI_addtail(lb, ar);
- ar->regiontype = RGN_TYPE_UI;
- ar->alignment = RGN_ALIGN_RIGHT;
+ region = MEM_callocN(sizeof(ARegion), "area region from do_versions");
+ BLI_addtail(lb, region);
+ region->regiontype = RGN_TYPE_UI;
+ region->alignment = RGN_ALIGN_RIGHT;
break;
#endif
@@ -253,12 +253,12 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
}
/* main region */
- ar = MEM_callocN(sizeof(ARegion), "area region from do_versions");
+ region = MEM_callocN(sizeof(ARegion), "area region from do_versions");
- BLI_addtail(lb, ar);
- ar->winrct = sa->totrct;
+ BLI_addtail(lb, region);
+ region->winrct = sa->totrct;
- ar->regiontype = RGN_TYPE_WINDOW;
+ region->regiontype = RGN_TYPE_WINDOW;
if (sl) {
/* if active spacetype has view2d data, copy that over to main region */
@@ -271,45 +271,45 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
case SPACE_OUTLINER: {
SpaceOutliner *soops = (SpaceOutliner *)sl;
- memcpy(&ar->v2d, &soops->v2d, sizeof(View2D));
+ memcpy(&region->v2d, &soops->v2d, sizeof(View2D));
- ar->v2d.scroll &= ~V2D_SCROLL_LEFT;
- ar->v2d.scroll |= (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM);
- ar->v2d.align = (V2D_ALIGN_NO_NEG_X | V2D_ALIGN_NO_POS_Y);
- ar->v2d.keepzoom |= (V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y | V2D_KEEPASPECT);
- ar->v2d.keeptot = V2D_KEEPTOT_STRICT;
- ar->v2d.minzoom = ar->v2d.maxzoom = 1.0f;
- // ar->v2d.flag |= V2D_IS_INITIALISED;
+ region->v2d.scroll &= ~V2D_SCROLL_LEFT;
+ region->v2d.scroll |= (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM);
+ region->v2d.align = (V2D_ALIGN_NO_NEG_X | V2D_ALIGN_NO_POS_Y);
+ region->v2d.keepzoom |= (V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y | V2D_KEEPASPECT);
+ region->v2d.keeptot = V2D_KEEPTOT_STRICT;
+ region->v2d.minzoom = region->v2d.maxzoom = 1.0f;
+ // region->v2d.flag |= V2D_IS_INITIALISED;
break;
}
case SPACE_GRAPH: {
SpaceGraph *sipo = (SpaceGraph *)sl;
- memcpy(&ar->v2d, &sipo->v2d, sizeof(View2D));
+ memcpy(&region->v2d, &sipo->v2d, sizeof(View2D));
/* init mainarea view2d */
- ar->v2d.scroll |= (V2D_SCROLL_BOTTOM | V2D_SCROLL_HORIZONTAL_HANDLES);
- ar->v2d.scroll |= (V2D_SCROLL_LEFT | V2D_SCROLL_VERTICAL_HANDLES);
+ region->v2d.scroll |= (V2D_SCROLL_BOTTOM | V2D_SCROLL_HORIZONTAL_HANDLES);
+ region->v2d.scroll |= (V2D_SCROLL_LEFT | V2D_SCROLL_VERTICAL_HANDLES);
- ar->v2d.min[0] = FLT_MIN;
- ar->v2d.min[1] = FLT_MIN;
+ region->v2d.min[0] = FLT_MIN;
+ region->v2d.min[1] = FLT_MIN;
- ar->v2d.max[0] = MAXFRAMEF;
- ar->v2d.max[1] = FLT_MAX;
+ region->v2d.max[0] = MAXFRAMEF;
+ region->v2d.max[1] = FLT_MAX;
- // ar->v2d.flag |= V2D_IS_INITIALISED;
+ // region->v2d.flag |= V2D_IS_INITIALISED;
break;
}
case SPACE_NLA: {
SpaceNla *snla = (SpaceNla *)sl;
- memcpy(&ar->v2d, &snla->v2d, sizeof(View2D));
+ memcpy(&region->v2d, &snla->v2d, sizeof(View2D));
- ar->v2d.tot.ymin = (float)(-sa->winy) / 3.0f;
- ar->v2d.tot.ymax = 0.0f;
+ region->v2d.tot.ymin = (float)(-sa->winy) / 3.0f;
+ region->v2d.tot.ymax = 0.0f;
- ar->v2d.scroll |= (V2D_SCROLL_BOTTOM | V2D_SCROLL_HORIZONTAL_HANDLES);
- ar->v2d.scroll |= (V2D_SCROLL_RIGHT);
- ar->v2d.align = V2D_ALIGN_NO_POS_Y;
- ar->v2d.flag |= V2D_VIEWSYNC_AREA_VERTICAL;
+ region->v2d.scroll |= (V2D_SCROLL_BOTTOM | V2D_SCROLL_HORIZONTAL_HANDLES);
+ region->v2d.scroll |= (V2D_SCROLL_RIGHT);
+ region->v2d.align = V2D_ALIGN_NO_POS_Y;
+ region->v2d.flag |= V2D_VIEWSYNC_AREA_VERTICAL;
break;
}
case SPACE_ACTION: {
@@ -317,26 +317,26 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
/* We totally reinit the view for the Action Editor,
* as some old instances had some weird cruft set. */
- ar->v2d.tot.xmin = -20.0f;
- ar->v2d.tot.ymin = (float)(-sa->winy) / 3.0f;
- ar->v2d.tot.xmax = (float)((sa->winx > 120) ? (sa->winx) : 120);
- ar->v2d.tot.ymax = 0.0f;
+ region->v2d.tot.xmin = -20.0f;
+ region->v2d.tot.ymin = (float)(-sa->winy) / 3.0f;
+ region->v2d.tot.xmax = (float)((sa->winx > 120) ? (sa->winx) : 120);
+ region->v2d.tot.ymax = 0.0f;
- ar->v2d.cur = ar->v2d.tot;
+ region->v2d.cur = region->v2d.tot;
- ar->v2d.min[0] = 0.0f;
- ar->v2d.min[1] = 0.0f;
+ region->v2d.min[0] = 0.0f;
+ region->v2d.min[1] = 0.0f;
- ar->v2d.max[0] = MAXFRAMEF;
- ar->v2d.max[1] = FLT_MAX;
+ region->v2d.max[0] = MAXFRAMEF;
+ region->v2d.max[1] = FLT_MAX;
- ar->v2d.minzoom = 0.01f;
- ar->v2d.maxzoom = 50;
- ar->v2d.scroll = (V2D_SCROLL_BOTTOM | V2D_SCROLL_HORIZONTAL_HANDLES);
- ar->v2d.scroll |= (V2D_SCROLL_RIGHT);
- ar->v2d.keepzoom = V2D_LOCKZOOM_Y;
- ar->v2d.align = V2D_ALIGN_NO_POS_Y;
- ar->v2d.flag = V2D_VIEWSYNC_AREA_VERTICAL;
+ region->v2d.minzoom = 0.01f;
+ region->v2d.maxzoom = 50;
+ region->v2d.scroll = (V2D_SCROLL_BOTTOM | V2D_SCROLL_HORIZONTAL_HANDLES);
+ region->v2d.scroll |= (V2D_SCROLL_RIGHT);
+ region->v2d.keepzoom = V2D_LOCKZOOM_Y;
+ region->v2d.align = V2D_ALIGN_NO_POS_Y;
+ region->v2d.flag = V2D_VIEWSYNC_AREA_VERTICAL;
/* for old files with ShapeKey editors open + an action set, clear the action as
* it doesn't make sense in the new system (i.e. violates concept that ShapeKey edit
@@ -349,39 +349,39 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
}
case SPACE_SEQ: {
SpaceSeq *sseq = (SpaceSeq *)sl;
- memcpy(&ar->v2d, &sseq->v2d, sizeof(View2D));
+ memcpy(&region->v2d, &sseq->v2d, sizeof(View2D));
- ar->v2d.scroll |= (V2D_SCROLL_BOTTOM | V2D_SCROLL_HORIZONTAL_HANDLES);
- ar->v2d.scroll |= (V2D_SCROLL_LEFT | V2D_SCROLL_VERTICAL_HANDLES);
- ar->v2d.align = V2D_ALIGN_NO_NEG_Y;
- ar->v2d.flag |= V2D_IS_INITIALISED;
+ region->v2d.scroll |= (V2D_SCROLL_BOTTOM | V2D_SCROLL_HORIZONTAL_HANDLES);
+ region->v2d.scroll |= (V2D_SCROLL_LEFT | V2D_SCROLL_VERTICAL_HANDLES);
+ region->v2d.align = V2D_ALIGN_NO_NEG_Y;
+ region->v2d.flag |= V2D_IS_INITIALISED;
break;
}
case SPACE_NODE: {
SpaceNode *snode = (SpaceNode *)sl;
- memcpy(&ar->v2d, &snode->v2d, sizeof(View2D));
+ memcpy(&region->v2d, &snode->v2d, sizeof(View2D));
- ar->v2d.scroll = (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM);
- ar->v2d.keepzoom = V2D_LIMITZOOM | V2D_KEEPASPECT;
+ region->v2d.scroll = (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM);
+ region->v2d.keepzoom = V2D_LIMITZOOM | V2D_KEEPASPECT;
break;
}
case SPACE_PROPERTIES: {
SpaceProperties *sbuts = (SpaceProperties *)sl;
- memcpy(&ar->v2d, &sbuts->v2d, sizeof(View2D));
+ memcpy(&region->v2d, &sbuts->v2d, sizeof(View2D));
- ar->v2d.scroll |= (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM);
+ region->v2d.scroll |= (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM);
break;
}
case SPACE_FILE: {
// SpaceFile *sfile = (SpaceFile *)sl;
- ar->v2d.tot.xmin = ar->v2d.tot.ymin = 0;
- ar->v2d.tot.xmax = ar->winx;
- ar->v2d.tot.ymax = ar->winy;
- ar->v2d.cur = ar->v2d.tot;
- ar->regiontype = RGN_TYPE_WINDOW;
- ar->v2d.scroll = (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM);
- ar->v2d.align = (V2D_ALIGN_NO_NEG_X | V2D_ALIGN_NO_POS_Y);
- ar->v2d.keepzoom = (V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y | V2D_LIMITZOOM | V2D_KEEPASPECT);
+ region->v2d.tot.xmin = region->v2d.tot.ymin = 0;
+ region->v2d.tot.xmax = region->winx;
+ region->v2d.tot.ymax = region->winy;
+ region->v2d.cur = region->v2d.tot;
+ region->regiontype = RGN_TYPE_WINDOW;
+ region->v2d.scroll = (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM);
+ region->v2d.align = (V2D_ALIGN_NO_NEG_X | V2D_ALIGN_NO_POS_Y);
+ region->v2d.keepzoom = (V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y | V2D_LIMITZOOM | V2D_KEEPASPECT);
break;
}
case SPACE_TEXT: {
@@ -389,7 +389,7 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
st->flags |= ST_FIND_WRAP;
}
// case SPACE_XXX: // FIXME... add other ones
- // memcpy(&ar->v2d, &((SpaceXxx *)sl)->v2d, sizeof(View2D));
+ // memcpy(&region->v2d, &((SpaceXxx *)sl)->v2d, sizeof(View2D));
// break;
}
}
@@ -1196,7 +1196,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
for (sa = screen->areabase.first; sa; sa = sa->next) {
for (sl = sa->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype != SPACE_SEQ) {
- ARegion *ar;
+ ARegion *region;
ListBase *regionbase;
if (sl == sa->spacedata.first) {
@@ -1206,16 +1206,16 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
regionbase = &sl->regionbase;
}
- for (ar = regionbase->first; ar; ar = ar->next) {
- if (ar->regiontype == RGN_TYPE_PREVIEW) {
+ for (region = regionbase->first; region; region = region->next) {
+ if (region->regiontype == RGN_TYPE_PREVIEW) {
break;
}
}
- if (ar && (ar->regiontype == RGN_TYPE_PREVIEW)) {
+ if (region && (region->regiontype == RGN_TYPE_PREVIEW)) {
SpaceType *st = BKE_spacetype_from_id(SPACE_SEQ);
- BKE_area_region_free(st, ar);
- BLI_freelinkN(regionbase, ar);
+ BKE_area_region_free(st, region);
+ BLI_freelinkN(regionbase, region);
}
}
}
@@ -1234,7 +1234,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
for (sa = screen->areabase.first; sa; sa = sa->next) {
for (sl = sa->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_SEQ) {
- ARegion *ar;
+ ARegion *region;
ARegion *ar_main;
ListBase *regionbase;
SpaceSeq *sseq = (SpaceSeq *)sl;
@@ -1259,9 +1259,9 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
break;
}
}
- ar = MEM_callocN(sizeof(ARegion), "preview area for sequencer");
- BLI_insertlinkbefore(regionbase, ar_main, ar);
- sequencer_init_preview_region(ar);
+ region = MEM_callocN(sizeof(ARegion), "preview area for sequencer");
+ BLI_insertlinkbefore(regionbase, ar_main, region);
+ sequencer_init_preview_region(region);
}
}
}
@@ -1367,7 +1367,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
for (sa = screen->areabase.first; sa; sa = sa->next) {
for (sl = sa->spacedata.first; sl; sl = sl->next) {
ListBase *regionbase;
- ARegion *ar;
+ ARegion *region;
if (sl == sa->spacedata.first) {
regionbase = &sa->regionbase;
@@ -1377,10 +1377,10 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
}
if (ELEM(sl->spacetype, SPACE_ACTION, SPACE_NLA)) {
- for (ar = (ARegion *)regionbase->first; ar; ar = ar->next) {
- if (ar->regiontype == RGN_TYPE_WINDOW) {
- ar->v2d.cur.ymax = ar->v2d.tot.ymax = 0.0f;
- ar->v2d.cur.ymin = ar->v2d.tot.ymin = (float)(-sa->winy) / 3.0f;
+ for (region = (ARegion *)regionbase->first; region; region = region->next) {
+ if (region->regiontype == RGN_TYPE_WINDOW) {
+ region->v2d.cur.ymax = region->v2d.tot.ymax = 0.0f;
+ region->v2d.cur.ymin = region->v2d.tot.ymin = (float)(-sa->winy) / 3.0f;
}
}
}
@@ -1582,7 +1582,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
if (sl->spacetype == SPACE_NODE) {
SpaceNode *snode = (SpaceNode *)sl;
ListBase *regionbase;
- ARegion *ar;
+ ARegion *region;
if (sl == sa->spacedata.first) {
regionbase = &sa->regionbase;
@@ -1598,13 +1598,13 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
snode->v2d.maxzoom = 2.31f;
}
- for (ar = regionbase->first; ar; ar = ar->next) {
- if (ar->regiontype == RGN_TYPE_WINDOW) {
- if (ar->v2d.minzoom > 0.09f) {
- ar->v2d.minzoom = 0.09f;
+ for (region = regionbase->first; region; region = region->next) {
+ if (region->regiontype == RGN_TYPE_WINDOW) {
+ if (region->v2d.minzoom > 0.09f) {
+ region->v2d.minzoom = 0.09f;
}
- if (ar->v2d.maxzoom < 2.31f) {
- ar->v2d.maxzoom = 2.31f;
+ if (region->v2d.maxzoom < 2.31f) {
+ region->v2d.maxzoom = 2.31f;
}
}
}
@@ -1857,19 +1857,20 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
for (sl = sa->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_INFO) {
SpaceInfo *sinfo = (SpaceInfo *)sl;
- ARegion *ar;
+ ARegion *region;
sinfo->rpt_mask = INFO_RPT_OP;
- for (ar = sa->regionbase.first; ar; ar = ar->next) {
- if (ar->regiontype == RGN_TYPE_WINDOW) {
- ar->v2d.scroll = (V2D_SCROLL_RIGHT);
- ar->v2d.align = V2D_ALIGN_NO_NEG_X | V2D_ALIGN_NO_NEG_Y; /* align bottom left */
- ar->v2d.keepofs = V2D_LOCKOFS_X;
- ar->v2d.keepzoom = (V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y | V2D_LIMITZOOM |
- V2D_KEEPASPECT);
- ar->v2d.keeptot = V2D_KEEPTOT_BOUNDS;
- ar->v2d.minzoom = ar->v2d.maxzoom = 1.0f;
+ for (region = sa->regionbase.first; region; region = region->next) {
+ if (region->regiontype == RGN_TYPE_WINDOW) {
+ region->v2d.scroll = (V2D_SCROLL_RIGHT);
+ region->v2d.align = V2D_ALIGN_NO_NEG_X |
+ V2D_ALIGN_NO_NEG_Y; /* align bottom left */
+ region->v2d.keepofs = V2D_LOCKOFS_X;
+ region->v2d.keepzoom = (V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y | V2D_LIMITZOOM |
+ V2D_KEEPASPECT);
+ region->v2d.keeptot = V2D_KEEPTOT_BOUNDS;
+ region->v2d.minzoom = region->v2d.maxzoom = 1.0f;
}
}
}
@@ -2121,10 +2122,10 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
for (sa = screen->areabase.first; sa; sa = sa->next) {
SpaceLink *sl = sa->spacedata.first;
if (sl->spacetype == SPACE_IMAGE) {
- ARegion *ar;
- for (ar = sa->regionbase.first; ar; ar = ar->next) {
- if (ar->regiontype == RGN_TYPE_WINDOW) {
- View2D *v2d = &ar->v2d;
+ ARegion *region;
+ for (region = sa->regionbase.first; region; region = region->next) {
+ if (region->regiontype == RGN_TYPE_WINDOW) {
+ View2D *v2d = &region->v2d;
v2d->minzoom = v2d->maxzoom = v2d->scroll = v2d->keeptot = v2d->keepzoom =
v2d->keepofs = v2d->align = 0;
}
@@ -2133,10 +2134,10 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
for (sl = sa->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_IMAGE) {
- ARegion *ar;
- for (ar = sl->regionbase.first; ar; ar = ar->next) {
- if (ar->regiontype == RGN_TYPE_WINDOW) {
- View2D *v2d = &ar->v2d;
+ ARegion *region;
+ for (region = sl->regionbase.first; region; region = region->next) {
+ if (region->regiontype == RGN_TYPE_WINDOW) {
+ View2D *v2d = &region->v2d;
v2d->minzoom = v2d->maxzoom = v2d->scroll = v2d->keeptot = v2d->keepzoom =
v2d->keepofs = v2d->align = 0;
}
@@ -2179,22 +2180,22 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
for (sa = screen->areabase.first; sa; sa = sa->next) {
SpaceLink *sl = sa->spacedata.first;
if (sl->spacetype == SPACE_SEQ) {
- ARegion *ar;
- for (ar = sa->regionbase.first; ar; ar = ar->next) {
- if (ar->regiontype == RGN_TYPE_WINDOW) {
- if (ar->v2d.min[1] == 4.0f) {
- ar->v2d.min[1] = 0.5f;
+ ARegion *region;
+ for (region = sa->regionbase.first; region; region = region->next) {
+ if (region->regiontype == RGN_TYPE_WINDOW) {
+ if (region->v2d.min[1] == 4.0f) {
+ region->v2d.min[1] = 0.5f;
}
}
}
}
for (sl = sa->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_SEQ) {
- ARegion *ar;
- for (ar = sl->regionbase.first; ar; ar = ar->next) {
- if (ar->regiontype == RGN_TYPE_WINDOW) {
- if (ar->v2d.min[1] == 4.0f) {
- ar->v2d.min[1] = 0.5f;
+ ARegion *region;
+ for (region = sl->regionbase.first; region; region = region->next) {
+ if (region->regiontype == RGN_TYPE_WINDOW) {
+ if (region->v2d.min[1] == 4.0f) {
+ region->v2d.min[1] = 0.5f;
}
}
}
diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c
index 7c70728e50c..8a55ccf78b9 100644
--- a/source/blender/blenloader/intern/versioning_260.c
+++ b/source/blender/blenloader/intern/versioning_260.c
@@ -1198,15 +1198,15 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
for (sl = sa->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_CLIP) {
SpaceClip *sclip = (SpaceClip *)sl;
- ARegion *ar;
+ ARegion *region;
bool hide = false;
- for (ar = sa->regionbase.first; ar; ar = ar->next) {
- if (ar->regiontype == RGN_TYPE_PREVIEW) {
- if (ar->alignment != RGN_ALIGN_NONE) {
- ar->flag |= RGN_FLAG_HIDDEN;
- ar->v2d.flag &= ~V2D_IS_INITIALISED;
- ar->alignment = RGN_ALIGN_NONE;
+ for (region = sa->regionbase.first; region; region = region->next) {
+ if (region->regiontype == RGN_TYPE_PREVIEW) {
+ if (region->alignment != RGN_ALIGN_NONE) {
+ region->flag |= RGN_FLAG_HIDDEN;
+ region->v2d.flag &= ~V2D_IS_INITIALISED;
+ region->alignment = RGN_ALIGN_NONE;
hide = true;
}
@@ -2263,26 +2263,26 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
/* add missing (+) expander in node editor */
for (sc = bmain->screens.first; sc; sc = sc->id.next) {
for (sa = sc->areabase.first; sa; sa = sa->next) {
- ARegion *ar, *arnew;
+ ARegion *region, *arnew;
if (sa->spacetype == SPACE_NODE) {
- ar = BKE_area_find_region_type(sa, RGN_TYPE_TOOLS);
+ region = BKE_area_find_region_type(sa, RGN_TYPE_TOOLS);
- if (ar) {
+ if (region) {
continue;
}
/* add subdiv level; after header */
- ar = BKE_area_find_region_type(sa, RGN_TYPE_HEADER);
+ region = BKE_area_find_region_type(sa, RGN_TYPE_HEADER);
/* is error! */
- if (ar == NULL) {
+ if (region == NULL) {
continue;
}
arnew = MEM_callocN(sizeof(ARegion), "node tools");
- BLI_insertlinkafter(&sa->regionbase, ar, arnew);
+ BLI_insertlinkafter(&sa->regionbase, region, arnew);
arnew->regiontype = RGN_TYPE_TOOLS;
arnew->alignment = RGN_ALIGN_LEFT;
@@ -2551,7 +2551,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
for (space_link = sa->spacedata.first; space_link; space_link = space_link->next) {
if (space_link->spacetype == SPACE_IMAGE) {
- ARegion *ar;
+ ARegion *region;
ListBase *lb;
if (space_link == sa->spacedata.first) {
@@ -2561,13 +2561,13 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
lb = &space_link->regionbase;
}
- for (ar = lb->first; ar; ar = ar->next) {
- if (ar->regiontype == RGN_TYPE_PREVIEW) {
- ar->regiontype = RGN_TYPE_TOOLS;
- ar->alignment = RGN_ALIGN_LEFT;
+ for (region = lb->first; region; region = region->next) {
+ if (region->regiontype == RGN_TYPE_PREVIEW) {
+ region->regiontype = RGN_TYPE_TOOLS;
+ region->alignment = RGN_ALIGN_LEFT;
}
- else if (ar->regiontype == RGN_TYPE_UI) {
- ar->alignment = RGN_ALIGN_RIGHT;
+ else if (region->regiontype == RGN_TYPE_UI) {
+ region->alignment = RGN_ALIGN_RIGHT;
}
}
}
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index f421f31814c..df946168056 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -233,18 +233,18 @@ static void do_version_constraints_stretch_to_limits(ListBase *lb)
static void do_version_action_editor_properties_region(ListBase *regionbase)
{
- ARegion *ar;
+ ARegion *region;
- for (ar = regionbase->first; ar; ar = ar->next) {
- if (ar->regiontype == RGN_TYPE_UI) {
+ for (region = regionbase->first; region; region = region->next) {
+ if (region->regiontype == RGN_TYPE_UI) {
/* already exists */
return;
}
- else if (ar->regiontype == RGN_TYPE_WINDOW) {
+ else if (region->regiontype == RGN_TYPE_WINDOW) {
/* add new region here */
ARegion *arnew = MEM_callocN(sizeof(ARegion), "buttons for action");
- BLI_insertlinkbefore(regionbase, ar, arnew);
+ BLI_insertlinkbefore(regionbase, region, arnew);
arnew->regiontype = RGN_TYPE_UI;
arnew->alignment = RGN_ALIGN_RIGHT;
@@ -527,11 +527,11 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain)
SpaceLink *sl;
for (sl = sa->spacedata.first; sl; sl = sl->next) {
- ARegion *ar;
+ ARegion *region;
ListBase *lb = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
- for (ar = lb->first; ar; ar = ar->next) {
- BLI_listbase_clear(&ar->ui_previews);
+ for (region = lb->first; region; region = region->next) {
+ BLI_listbase_clear(&region->ui_previews);
}
}
}
@@ -855,18 +855,18 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain)
bScreen *scr;
ScrArea *sa;
SpaceLink *sl;
- ARegion *ar;
+ ARegion *region;
/* Make sure sequencer preview area limits zoom */
for (scr = bmain->screens.first; scr; scr = scr->id.next) {
for (sa = scr->areabase.first; sa; sa = sa->next) {
for (sl = sa->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_SEQ) {
- for (ar = sl->regionbase.first; ar; ar = ar->next) {
- if (ar->regiontype == RGN_TYPE_PREVIEW) {
- ar->v2d.keepzoom |= V2D_LIMITZOOM;
- ar->v2d.minzoom = 0.001f;
- ar->v2d.maxzoom = 1000.0f;
+ for (region = sl->regionbase.first; region; region = region->next) {
+ if (region->regiontype == RGN_TYPE_PREVIEW) {
+ region->v2d.keepzoom |= V2D_LIMITZOOM;
+ region->v2d.minzoom = 0.001f;
+ region->v2d.maxzoom = 1000.0f;
break;
}
}
@@ -1069,12 +1069,12 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain)
SpaceLink *sl;
for (sl = sa->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_VIEW3D) {
- ARegion *ar;
+ ARegion *region;
ListBase *lb = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
- for (ar = lb->first; ar; ar = ar->next) {
- if (ar->regiontype == RGN_TYPE_WINDOW) {
- if (ar->regiondata) {
- RegionView3D *rv3d = ar->regiondata;
+ for (region = lb->first; region; region = region->next) {
+ if (region->regiontype == RGN_TYPE_WINDOW) {
+ if (region->regiondata) {
+ RegionView3D *rv3d = region->regiondata;
if (rv3d->view == RV3D_VIEW_PERSPORTHO) {
rv3d->view = RV3D_VIEW_USER;
}
@@ -1256,11 +1256,11 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain)
if (sl->spacetype == SPACE_SEQ) {
SpaceSeq *sseq = (SpaceSeq *)sl;
if (sseq->view == SEQ_VIEW_SEQUENCE) {
- for (ARegion *ar = regionbase->first; ar; ar = ar->next) {
+ for (ARegion *region = regionbase->first; region; region = region->next) {
/* remove preview region for sequencer-only view! */
- if (ar->regiontype == RGN_TYPE_PREVIEW) {
- ar->flag |= RGN_FLAG_HIDDEN;
- ar->alignment = RGN_ALIGN_NONE;
+ if (region->regiontype == RGN_TYPE_PREVIEW) {
+ region->flag |= RGN_FLAG_HIDDEN;
+ region->alignment = RGN_ALIGN_NONE;
break;
}
}
@@ -1268,11 +1268,11 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
/* Remove old deprecated region from filebrowsers */
else if (sl->spacetype == SPACE_FILE) {
- for (ARegion *ar = regionbase->first; ar; ar = ar->next) {
- if (ar->regiontype == RGN_TYPE_CHANNELS) {
+ for (ARegion *region = regionbase->first; region; region = region->next) {
+ if (region->regiontype == RGN_TYPE_CHANNELS) {
/* Free old deprecated 'channel' region... */
- BKE_area_region_free(NULL, ar);
- BLI_freelinkN(regionbase, ar);
+ BKE_area_region_free(NULL, region);
+ BLI_freelinkN(regionbase, region);
break;
}
}
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 300880a5839..e29c4f8658f 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -595,27 +595,27 @@ static void do_versions_fix_annotations(bGPdata *gpd)
}
}
-static void do_versions_remove_region(ListBase *regionbase, ARegion *ar)
+static void do_versions_remove_region(ListBase *regionbase, ARegion *region)
{
- BLI_freelinkN(regionbase, ar);
+ BLI_freelinkN(regionbase, region);
}
static void do_versions_remove_regions_by_type(ListBase *regionbase, int regiontype)
{
- ARegion *ar, *ar_next;
- for (ar = regionbase->first; ar; ar = ar_next) {
- ar_next = ar->next;
- if (ar->regiontype == regiontype) {
- do_versions_remove_region(regionbase, ar);
+ ARegion *region, *ar_next;
+ for (region = regionbase->first; region; region = ar_next) {
+ ar_next = region->next;
+ if (region->regiontype == regiontype) {
+ do_versions_remove_region(regionbase, region);
}
}
}
static ARegion *do_versions_find_region_or_null(ListBase *regionbase, int regiontype)
{
- for (ARegion *ar = regionbase->first; ar; ar = ar->next) {
- if (ar->regiontype == regiontype) {
- return ar;
+ for (ARegion *region = regionbase->first; region; region = region->next) {
+ if (region->regiontype == regiontype) {
+ return region;
}
}
return NULL;
@@ -623,18 +623,18 @@ static ARegion *do_versions_find_region_or_null(ListBase *regionbase, int region
static ARegion *do_versions_find_region(ListBase *regionbase, int regiontype)
{
- ARegion *ar = do_versions_find_region_or_null(regionbase, regiontype);
- if (ar == NULL) {
+ ARegion *region = do_versions_find_region_or_null(regionbase, regiontype);
+ if (region == NULL) {
BLI_assert(!"Did not find expected region in versioning");
}
- return ar;
+ return region;
}
static ARegion *do_versions_add_region(int regiontype, const char *name)
{
- ARegion *ar = MEM_callocN(sizeof(ARegion), name);
- ar->regiontype = regiontype;
- return ar;
+ ARegion *region = MEM_callocN(sizeof(ARegion), name);
+ region->regiontype = regiontype;
+ return region;
}
static void do_versions_area_ensure_tool_region(Main *bmain,
@@ -646,13 +646,13 @@ static void do_versions_area_ensure_tool_region(Main *bmain,
for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == space_type) {
ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
- ARegion *ar = BKE_area_find_region_type(sa, RGN_TYPE_TOOLS);
- if (!ar) {
+ ARegion *region = BKE_area_find_region_type(sa, RGN_TYPE_TOOLS);
+ if (!region) {
ARegion *header = BKE_area_find_region_type(sa, RGN_TYPE_HEADER);
- ar = do_versions_add_region(RGN_TYPE_TOOLS, "tools region");
- BLI_insertlinkafter(regionbase, header, ar);
- ar->alignment = RGN_ALIGN_LEFT;
- ar->flag = region_flag;
+ region = do_versions_add_region(RGN_TYPE_TOOLS, "tools region");
+ BLI_insertlinkafter(regionbase, header, region);
+ region->alignment = RGN_ALIGN_LEFT;
+ region->flag = region_flag;
}
}
}
@@ -2899,9 +2899,11 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
* fine to always insert headers first. */
BLI_assert(!do_versions_find_region_or_null(regionbase, RGN_TYPE_TOOL_HEADER));
- ARegion *ar = do_versions_add_region(RGN_TYPE_HEADER, "header 2.83.1 versioning");
- ar->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP;
- BLI_addhead(regionbase, ar);
+ ARegion *region = do_versions_add_region(RGN_TYPE_HEADER,
+ "header 2.83.1 versioning");
+ region->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM :
+ RGN_ALIGN_TOP;
+ BLI_addhead(regionbase, region);
}
}
}
@@ -2913,7 +2915,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_PROPERTIES) {
ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
- ARegion *ar = MEM_callocN(sizeof(ARegion), "navigation bar for properties");
+ ARegion *region = MEM_callocN(sizeof(ARegion), "navigation bar for properties");
ARegion *ar_header = NULL;
for (ar_header = regionbase->first; ar_header; ar_header = ar_header->next) {
@@ -2923,10 +2925,10 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
BLI_assert(ar_header);
- BLI_insertlinkafter(regionbase, ar_header, ar);
+ BLI_insertlinkafter(regionbase, ar_header, region);
- ar->regiontype = RGN_TYPE_NAV_BAR;
- ar->alignment = RGN_ALIGN_LEFT;
+ region->regiontype = RGN_TYPE_NAV_BAR;
+ region->alignment = RGN_ALIGN_LEFT;
}
}
}
@@ -3698,11 +3700,11 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
do_versions_remove_regions_by_type(regionbase, RGN_TYPE_FOOTER);
/* Add footer. */
- ARegion *ar = do_versions_add_region(RGN_TYPE_FOOTER, "footer for text");
- ar->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_TOP : RGN_ALIGN_BOTTOM;
+ ARegion *region = do_versions_add_region(RGN_TYPE_FOOTER, "footer for text");
+ region->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_TOP : RGN_ALIGN_BOTTOM;
ARegion *ar_header = do_versions_find_region(regionbase, RGN_TYPE_HEADER);
- BLI_insertlinkafter(regionbase, ar_header, ar);
+ BLI_insertlinkafter(regionbase, ar_header, region);
}
}
}
@@ -3788,20 +3790,22 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
/* All spaces that use tools must be eventually added. */
- ARegion *ar = NULL;
+ ARegion *region = NULL;
if (ELEM(sl->spacetype, SPACE_VIEW3D, SPACE_IMAGE, SPACE_SEQ) &&
- ((ar = do_versions_find_region_or_null(regionbase, RGN_TYPE_TOOL_HEADER)) == NULL)) {
+ ((region = do_versions_find_region_or_null(regionbase, RGN_TYPE_TOOL_HEADER)) ==
+ NULL)) {
/* Add tool header. */
- ar = do_versions_add_region(RGN_TYPE_TOOL_HEADER, "tool header");
- ar->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP;
+ region = do_versions_add_region(RGN_TYPE_TOOL_HEADER, "tool header");
+ region->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP;
ARegion *ar_header = do_versions_find_region(regionbase, RGN_TYPE_HEADER);
- BLI_insertlinkbefore(regionbase, ar_header, ar);
+ BLI_insertlinkbefore(regionbase, ar_header, region);
/* Hide by default, enable for painting workspaces (startup only). */
- ar->flag |= RGN_FLAG_HIDDEN | RGN_FLAG_HIDDEN_BY_USER;
+ region->flag |= RGN_FLAG_HIDDEN | RGN_FLAG_HIDDEN_BY_USER;
}
- if (ar != NULL) {
- SET_FLAG_FROM_TEST(ar->flag, ar->flag & RGN_FLAG_HIDDEN_BY_USER, RGN_FLAG_HIDDEN);
+ if (region != NULL) {
+ SET_FLAG_FROM_TEST(
+ region->flag, region->flag & RGN_FLAG_HIDDEN_BY_USER, RGN_FLAG_HIDDEN);
}
}
}
@@ -3898,19 +3902,19 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
if (ELEM(sl->spacetype, SPACE_CLIP, SPACE_GRAPH, SPACE_SEQ)) {
ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
- ARegion *ar = NULL;
+ ARegion *region = NULL;
if (sl->spacetype == SPACE_CLIP) {
if (((SpaceClip *)sl)->view == SC_VIEW_GRAPH) {
- ar = do_versions_find_region_or_null(regionbase, RGN_TYPE_PREVIEW);
+ region = do_versions_find_region_or_null(regionbase, RGN_TYPE_PREVIEW);
}
}
else {
- ar = do_versions_find_region_or_null(regionbase, RGN_TYPE_WINDOW);
+ region = do_versions_find_region_or_null(regionbase, RGN_TYPE_WINDOW);
}
- if (ar != NULL) {
- ar->v2d.scroll &= ~V2D_SCROLL_LEFT;
- ar->v2d.scroll |= V2D_SCROLL_RIGHT;
+ if (region != NULL) {
+ region->v2d.scroll &= ~V2D_SCROLL_LEFT;
+ region->v2d.scroll |= V2D_SCROLL_RIGHT;
}
}
}
@@ -4049,9 +4053,9 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_TEXT) {
ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
- ARegion *ar = do_versions_find_region_or_null(regionbase, RGN_TYPE_UI);
- if (ar) {
- ar->alignment = RGN_ALIGN_RIGHT;
+ ARegion *region = do_versions_find_region_or_null(regionbase, RGN_TYPE_UI);
+ if (region) {
+ region->alignment = RGN_ALIGN_RIGHT;
}
}
/* Mark outliners as dirty for syncing and enable synced selection */
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;
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 88fc6a2a930..0c9363043ee 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2756,19 +2756,19 @@ static void write_gpencil(WriteData *wd, bGPdata *gpd)
}
}
-static void write_region(WriteData *wd, ARegion *ar, int spacetype)
+static void write_region(WriteData *wd, ARegion *region, int spacetype)
{
- writestruct(wd, DATA, ARegion, 1, ar);
+ writestruct(wd, DATA, ARegion, 1, region);
- if (ar->regiondata) {
- if (ar->flag & RGN_FLAG_TEMP_REGIONDATA) {
+ if (region->regiondata) {
+ if (region->flag & RGN_FLAG_TEMP_REGIONDATA) {
return;
}
switch (spacetype) {
case SPACE_VIEW3D:
- if (ar->regiontype == RGN_TYPE_WINDOW) {
- RegionView3D *rv3d = ar->regiondata;
+ if (region->regiontype == RGN_TYPE_WINDOW) {
+ RegionView3D *rv3d = region->regiondata;
writestruct(wd, DATA, RegionView3D, 1, rv3d);
if (rv3d->localvd) {