diff options
Diffstat (limited to 'source/blender/blenloader')
5 files changed, 15 insertions, 15 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index e29d3be0e79..7370b17b4b4 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2670,7 +2670,7 @@ static void direct_link_brush(FileData *fd, Brush *brush) static void lib_link_palette(FileData *fd, Main *main) { /* only link ID pointers */ - for (Palette *palette = main->palettes.first; palette; palette = palette->id.next) { + for (Palette *palette = main->palette.first; palette; palette = palette->id.next) { if (palette->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(palette->id.properties, fd); @@ -2689,7 +2689,7 @@ static void direct_link_palette(FileData *fd, Palette *palette) static void lib_link_paint_curve(FileData *fd, Main *main) { /* only link ID pointers */ - for (PaintCurve *pc = main->paintcurves.first; pc; pc = pc->id.next) { + for (PaintCurve *pc = main->paintcurve.first; pc; pc = pc->id.next) { if (pc->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(pc->id.properties, fd); @@ -3168,7 +3168,7 @@ static void direct_link_animdata(FileData *fd, AnimData *adt) static void lib_link_cachefiles(FileData *fd, Main *bmain) { /* only link ID pointers */ - for (CacheFile *cache_file = bmain->cachefiles.first; cache_file; cache_file = cache_file->id.next) { + for (CacheFile *cache_file = bmain->cachefile.first; cache_file; cache_file = cache_file->id.next) { if (cache_file->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(cache_file->id.properties, fd); lib_link_animdata(fd, &cache_file->id, cache_file->adt); @@ -3197,7 +3197,7 @@ static void direct_link_cachefile(FileData *fd, CacheFile *cache_file) static void lib_link_workspaces(FileData *fd, Main *bmain) { - for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) { + for (WorkSpace *workspace = bmain->workspace.first; workspace; workspace = workspace->id.next) { ListBase *layouts = BKE_workspace_layouts_get(workspace); ID *id = (ID *)workspace; @@ -5142,7 +5142,7 @@ static void direct_link_mesh(FileData *fd, Mesh *mesh) static void lib_link_latt(FileData *fd, Main *main) { - for (Lattice *lt = main->latt.first; lt; lt = lt->id.next) { + for (Lattice *lt = main->lattice.first; lt; lt = lt->id.next) { if (lt->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(lt->id.properties, fd); lib_link_animdata(fd, <->id, lt->adt); @@ -8057,7 +8057,7 @@ void blo_lib_link_restore(Main *oldmain, Main *newmain, wmWindowManager *curwm, { struct IDNameLib_Map *id_map = BKE_main_idmap_create(newmain, true, oldmain); - for (WorkSpace *workspace = newmain->workspaces.first; workspace; workspace = workspace->id.next) { + for (WorkSpace *workspace = newmain->workspace.first; workspace; workspace = workspace->id.next) { ListBase *layouts = BKE_workspace_layouts_get(workspace); for (WorkSpaceLayout *layout = layouts->first; layout; layout = layout->next) { diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index d0e7e612225..6b75203cd31 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -957,7 +957,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) } } - for (lt = bmain->latt.first; lt; lt = lt->id.next) { + for (lt = bmain->lattice.first; lt; lt = lt->id.next) { if ((key = blo_do_versions_newlibadr(fd, lib, lt->key)) && key->refkey) { data = key->refkey->data; tot = MIN2(lt->pntsu * lt->pntsv * lt->pntsw, key->refkey->totelem); diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 405e21c3185..f77d3207661 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -123,7 +123,7 @@ static void do_version_workspaces_create_from_screens(Main *bmain) /* fullscreen with "Back to Previous" option, don't create * a new workspace, add layout workspace containing parent */ workspace = BLI_findstring( - &bmain->workspaces, screen_parent->id.name + 2, offsetof(ID, name) + 2); + &bmain->workspace, screen_parent->id.name + 2, offsetof(ID, name) + 2); } else { workspace = BKE_workspace_add(bmain, screen->id.name + 2); @@ -176,7 +176,7 @@ static void do_version_area_change_space_to_space_action(ScrArea *area, const Sc */ static void do_version_workspaces_after_lib_link(Main *bmain) { - BLI_assert(BLI_listbase_is_empty(&bmain->workspaces)); + BLI_assert(BLI_listbase_is_empty(&bmain->workspace)); do_version_workspaces_create_from_screens(bmain); @@ -194,7 +194,7 @@ static void do_version_workspaces_after_lib_link(Main *bmain) continue; } - WorkSpace *workspace = BLI_findstring(&bmain->workspaces, screen->id.name + 2, offsetof(ID, name) + 2); + WorkSpace *workspace = BLI_findstring(&bmain->workspace, screen->id.name + 2, offsetof(ID, name) + 2); BLI_assert(workspace != NULL); ListBase *layouts = BKE_workspace_layouts_get(workspace); diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index 83efde4640f..35b826c4bde 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -192,7 +192,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template) { /* Default only has one window. */ wmWindow *win = ((wmWindowManager *)bmain->wm.first)->windows.first; - for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) { + for (WorkSpace *workspace = bmain->workspace.first; workspace; workspace = workspace->id.next) { WorkSpaceLayout *layout = BKE_workspace_hook_layout_for_workspace_get(win->workspace_hook, workspace); bScreen *screen = layout->screen; BLI_strncpy(screen->id.name + 2, workspace->id.name + 2, sizeof(screen->id.name) - 2); @@ -218,7 +218,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template) /* For 2D animation template. */ if (app_template && STREQ(app_template, "2D_Animation")) { - for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) { + for (WorkSpace *workspace = bmain->workspace.first; workspace; workspace = workspace->id.next) { const char *name = workspace->id.name + 2; if (STREQ(name, "Drawing")) { @@ -271,7 +271,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template) if (builtin_template) { /* Clear all tools to use default options instead, ignore the tool saved in the file. */ - for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) { + for (WorkSpace *workspace = bmain->workspace.first; workspace; workspace = workspace->id.next) { while (!BLI_listbase_is_empty(&workspace->tools)) { BKE_workspace_tool_remove(workspace, workspace->tools.first); } diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index 1b4e22b8cf0..1899775a6d7 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -1379,7 +1379,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) sce = sce->id.next; } - for (lt = bmain->latt.first; lt; lt = lt->id.next) { + for (lt = bmain->lattice.first; lt; lt = lt->id.next) { if (lt->fu == 0.0f && lt->fv == 0.0f && lt->fw == 0.0f) { calc_lat_fudu(lt->flag, lt->pntsu, <->fu, <->du); calc_lat_fudu(lt->flag, lt->pntsv, <->fv, <->dv); @@ -2402,7 +2402,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) idproperties_fix_group_lengths(bmain->mat); idproperties_fix_group_lengths(bmain->tex); idproperties_fix_group_lengths(bmain->image); - idproperties_fix_group_lengths(bmain->latt); + idproperties_fix_group_lengths(bmain->lattice); idproperties_fix_group_lengths(bmain->light); idproperties_fix_group_lengths(bmain->camera); idproperties_fix_group_lengths(bmain->ipo); |