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
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r--source/blender/blenloader/intern/readfile.c30
-rw-r--r--source/blender/blenloader/intern/versioning_250.c38
-rw-r--r--source/blender/blenloader/intern/versioning_260.c60
-rw-r--r--source/blender/blenloader/intern/versioning_270.c18
-rw-r--r--source/blender/blenloader/intern/versioning_280.c14
-rw-r--r--source/blender/blenloader/intern/versioning_legacy.c92
-rw-r--r--source/blender/blenloader/intern/writefile.c12
7 files changed, 132 insertions, 132 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 9822c794f3a..6bc920c26f9 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7847,17 +7847,17 @@ static void lib_link_windowmanager(FileData *fd, Main *UNUSED(bmain), wmWindowMa
/* note: file read without screens option G_FILE_NO_UI;
* check lib pointers in call below */
-static void lib_link_screen(FileData *fd, Main *UNUSED(bmain), bScreen *sc)
+static void lib_link_screen(FileData *fd, Main *UNUSED(bmain), bScreen *screen)
{
/* deprecated, but needed for versioning (will be NULL'ed then) */
- sc->scene = newlibadr(fd, sc->id.lib, sc->scene);
+ screen->scene = newlibadr(fd, screen->id.lib, screen->scene);
- sc->animtimer = NULL; /* saved in rare cases */
- sc->tool_tip = NULL;
- sc->scrubbing = false;
+ screen->animtimer = NULL; /* saved in rare cases */
+ screen->tool_tip = NULL;
+ screen->scrubbing = false;
- for (ScrArea *area = sc->areabase.first; area; area = area->next) {
- lib_link_area(fd, &sc->id, area);
+ for (ScrArea *area = screen->areabase.first; area; area = area->next) {
+ lib_link_area(fd, &screen->id, area);
}
}
@@ -8195,7 +8195,7 @@ static void lib_link_workspace_layout_restore(struct IDNameLib_Map *id_map,
scpt->script = restore_pointer_by_name(id_map, (ID *)scpt->script, USER_REAL);
- /*sc->script = NULL; - 2.45 set to null, better re-run the script */
+ /*screen->script = NULL; - 2.45 set to null, better re-run the script */
if (scpt->script) {
SCRIPT_SET_NULL(scpt->script);
}
@@ -8378,18 +8378,18 @@ void blo_do_versions_view3d_split_250(View3D *v3d, ListBase *regions)
}
}
-static bool direct_link_screen(FileData *fd, bScreen *sc)
+static bool direct_link_screen(FileData *fd, bScreen *screen)
{
bool wrong_id = false;
- sc->regionbase.first = sc->regionbase.last = NULL;
- sc->context = NULL;
- sc->active_region = NULL;
+ screen->regionbase.first = screen->regionbase.last = NULL;
+ screen->context = NULL;
+ screen->active_region = NULL;
- sc->preview = direct_link_preview_image(fd, sc->preview);
+ screen->preview = direct_link_preview_image(fd, screen->preview);
- if (!direct_link_area_map(fd, AREAMAP_FROM_SCREEN(sc))) {
- printf("Error reading Screen %s... removing it.\n", sc->id.name + 2);
+ if (!direct_link_area_map(fd, AREAMAP_FROM_SCREEN(screen))) {
+ printf("Error reading Screen %s... removing it.\n", screen->id.name + 2);
wrong_id = true;
}
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c
index 83dc0e2ffe2..fe0d2293243 100644
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@@ -1460,15 +1460,15 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
}
if (bmain->versionfile <= 251) { /* 2.5.1 had no subversions */
- bScreen *sc;
+ bScreen *screen;
/* Blender 2.5.2 - subversion 0 introduced a new setting: V3D_HIDE_OVERLAYS.
* This bit was used in the past for V3D_TRANSFORM_SNAP, which is now deprecated.
* Here we clear it for old files so they don't come in with V3D_HIDE_OVERLAYS set,
* which would cause cameras, lights, etc to become invisible */
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_VIEW3D) {
@@ -1547,13 +1547,13 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
}
if (bmain->versionfile < 252 || (bmain->versionfile == 252 && bmain->subversionfile < 5)) {
- bScreen *sc;
+ bScreen *screen;
/* Image editor scopes */
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
@@ -1569,13 +1569,13 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
if (bmain->versionfile < 253) {
Object *ob;
Scene *scene;
- bScreen *sc;
+ bScreen *screen;
Tex *tex;
Brush *brush;
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
@@ -1833,7 +1833,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
if (bmain->versionfile < 255 || (bmain->versionfile == 255 && bmain->subversionfile < 1)) {
Brush *br;
ParticleSettings *part;
- bScreen *sc;
+ bScreen *screen;
for (br = bmain->brushes.first; br; br = br->id.next) {
if (br->ob_mode == 0) {
@@ -1850,9 +1850,9 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
part->kink_amp_clump = 1.f; /* keep old files looking similar */
}
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_INFO) {
@@ -1896,13 +1896,13 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
}
if (bmain->versionfile < 256) {
- bScreen *sc;
+ bScreen *screen;
ScrArea *area;
Key *key;
/* Fix for sample line scope initializing with no height */
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
- area = sc->areabase.first;
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
+ area = screen->areabase.first;
while (area) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
@@ -2040,18 +2040,18 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
}
if (bmain->versionfile < 256 || (bmain->versionfile == 256 && bmain->subversionfile < 3)) {
- bScreen *sc;
+ bScreen *screen;
Brush *brush;
Object *ob;
ParticleSettings *part;
/* redraws flag in SpaceTime has been moved to Screen level */
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
- if (sc->redraws_flag == 0) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
+ if (screen->redraws_flag == 0) {
/* just initialize to default? */
/* XXX: we could also have iterated through areas,
* and taken them from the first timeline available... */
- sc->redraws_flag = TIME_ALL_3D_WIN | TIME_ALL_ANIM_WIN;
+ screen->redraws_flag = TIME_ALL_3D_WIN | TIME_ALL_ANIM_WIN;
}
}
diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c
index 6f4dd88fcb6..98e10bef470 100644
--- a/source/blender/blenloader/intern/versioning_260.c
+++ b/source/blender/blenloader/intern/versioning_260.c
@@ -765,12 +765,12 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
{
/* Tomato compatibility code. */
- bScreen *sc;
+ bScreen *screen;
MovieClip *clip;
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_VIEW3D) {
@@ -1188,11 +1188,11 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 2)) {
- bScreen *sc;
+ bScreen *screen;
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
@@ -1368,12 +1368,12 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
{
- bScreen *sc;
+ bScreen *screen;
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
@@ -1661,11 +1661,11 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
/* render border for viewport */
{
- bScreen *sc;
+ bScreen *screen;
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_VIEW3D) {
@@ -1758,10 +1758,10 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
if (bmain->versionfile < 265 || (bmain->versionfile == 265 && bmain->subversionfile < 3)) {
- bScreen *sc;
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ bScreen *screen;
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
switch (sl->spacetype) {
@@ -1943,10 +1943,10 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
if (MAIN_VERSION_OLDER(bmain, 266, 2)) {
- bScreen *sc;
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ bScreen *screen;
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_NODE) {
@@ -2199,7 +2199,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
if (!MAIN_VERSION_ATLEAST(bmain, 268, 4)) {
- bScreen *sc;
+ bScreen *screen;
Object *ob;
for (ob = bmain->objects.first; ob; ob = ob->id.next) {
@@ -2240,9 +2240,9 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
*
* We moved this check to the do versions to be sure the value makes any sense.
*/
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_NODE) {
@@ -2257,12 +2257,12 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
if (!MAIN_VERSION_ATLEAST(bmain, 268, 5)) {
- bScreen *sc;
+ bScreen *screen;
ScrArea *area;
/* add missing (+) expander in node editor */
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
- for (area = sc->areabase.first; area; area = area->next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
+ for (area = screen->areabase.first; area; area = area->next) {
ARegion *region, *arnew;
if (area->spacetype == SPACE_NODE) {
@@ -2338,14 +2338,14 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
if (!MAIN_VERSION_ATLEAST(bmain, 269, 3)) {
- bScreen *sc;
+ bScreen *screen;
ScrArea *area;
SpaceLink *sl;
Scene *scene;
/* Update files using invalid (outdated) outlinevis Outliner values. */
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
- for (area = sc->areabase.first; area; area = area->next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
+ for (area = screen->areabase.first; area; area = area->next) {
for (sl = area->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_OUTLINER) {
SpaceOutliner *so = (SpaceOutliner *)sl;
@@ -2542,11 +2542,11 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
if (!MAIN_VERSION_ATLEAST(bmain, 269, 11)) {
- bScreen *sc;
+ bScreen *screen;
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *space_link;
for (space_link = area->spacedata.first; space_link; space_link = space_link->next) {
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index abe8326618b..7ae14a9b7ce 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -519,11 +519,11 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain)
* leading to corrupted files (see T39847).
* This will always reset situation to a valid state.
*/
- bScreen *sc;
+ bScreen *screen;
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
@@ -852,14 +852,14 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
if (!MAIN_VERSION_ATLEAST(bmain, 273, 9)) {
- bScreen *scr;
+ bScreen *screen;
ScrArea *area;
SpaceLink *sl;
ARegion *region;
/* Make sure sequencer preview area limits zoom */
- for (scr = bmain->screens.first; scr; scr = scr->id.next) {
- for (area = scr->areabase.first; area; area = area->next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
+ for (area = screen->areabase.first; area; area = area->next) {
for (sl = area->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_SEQ) {
for (region = sl->regionbase.first; region; region = region->next) {
@@ -1650,9 +1650,9 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain)
if (!MAIN_VERSION_ATLEAST(bmain, 279, 4)) {
/* Fix for invalid state of screen due to bug in older versions. */
- for (bScreen *sc = bmain->screens.first; sc; sc = sc->id.next) {
- for (ScrArea *area = sc->areabase.first; area; area = area->next) {
- if (area->full && sc->state == SCREENNORMAL) {
+ for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
+ for (ScrArea *area = screen->areabase.first; area; area = area->next) {
+ if (area->full && screen->state == SCREENNORMAL) {
area->full = NULL;
}
}
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 7449d1c04c1..3821b2ad48a 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -1928,13 +1928,13 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
if (!MAIN_VERSION_ATLEAST(bmain, 280, 6)) {
if (DNA_struct_elem_find(fd->filesdna, "SpaceOutliner", "int", "filter") == false) {
- bScreen *sc;
+ bScreen *screen;
ScrArea *area;
SpaceLink *sl;
/* Update files using invalid (outdated) outlinevis Outliner values. */
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
- for (area = sc->areabase.first; area; area = area->next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
+ for (area = screen->areabase.first; area; area = area->next) {
for (sl = area->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_OUTLINER) {
SpaceOutliner *so = (SpaceOutliner *)sl;
@@ -1973,8 +1973,8 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
}
- for (bScreen *sc = bmain->screens.first; sc; sc = sc->id.next) {
- for (ScrArea *area = sc->areabase.first; area; area = area->next) {
+ for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
+ for (ScrArea *area = screen->areabase.first; area; area = area->next) {
for (SpaceLink *sl = area->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_VIEW3D) {
View3D *v3d = (View3D *)sl;
@@ -2643,8 +2643,8 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
/* initialize grease pencil view data */
if (!DNA_struct_elem_find(fd->filesdna, "SpaceView3D", "float", "vertex_opacity")) {
- for (bScreen *sc = bmain->screens.first; sc; sc = sc->id.next) {
- for (ScrArea *area = sc->areabase.first; area; area = area->next) {
+ for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
+ for (ScrArea *area = screen->areabase.first; area; area = area->next) {
for (SpaceLink *sl = area->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_VIEW3D) {
View3D *v3d = (View3D *)sl;
diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c
index a35ef80e4d3..ce039182572 100644
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@@ -580,9 +580,9 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
if (bmain->versionfile <= 109) {
/* new variable: gridlines */
- bScreen *sc = bmain->screens.first;
- while (sc) {
- ScrArea *area = sc->areabase.first;
+ bScreen *screen = bmain->screens.first;
+ while (screen) {
+ ScrArea *area = screen->areabase.first;
while (area) {
SpaceLink *sl = area->spacedata.first;
while (sl) {
@@ -597,7 +597,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
}
area = area->next;
}
- sc = sc->id.next;
+ screen = screen->id.next;
}
}
@@ -694,9 +694,9 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
}
if (bmain->versionfile <= 169) {
- bScreen *sc = bmain->screens.first;
- while (sc) {
- ScrArea *area = sc->areabase.first;
+ bScreen *screen = bmain->screens.first;
+ while (screen) {
+ ScrArea *area = screen->areabase.first;
while (area) {
SpaceLink *sl = area->spacedata.first;
while (sl) {
@@ -708,7 +708,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
}
area = area->next;
}
- sc = sc->id.next;
+ screen = screen->id.next;
}
}
@@ -727,9 +727,9 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
}
if (bmain->versionfile <= 171) {
- bScreen *sc = bmain->screens.first;
- while (sc) {
- ScrArea *area = sc->areabase.first;
+ bScreen *screen = bmain->screens.first;
+ while (screen) {
+ ScrArea *area = screen->areabase.first;
while (area) {
SpaceLink *sl = area->spacedata.first;
while (sl) {
@@ -741,7 +741,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
}
area = area->next;
}
- sc = sc->id.next;
+ screen = screen->id.next;
}
}
@@ -866,7 +866,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
bSound *sound;
Scene *sce;
Mesh *me;
- bScreen *sc;
+ bScreen *screen;
for (sound = bmain->sounds.first; sound; sound = sound->id.next) {
if (sound->packedfile) {
@@ -889,10 +889,10 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
}
/* some oldfile patch, moved from set_func_space */
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
@@ -907,7 +907,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
if (bmain->versionfile <= 227) {
Scene *sce;
- bScreen *sc;
+ bScreen *screen;
Object *ob;
/* As of now, this insures that the transition from the old Track system
@@ -962,10 +962,10 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
}
/* patch for old wrong max view2d settings, allows zooming out more */
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
@@ -983,7 +983,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
}
if (bmain->versionfile <= 228) {
- bScreen *sc;
+ bScreen *screen;
Object *ob;
/* As of now, this insures that the transition from the old Track system
@@ -1029,10 +1029,10 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
}
/* convert old mainb values for new button panels */
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
@@ -1096,13 +1096,13 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
*/
if (bmain->versionfile <= 230) {
- bScreen *sc;
+ bScreen *screen;
/* new variable blockscale, for panels in any area */
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
@@ -1117,12 +1117,12 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
}
if (bmain->versionfile <= 231) {
- bScreen *sc = bmain->screens.first;
+ bScreen *screen = bmain->screens.first;
/* new bit flags for showing/hiding grid floor and axes */
- while (sc) {
- ScrArea *area = sc->areabase.first;
+ while (screen) {
+ ScrArea *area = screen->areabase.first;
while (area) {
SpaceLink *sl = area->spacedata.first;
while (sl) {
@@ -1140,14 +1140,14 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
}
area = area->next;
}
- sc = sc->id.next;
+ screen = screen->id.next;
}
}
if (bmain->versionfile <= 232) {
Tex *tex = bmain->textures.first;
World *wrld = bmain->worlds.first;
- bScreen *sc;
+ bScreen *screen;
while (tex) {
if ((tex->flag & (TEX_CHECKER_ODD + TEX_CHECKER_EVEN)) == 0) {
@@ -1184,9 +1184,9 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
/* new variable blockscale, for panels in any area, do again because new
* areas didn't initialize it to 0.7 yet
*/
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
/* added: 5x better zoom in for nla */
@@ -1200,11 +1200,11 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
}
if (bmain->versionfile <= 233) {
- bScreen *sc;
+ bScreen *screen;
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_VIEW3D) {
@@ -1217,11 +1217,11 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
}
if (bmain->versionfile <= 234) {
- bScreen *sc;
+ bScreen *screen;
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_TEXT) {
@@ -1651,7 +1651,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
if (bmain->versionfile <= 242) {
Scene *sce;
- bScreen *sc;
+ bScreen *screen;
Object *ob;
Curve *cu;
Material *ma;
@@ -1663,9 +1663,9 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
bNodeTree *ntree;
int a;
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- area = sc->areabase.first;
+ area = screen->areabase.first;
while (area) {
SpaceLink *sl;
@@ -1922,13 +1922,13 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
}
if (bmain->versionfile <= 244) {
- bScreen *sc;
+ bScreen *screen;
if (bmain->versionfile != 244 || bmain->subversionfile < 2) {
/* correct older action editors - incorrect scrolling */
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- area = sc->areabase.first;
+ area = screen->areabase.first;
while (area) {
SpaceLink *sl;
@@ -2540,13 +2540,13 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
}
if (bmain->versionfile < 248 || (bmain->versionfile == 248 && bmain->subversionfile < 3)) {
- bScreen *sc;
+ bScreen *screen;
/* adjust default settings for Animation Editors */
- for (sc = bmain->screens.first; sc; sc = sc->id.next) {
+ for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
- for (area = sc->areabase.first; area; area = area->next) {
+ for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 6851fb67fed..43a27318d75 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -3134,19 +3134,19 @@ static void write_windowmanager(WriteData *wd, wmWindowManager *wm, const void *
}
}
-static void write_screen(WriteData *wd, bScreen *sc, const void *id_address)
+static void write_screen(WriteData *wd, bScreen *screen, const void *id_address)
{
/* Screens are reference counted, only saved if used by a workspace. */
- if (sc->id.us > 0 || wd->use_memfile) {
+ if (screen->id.us > 0 || wd->use_memfile) {
/* write LibData */
/* in 2.50+ files, the file identifier for screens is patched, forward compatibility */
- writestruct_at_address(wd, ID_SCRN, bScreen, 1, id_address, sc);
- write_iddata(wd, &sc->id);
+ writestruct_at_address(wd, ID_SCRN, bScreen, 1, id_address, screen);
+ write_iddata(wd, &screen->id);
- write_previews(wd, sc->preview);
+ write_previews(wd, screen->preview);
/* direct data */
- write_area_map(wd, AREAMAP_FROM_SCREEN(sc));
+ write_area_map(wd, AREAMAP_FROM_SCREEN(screen));
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 16:05:34 +0300