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
path: root/source/blender/blenloader/intern/readfile.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
-rw-r--r--source/blender/blenloader/intern/readfile.c88
1 files changed, 44 insertions, 44 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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 19:32:33 +0300