diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-08 01:29:17 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-08 01:50:00 +0300 |
commit | 8f817de0cbef41dac81e6c7665ada509c3fe2988 (patch) | |
tree | 0802c3287116ce0bf600adc4bed8cba31cfc97b1 /source/blender/blenloader | |
parent | e68ac2827dd4f8ad346011a8a408b342e2718707 (diff) |
Cleanup: use plural names for Main lists
Convention was not to but after discussion on 918941483f7e we agree its
best to change the convention.
Names now mostly follow RNA.
Some exceptions:
- Use 'nodetrees' instead of 'nodegroups'
since the struct is called NodeTree.
- Use 'gpencils' instead of 'grease_pencil'
since 'gpencil' is a common abbreviation in the C code.
Other exceptions:
- Leave 'wm' as it's a list of one.
- Leave 'ipo' as is for versioning.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readblenentry.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 152 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_250.c | 172 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_260.c | 208 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_270.c | 166 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 282 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_defaults.c | 24 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_legacy.c | 264 | ||||
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 2 |
9 files changed, 636 insertions, 636 deletions
diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c index 9f9571d250c..7fcacd8f30e 100644 --- a/source/blender/blenloader/intern/readblenentry.c +++ b/source/blender/blenloader/intern/readblenentry.c @@ -439,7 +439,7 @@ BlendFileData *BLO_read_from_memfile( } /* In any case, we need to move all lib datablocks themselves - those are 'first level data', * getting rid of them would imply updating spaces & co to prevent invalid pointers access. */ - BLI_movelisttolist(&newmain->library, &oldmain->library); + BLI_movelisttolist(&newmain->libraries, &oldmain->libraries); blo_join_main(&new_mainlist); } diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index de997e7002d..e5d4da8db10 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -547,15 +547,15 @@ void blo_split_main(ListBase *mainlist, Main *main) mainlist->first = mainlist->last = main; main->next = NULL; - if (BLI_listbase_is_empty(&main->library)) + if (BLI_listbase_is_empty(&main->libraries)) return; /* (Library.temp_index -> Main), lookup table */ - const uint lib_main_array_len = BLI_listbase_count(&main->library); + const uint lib_main_array_len = BLI_listbase_count(&main->libraries); Main **lib_main_array = MEM_malloc_arrayN(lib_main_array_len, sizeof(*lib_main_array), __func__); int i = 0; - for (Library *lib = main->library.first; lib; lib = lib->id.next, i++) { + for (Library *lib = main->libraries.first; lib; lib = lib->id.next, i++) { Main *libmain = BKE_main_new(); libmain->curlib = lib; libmain->versionfile = lib->versionfile; @@ -1792,7 +1792,7 @@ static void change_link_placeholder_to_real_ID_pointer(ListBase *mainlist, FileD */ void blo_clear_proxy_pointers_from_lib(Main *oldmain) { - Object *ob = oldmain->object.first; + Object *ob = oldmain->objects.first; for (; ob; ob = ob->id.next) { if (ob->id.lib != NULL && ob->proxy_from != NULL && ob->proxy_from->id.lib == NULL) { @@ -1803,7 +1803,7 @@ void blo_clear_proxy_pointers_from_lib(Main *oldmain) void blo_make_scene_pointer_map(FileData *fd, Main *oldmain) { - Scene *sce = oldmain->scene.first; + Scene *sce = oldmain->scenes.first; fd->scenemap = oldnewmap_new(); @@ -1818,7 +1818,7 @@ void blo_make_scene_pointer_map(FileData *fd, Main *oldmain) void blo_end_scene_pointer_map(FileData *fd, Main *oldmain) { OldNew *entry = fd->scenemap->entries; - Scene *sce = oldmain->scene.first; + Scene *sce = oldmain->scenes.first; int i; /* used entries were restored, so we put them to zero */ @@ -1834,8 +1834,8 @@ void blo_end_scene_pointer_map(FileData *fd, Main *oldmain) void blo_make_image_pointer_map(FileData *fd, Main *oldmain) { - Image *ima = oldmain->image.first; - Scene *sce = oldmain->scene.first; + Image *ima = oldmain->images.first; + Scene *sce = oldmain->scenes.first; int a; fd->imamap = oldnewmap_new(); @@ -1874,8 +1874,8 @@ void blo_make_image_pointer_map(FileData *fd, Main *oldmain) void blo_end_image_pointer_map(FileData *fd, Main *oldmain) { OldNew *entry = fd->imamap->entries; - Image *ima = oldmain->image.first; - Scene *sce = oldmain->scene.first; + Image *ima = oldmain->images.first; + Scene *sce = oldmain->scenes.first; int i; /* used entries were restored, so we put them to zero */ @@ -1925,8 +1925,8 @@ void blo_end_image_pointer_map(FileData *fd, Main *oldmain) void blo_make_movieclip_pointer_map(FileData *fd, Main *oldmain) { - MovieClip *clip = oldmain->movieclip.first; - Scene *sce = oldmain->scene.first; + MovieClip *clip = oldmain->movieclips.first; + Scene *sce = oldmain->scenes.first; fd->movieclipmap = oldnewmap_new(); @@ -1953,8 +1953,8 @@ void blo_make_movieclip_pointer_map(FileData *fd, Main *oldmain) void blo_end_movieclip_pointer_map(FileData *fd, Main *oldmain) { OldNew *entry = fd->movieclipmap->entries; - MovieClip *clip = oldmain->movieclip.first; - Scene *sce = oldmain->scene.first; + MovieClip *clip = oldmain->movieclips.first; + Scene *sce = oldmain->scenes.first; int i; /* used entries were restored, so we put them to zero */ @@ -1980,7 +1980,7 @@ void blo_end_movieclip_pointer_map(FileData *fd, Main *oldmain) void blo_make_sound_pointer_map(FileData *fd, Main *oldmain) { - bSound *sound = oldmain->sound.first; + bSound *sound = oldmain->sounds.first; fd->soundmap = oldnewmap_new(); @@ -1995,7 +1995,7 @@ void blo_make_sound_pointer_map(FileData *fd, Main *oldmain) void blo_end_sound_pointer_map(FileData *fd, Main *oldmain) { OldNew *entry = fd->soundmap->entries; - bSound *sound = oldmain->sound.first; + bSound *sound = oldmain->sounds.first; int i; /* used entries were restored, so we put them to zero */ @@ -2026,7 +2026,7 @@ void blo_make_packed_pointer_map(FileData *fd, Main *oldmain) fd->packedmap = oldnewmap_new(); - for (ima = oldmain->image.first; ima; ima = ima->id.next) { + for (ima = oldmain->images.first; ima; ima = ima->id.next) { ImagePackedFile *imapf; if (ima->packedfile) @@ -2037,15 +2037,15 @@ void blo_make_packed_pointer_map(FileData *fd, Main *oldmain) insert_packedmap(fd, imapf->packedfile); } - for (vfont = oldmain->vfont.first; vfont; vfont = vfont->id.next) + for (vfont = oldmain->fonts.first; vfont; vfont = vfont->id.next) if (vfont->packedfile) insert_packedmap(fd, vfont->packedfile); - for (sound = oldmain->sound.first; sound; sound = sound->id.next) + for (sound = oldmain->sounds.first; sound; sound = sound->id.next) if (sound->packedfile) insert_packedmap(fd, sound->packedfile); - for (lib = oldmain->library.first; lib; lib = lib->id.next) + for (lib = oldmain->libraries.first; lib; lib = lib->id.next) if (lib->packedfile) insert_packedmap(fd, lib->packedfile); @@ -2068,7 +2068,7 @@ void blo_end_packed_pointer_map(FileData *fd, Main *oldmain) entry->newp = NULL; } - for (ima = oldmain->image.first; ima; ima = ima->id.next) { + for (ima = oldmain->images.first; ima; ima = ima->id.next) { ImagePackedFile *imapf; ima->packedfile = newpackedadr(fd, ima->packedfile); @@ -2077,13 +2077,13 @@ void blo_end_packed_pointer_map(FileData *fd, Main *oldmain) imapf->packedfile = newpackedadr(fd, imapf->packedfile); } - for (vfont = oldmain->vfont.first; vfont; vfont = vfont->id.next) + for (vfont = oldmain->fonts.first; vfont; vfont = vfont->id.next) vfont->packedfile = newpackedadr(fd, vfont->packedfile); - for (sound = oldmain->sound.first; sound; sound = sound->id.next) + for (sound = oldmain->sounds.first; sound; sound = sound->id.next) sound->packedfile = newpackedadr(fd, sound->packedfile); - for (lib = oldmain->library.first; lib; lib = lib->id.next) + for (lib = oldmain->libraries.first; lib; lib = lib->id.next) lib->packedfile = newpackedadr(fd, lib->packedfile); } @@ -2605,7 +2605,7 @@ static void direct_link_curvemapping(FileData *fd, CurveMapping *cumap) static void lib_link_brush(FileData *fd, Main *main) { /* only link ID pointers */ - for (Brush *brush = main->brush.first; brush; brush = brush->id.next) { + for (Brush *brush = main->brushes.first; brush; brush = brush->id.next) { if (brush->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(brush->id.properties, fd); @@ -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->palette.first; palette; palette = palette->id.next) { + for (Palette *palette = main->palettes.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->paintcurve.first; pc; pc = pc->id.next) { + for (PaintCurve *pc = main->paintcurves.first; pc; pc = pc->id.next) { if (pc->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(pc->id.properties, fd); @@ -2956,7 +2956,7 @@ static void direct_link_fcurves(FileData *fd, ListBase *list) static void lib_link_action(FileData *fd, Main *main) { - for (bAction *act = main->action.first; act; act = act->id.next) { + for (bAction *act = main->actions.first; act; act = act->id.next) { if (act->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(act->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->cachefile.first; cache_file; cache_file = cache_file->id.next) { + for (CacheFile *cache_file = bmain->cachefiles.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->workspace.first; workspace; workspace = workspace->id.next) { + for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) { ListBase *layouts = BKE_workspace_layouts_get(workspace); ID *id = (ID *)workspace; @@ -3311,7 +3311,7 @@ static void lib_link_ntree(FileData *fd, ID *id, bNodeTree *ntree) static void lib_link_nodetree(FileData *fd, Main *main) { /* only link ID pointers */ - for (bNodeTree *ntree = main->nodetree.first; ntree; ntree = ntree->id.next) { + for (bNodeTree *ntree = main->nodetrees.first; ntree; ntree = ntree->id.next) { if (ntree->id.tag & LIB_TAG_NEED_LINK) { lib_link_ntree(fd, &ntree->id, ntree); @@ -3388,7 +3388,7 @@ static void lib_verify_nodetree(Main *main, int UNUSED(open)) * we have set the NTREE_DO_VERSIONS_GROUP_EXPOSE_2_56_2 flag, so at this point we can do the * actual group node updates. */ - for (bNodeTree *ntree = main->nodetree.first; ntree; ntree = ntree->id.next) { + for (bNodeTree *ntree = main->nodetrees.first; ntree; ntree = ntree->id.next) { if (ntree->flag & NTREE_DO_VERSIONS_GROUP_EXPOSE_2_56_2) { has_old_groups = 1; } @@ -3408,7 +3408,7 @@ static void lib_verify_nodetree(Main *main, int UNUSED(open)) } FOREACH_NODETREE_END; } - for (bNodeTree *ntree = main->nodetree.first; ntree; ntree = ntree->id.next) { + for (bNodeTree *ntree = main->nodetrees.first; ntree; ntree = ntree->id.next) { ntree->flag &= ~NTREE_DO_VERSIONS_GROUP_EXPOSE_2_56_2; } } @@ -3516,7 +3516,7 @@ static void lib_verify_nodetree(Main *main, int UNUSED(open)) } /* verify all group user nodes */ - for (bNodeTree *ntree = main->nodetree.first; ntree; ntree = ntree->id.next) { + for (bNodeTree *ntree = main->nodetrees.first; ntree; ntree = ntree->id.next) { ntreeVerifyNodes(main, &ntree->id); } @@ -3876,7 +3876,7 @@ static void lib_link_bones(FileData *fd, Bone *bone) static void lib_link_armature(FileData *fd, Main *main) { - for (bArmature *arm = main->armature.first; arm; arm = arm->id.next) { + for (bArmature *arm = main->armatures.first; arm; arm = arm->id.next) { if (arm->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(arm->id.properties, fd); lib_link_animdata(fd, &arm->id, arm->adt); @@ -3935,7 +3935,7 @@ static void direct_link_armature(FileData *fd, bArmature *arm) static void lib_link_camera(FileData *fd, Main *main) { - for (Camera *ca = main->camera.first; ca; ca = ca->id.next) { + for (Camera *ca = main->cameras.first; ca; ca = ca->id.next) { if (ca->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(ca->id.properties, fd); lib_link_animdata(fd, &ca->id, ca->adt); @@ -3975,7 +3975,7 @@ static void direct_link_camera(FileData *fd, Camera *ca) static void lib_link_light(FileData *fd, Main *main) { - for (Light *la = main->light.first; la; la = la->id.next) { + for (Light *la = main->lights.first; la; la = la->id.next) { if (la->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(la->id.properties, fd); lib_link_animdata(fd, &la->id, la->adt); @@ -4028,7 +4028,7 @@ void blo_do_versions_key_uidgen(Key *key) static void lib_link_key(FileData *fd, Main *main) { - for (Key *key = main->key.first; key; key = key->id.next) { + for (Key *key = main->shapekeys.first; key; key = key->id.next) { BLI_assert((key->id.tag & LIB_TAG_EXTERN) == 0); if (key->id.tag & LIB_TAG_NEED_LINK) { @@ -4099,7 +4099,7 @@ static void direct_link_key(FileData *fd, Key *key) static void lib_link_mball(FileData *fd, Main *main) { - for (MetaBall *mb = main->mball.first; mb; mb = mb->id.next) { + for (MetaBall *mb = main->metaballs.first; mb; mb = mb->id.next) { if (mb->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(mb->id.properties, fd); lib_link_animdata(fd, &mb->id, mb->adt); @@ -4140,7 +4140,7 @@ static void direct_link_mball(FileData *fd, MetaBall *mb) static void lib_link_world(FileData *fd, Main *main) { - for (World *wrld = main->world.first; wrld; wrld = wrld->id.next) { + for (World *wrld = main->worlds.first; wrld; wrld = wrld->id.next) { if (wrld->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(wrld->id.properties, fd); lib_link_animdata(fd, &wrld->id, wrld->adt); @@ -4183,7 +4183,7 @@ static void direct_link_world(FileData *fd, World *wrld) static void lib_link_vfont(FileData *fd, Main *main) { - for (VFont *vf = main->vfont.first; vf; vf = vf->id.next) { + for (VFont *vf = main->fonts.first; vf; vf = vf->id.next) { if (vf->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(vf->id.properties, fd); @@ -4207,7 +4207,7 @@ static void direct_link_vfont(FileData *fd, VFont *vf) static void lib_link_text(FileData *fd, Main *main) { - for (Text *text = main->text.first; text; text = text->id.next) { + for (Text *text = main->texts.first; text; text = text->id.next) { if (text->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(text->id.properties, fd); @@ -4259,7 +4259,7 @@ static void direct_link_text(FileData *fd, Text *text) static void lib_link_image(FileData *fd, Main *main) { - for (Image *ima = main->image.first; ima; ima = ima->id.next) { + for (Image *ima = main->images.first; ima; ima = ima->id.next) { if (ima->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(ima->id.properties, fd); @@ -4334,7 +4334,7 @@ static void direct_link_image(FileData *fd, Image *ima) static void lib_link_curve(FileData *fd, Main *main) { - for (Curve *cu = main->curve.first; cu; cu = cu->id.next) { + for (Curve *cu = main->curves.first; cu; cu = cu->id.next) { if (cu->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(cu->id.properties, fd); lib_link_animdata(fd, &cu->id, cu->adt); @@ -4434,7 +4434,7 @@ static void direct_link_curve(FileData *fd, Curve *cu) static void lib_link_texture(FileData *fd, Main *main) { - for (Tex *tex = main->tex.first; tex; tex = tex->id.next) { + for (Tex *tex = main->textures.first; tex; tex = tex->id.next) { if (tex->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(tex->id.properties, fd); lib_link_animdata(fd, &tex->id, tex->adt); @@ -4479,7 +4479,7 @@ static void direct_link_texture(FileData *fd, Tex *tex) static void lib_link_material(FileData *fd, Main *main) { - for (Material *ma = main->mat.first; ma; ma = ma->id.next) { + for (Material *ma = main->materials.first; ma; ma = ma->id.next) { if (ma->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(ma->id.properties, fd); lib_link_animdata(fd, &ma->id, ma->adt); @@ -4620,7 +4620,7 @@ static void lib_link_partdeflect(FileData *fd, ID *id, PartDeflect *pd) static void lib_link_particlesettings(FileData *fd, Main *main) { - for (ParticleSettings *part = main->particle.first; part; part = part->id.next) { + for (ParticleSettings *part = main->particles.first; part; part = part->id.next) { if (part->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(part->id.properties, fd); lib_link_animdata(fd, &part->id, part->adt); @@ -4875,7 +4875,7 @@ static void lib_link_mesh(FileData *fd, Main *main) { Mesh *me; - for (me = main->mesh.first; me; me = me->id.next) { + for (me = main->meshes.first; me; me = me->id.next) { if (me->id.tag & LIB_TAG_NEED_LINK) { int i; @@ -4900,7 +4900,7 @@ static void lib_link_mesh(FileData *fd, Main *main) } } - for (me = main->mesh.first; me; me = me->id.next) { + for (me = main->meshes.first; me; me = me->id.next) { if (me->id.tag & LIB_TAG_NEED_LINK) { /*check if we need to convert mfaces to mpolys*/ if (me->totface && !me->totpoly) { @@ -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->lattice.first; lt; lt = lt->id.next) { + for (Lattice *lt = main->lattices.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); @@ -5227,7 +5227,7 @@ static void lib_link_object(FileData *fd, Main *main) { bool warn = false; - for (Object *ob = main->object.first; ob; ob = ob->id.next) { + for (Object *ob = main->objects.first; ob; ob = ob->id.next) { if (ob->id.tag & LIB_TAG_NEED_LINK) { int a; @@ -6237,7 +6237,7 @@ static void lib_link_collection_data(FileData *fd, Library *lib, Collection *col static void lib_link_collection(FileData *fd, Main *main) { - for (Collection *collection = main->collection.first; collection; collection = collection->id.next) { + for (Collection *collection = main->collections.first; collection; collection = collection->id.next) { if (collection->id.tag & LIB_TAG_NEED_LINK) { collection->id.tag &= ~LIB_TAG_NEED_LINK; IDP_LibLinkProperty(collection->id.properties, fd); @@ -6372,7 +6372,7 @@ static void lib_link_scene(FileData *fd, Main *main) int totscene = 0; #endif - for (Scene *sce = main->scene.first; sce; sce = sce->id.next) { + for (Scene *sce = main->scenes.first; sce; sce = sce->id.next) { if (sce->id.tag & LIB_TAG_NEED_LINK) { /* Link ID Properties -- and copy this comment EXACTLY for easy finding * of library blocks that implement this.*/ @@ -6552,7 +6552,7 @@ static void lib_link_scene(FileData *fd, Main *main) #ifdef USE_SETSCENE_CHECK if (need_check_set) { - for (Scene *sce = main->scene.first; sce; sce = sce->id.next) { + for (Scene *sce = main->scenes.first; sce; sce = sce->id.next) { if (sce->id.tag & LIB_TAG_NEED_LINK) { sce->id.tag &= ~LIB_TAG_NEED_LINK; if (!scene_validate_setscene__liblink(sce, totscene)) { @@ -6937,7 +6937,7 @@ static void direct_link_scene(FileData *fd, Scene *sce) static void lib_link_gpencil(FileData *fd, Main *main) { /* Relink all datablock linked by GP datablock */ - for (bGPdata *gpd = main->gpencil.first; gpd; gpd = gpd->id.next) { + for (bGPdata *gpd = main->gpencils.first; gpd; gpd = gpd->id.next) { if (gpd->id.tag & LIB_TAG_NEED_LINK) { /* Layers */ for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) { @@ -7678,7 +7678,7 @@ static void lib_link_windowmanager(FileData *fd, Main *main) * check lib pointers in call below */ static void lib_link_screen(FileData *fd, Main *main) { - for (bScreen *sc = main->screen.first; sc; sc = sc->id.next) { + for (bScreen *sc = main->screens.first; sc; sc = sc->id.next) { if (sc->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(sc->id.properties, fd); @@ -7963,7 +7963,7 @@ static void lib_link_workspace_layout_restore(struct IDNameLib_Map *id_map, Main SpaceText *st = (SpaceText *)sl; st->text = restore_pointer_by_name(id_map, (ID *)st->text, USER_REAL); - if (st->text == NULL) st->text = newmain->text.first; + if (st->text == NULL) st->text = newmain->texts.first; } else if (sl->spacetype == SPACE_SCRIPT) { SpaceScript *scpt = (SpaceScript *)sl; @@ -8062,7 +8062,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->workspace.first; workspace; workspace = workspace->id.next) { + for (WorkSpace *workspace = newmain->workspaces.first; workspace; workspace = workspace->id.next) { ListBase *layouts = BKE_workspace_layouts_get(workspace); for (WorkSpaceLayout *layout = layouts->first; layout; layout = layout->next) { @@ -8164,7 +8164,7 @@ static void direct_link_library(FileData *fd, Library *lib, Main *main) change_link_placeholder_to_real_ID_pointer(fd->mainlist, fd, lib, newmain->curlib); /* change_link_placeholder_to_real_ID_pointer_fd(fd, lib, newmain->curlib); */ - BLI_remlink(&main->library, lib); + BLI_remlink(&main->libraries, lib); MEM_freeN(lib); /* Now, since Blender always expect **latest** Main pointer from fd->mainlist to be the active library @@ -8200,7 +8200,7 @@ static void direct_link_library(FileData *fd, Library *lib, Main *main) static void lib_link_library(FileData *UNUSED(fd), Main *main) { Library *lib; - for (lib = main->library.first; lib; lib = lib->id.next) { + for (lib = main->libraries.first; lib; lib = lib->id.next) { id_us_ensure_real(&lib->id); } } @@ -8211,7 +8211,7 @@ static void fix_relpaths_library(const char *basepath, Main *main) Library *lib; /* BLO_read_from_memory uses a blank filename */ if (basepath == NULL || basepath[0] == '\0') { - for (lib = main->library.first; lib; lib = lib->id.next) { + for (lib = main->libraries.first; lib; lib = lib->id.next) { /* when loading a linked lib into a file which has not been saved, * there is nothing we can be relative to, so instead we need to make * it absolute. This can happen when appending an object with a relative @@ -8223,7 +8223,7 @@ static void fix_relpaths_library(const char *basepath, Main *main) } } else { - for (lib = main->library.first; lib; lib = lib->id.next) { + for (lib = main->libraries.first; lib; lib = lib->id.next) { /* Libraries store both relative and abs paths, recreate relative paths, * relative to the blend file since indirectly linked libs will be relative to their direct linked library */ if (BLI_path_is_rel(lib->name)) { /* if this is relative to begin with? */ @@ -8242,7 +8242,7 @@ static void fix_relpaths_library(const char *basepath, Main *main) static void lib_link_lightprobe(FileData *fd, Main *main) { - for (LightProbe *prb = main->lightprobe.first; prb; prb = prb->id.next) { + for (LightProbe *prb = main->lightprobes.first; prb; prb = prb->id.next) { if (prb->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(prb->id.properties, fd); lib_link_animdata(fd, &prb->id, prb->adt); @@ -8268,7 +8268,7 @@ static void direct_link_lightprobe(FileData *fd, LightProbe *prb) static void lib_link_speaker(FileData *fd, Main *main) { - for (Speaker *spk = main->speaker.first; spk; spk = spk->id.next) { + for (Speaker *spk = main->speakers.first; spk; spk = spk->id.next) { if (spk->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(spk->id.properties, fd); lib_link_animdata(fd, &spk->id, spk->adt); @@ -8330,7 +8330,7 @@ static void direct_link_sound(FileData *fd, bSound *sound) static void lib_link_sound(FileData *fd, Main *main) { - for (bSound *sound = main->sound.first; sound; sound = sound->id.next) { + for (bSound *sound = main->sounds.first; sound; sound = sound->id.next) { if (sound->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(sound->id.properties, fd); @@ -8447,7 +8447,7 @@ static void lib_link_moviePlaneTracks(FileData *fd, MovieClip *clip, ListBase *t static void lib_link_movieclip(FileData *fd, Main *main) { - for (MovieClip *clip = main->movieclip.first; clip; clip = clip->id.next) { + for (MovieClip *clip = main->movieclips.first; clip; clip = clip->id.next) { if (clip->id.tag & LIB_TAG_NEED_LINK) { MovieTracking *tracking = &clip->tracking; @@ -8541,7 +8541,7 @@ static void lib_link_mask_parent(FileData *fd, Mask *mask, MaskParent *parent) static void lib_link_mask(FileData *fd, Main *main) { - for (Mask *mask = main->mask.first; mask; mask = mask->id.next) { + for (Mask *mask = main->masks.first; mask; mask = mask->id.next) { if (mask->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(mask->id.properties, fd); lib_link_animdata(fd, &mask->id, mask->adt); @@ -8580,7 +8580,7 @@ static void lib_link_mask(FileData *fd, Main *main) static void lib_link_linestyle(FileData *fd, Main *main) { - for (FreestyleLineStyle *linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next) { + for (FreestyleLineStyle *linestyle = main->linestyles.first; linestyle; linestyle = linestyle->id.next) { if (linestyle->id.tag & LIB_TAG_NEED_LINK) { LineStyleModifier *m; @@ -8949,9 +8949,9 @@ static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, const int ta * a missing ID_LINK_PLACEHOLDER, we need to get the correct lib it is linked to! * Order is crucial, we cannot bulk-add it in BLO_read_from_memfile() like it used to be... */ BLI_remlink(fd->old_mainlist, libmain); - BLI_remlink_safe(&oldmain->library, libmain->curlib); + BLI_remlink_safe(&oldmain->libraries, libmain->curlib); BLI_addtail(fd->mainlist, libmain); - BLI_addtail(&main->library, libmain->curlib); + BLI_addtail(&main->libraries, libmain->curlib); if (r_id) { *r_id = NULL; /* Just in case... */ @@ -10787,7 +10787,7 @@ static bool object_in_any_scene(Main *bmain, Object *ob) { Scene *sce; - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { if (BKE_scene_object_find(sce, ob)) { return true; } @@ -10806,7 +10806,7 @@ static void add_loose_objects_to_scene( BLI_assert(scene); /* Give all objects which are LIB_TAG_INDIRECT a base, or for a collection when *lib has been set. */ - for (Object *ob = mainvar->object.first; ob; ob = ob->id.next) { + for (Object *ob = mainvar->objects.first; ob; ob = ob->id.next) { bool do_it = (ob->id.tag & LIB_TAG_DOIT) != 0; if (do_it || ((ob->id.tag & LIB_TAG_INDIRECT) && (ob->id.tag & LIB_TAG_PRE_EXISTING) == 0)) { if (!is_link) { @@ -10870,7 +10870,7 @@ static void add_collections_to_scene( } /* Give all objects which are tagged a base. */ - for (Collection *collection = mainvar->collection.first; collection; collection = collection->id.next) { + for (Collection *collection = mainvar->collections.first; collection; collection = collection->id.next) { if ((flag & FILE_GROUP_INSTANCE) && (collection->id.tag & LIB_TAG_DOIT)) { /* Any indirect collection should not have been tagged. */ BLI_assert((collection->id.tag & LIB_TAG_INDIRECT) == 0); @@ -11100,7 +11100,7 @@ static Main *library_link_begin(Main *mainvar, FileData **fd, const char *filepa (*fd)->mainlist = MEM_callocN(sizeof(ListBase), "FileData.mainlist"); /* clear for collection instantiating tag */ - BKE_main_id_tag_listbase(&(mainvar->collection), LIB_TAG_DOIT, false); + BKE_main_id_tag_listbase(&(mainvar->collections), LIB_TAG_DOIT, false); /* make mains */ blo_split_main((*fd)->mainlist, mainvar); @@ -11227,8 +11227,8 @@ static void library_link_end( } /* Clear objects and collections instantiating tag. */ - BKE_main_id_tag_listbase(&(mainvar->object), LIB_TAG_DOIT, false); - BKE_main_id_tag_listbase(&(mainvar->collection), LIB_TAG_DOIT, false); + BKE_main_id_tag_listbase(&(mainvar->objects), LIB_TAG_DOIT, false); + BKE_main_id_tag_listbase(&(mainvar->collections), LIB_TAG_DOIT, false); /* patch to prevent switch_endian happens twice */ if ((*fd)->flags & FD_FLAGS_SWITCH_ENDIAN) { diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index 5d7f37db0d1..d8bd0e8d5b9 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -459,21 +459,21 @@ static void do_versions_gpencil_2_50(Main *main, bScreen *screen) if (sl->spacetype == SPACE_VIEW3D) { View3D *v3d = (View3D *)sl; if (v3d->gpd) { - versions_gpencil_add_main(&main->gpencil, (ID *)v3d->gpd, "GPencil View3D"); + versions_gpencil_add_main(&main->gpencils, (ID *)v3d->gpd, "GPencil View3D"); v3d->gpd = NULL; } } else if (sl->spacetype == SPACE_NODE) { SpaceNode *snode = (SpaceNode *)sl; if (snode->gpd) { - versions_gpencil_add_main(&main->gpencil, (ID *)snode->gpd, "GPencil Node"); + versions_gpencil_add_main(&main->gpencils, (ID *)snode->gpd, "GPencil Node"); snode->gpd = NULL; } } else if (sl->spacetype == SPACE_SEQ) { SpaceSeq *sseq = (SpaceSeq *)sl; if (sseq->gpd) { - versions_gpencil_add_main(&main->gpencil, (ID *)sseq->gpd, "GPencil Node"); + versions_gpencil_add_main(&main->gpencils, (ID *)sseq->gpd, "GPencil Node"); sseq->gpd = NULL; } } @@ -498,7 +498,7 @@ static void do_version_mdef_250(Main *main) ModifierData *md; MeshDeformModifierData *mmd; - for (ob = main->object.first; ob; ob = ob->id.next) { + for (ob = main->objects.first; ob; ob = ob->id.next) { for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_MeshDeform) { mmd = (MeshDeformModifierData *)md; @@ -641,14 +641,14 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) bSound *sound; Sequence *seq; - for (sound = bmain->sound.first; sound; sound = sound->id.next) { + for (sound = bmain->sounds.first; sound; sound = sound->id.next) { if (sound->newpackedfile) { sound->packedfile = sound->newpackedfile; sound->newpackedfile = NULL; } } - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { if (scene->ed && scene->ed->seqbasep) { SEQ_BEGIN(scene->ed, seq) { @@ -672,7 +672,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) } } - for (screen = bmain->screen.first; screen; screen = screen->id.next) { + for (screen = bmain->screens.first; screen; screen = screen->id.next) { do_versions_windowmanager_2_50(screen); do_versions_gpencil_2_50(bmain, screen); } @@ -680,13 +680,13 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) /* shader, composite and texture node trees have id.name empty, put something in * to have them show in RNA viewer and accessible otherwise. */ - for (ma = bmain->mat.first; ma; ma = ma->id.next) { + for (ma = bmain->materials.first; ma; ma = ma->id.next) { if (ma->nodetree && ma->nodetree->id.name[0] == '\0') strcpy(ma->nodetree->id.name, "NTShader Nodetree"); } /* and composite trees */ - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { enum { R_PANORAMA = (1 << 10) }; if (sce->nodetree && sce->nodetree->id.name[0] == '\0') strcpy(sce->nodetree->id.name, "NTCompositing Nodetree"); @@ -707,7 +707,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) } /* and texture trees */ - for (tx = bmain->tex.first; tx; tx = tx->id.next) { + for (tx = bmain->textures.first; tx; tx = tx->id.next) { bNode *node; if (tx->nodetree) { @@ -722,7 +722,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) } /* particle draw and render types */ - for (part = bmain->particle.first; part; part = part->id.next) { + for (part = bmain->particles.first; part; part = part->id.next) { if (part->draw_as) { if (part->draw_as == PART_DRAW_DOT) { part->ren_as = PART_DRAW_HALO; @@ -741,7 +741,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) } /* set old pointcaches to have disk cache flag */ - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { //BKE_ptcache_ids_from_object(&pidlist, ob); @@ -752,7 +752,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) } /* type was a mixed flag & enum. move the 2d flag elsewhere */ - for (cu = bmain->curve.first; cu; cu = cu->id.next) { + for (cu = bmain->curves.first; cu; cu = cu->id.next) { Nurb *nu; for (nu = cu->nurb.first; nu; nu = nu->next) { @@ -770,7 +770,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) //PTCacheID *pid; //ListBase pidlist; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { //BKE_ptcache_ids_from_object(&pidlist, ob); //for (pid = pidlist.first; pid; pid = pid->next) { @@ -804,12 +804,12 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) } /* texture filter */ - for (tex = bmain->tex.first; tex; tex = tex->id.next) { + for (tex = bmain->textures.first; tex; tex = tex->id.next) { if (tex->afmax == 0) tex->afmax = 8; } - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { ts = sce->toolsettings; if (!ts->uv_selectmode || ts->vgroup_weight == 0.0f) { ts->selectmode = SCE_SELECT_VERTEX; @@ -830,7 +830,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile < 250 || (bmain->versionfile == 250 && bmain->subversionfile < 2)) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->flag & 8192) // OB_POSEMODE = 8192 ob->mode |= OB_MODE_POSE; } @@ -842,11 +842,11 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) ParticleSettings *part; bool do_gravity = false; - for (sce = bmain->scene.first; sce; sce = sce->id.next) + for (sce = bmain->scenes.first; sce; sce = sce->id.next) if (sce->unit.scale_length == 0.0f) sce->unit.scale_length = 1.0f; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { /* fluid-sim stuff */ FluidsimModifierData *fluidmd = (FluidsimModifierData *)modifiers_findByType(ob, eModifierType_Fluidsim); if (fluidmd) @@ -856,7 +856,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) ob->rotmode = ROT_MODE_EUL; } - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { if (sce->audio.main == 0.0f) sce->audio.main = 1.0f; @@ -868,7 +868,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) } /* Add default gravity to scenes */ - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { if ((sce->physics_settings.flag & PHYS_GLOBAL_GRAVITY) == 0 && is_zero_v3(sce->physics_settings.gravity)) { @@ -881,11 +881,11 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) /* Assign proper global gravity weights for dynamics (only z-coordinate is taken into account) */ if (do_gravity) { - for (part = bmain->particle.first; part; part = part->id.next) + for (part = bmain->particles.first; part; part = part->id.next) part->effector_weights->global_gravity = part->acc[2] / -9.81f; } - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; if (do_gravity) { @@ -918,7 +918,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) Object *ob; /* New variables for axis-angle rotations and/or quaternion rotations were added, and need proper initialization */ - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { /* new variables for all objects */ ob->quat[0] = 1.0f; ob->rotAxis[1] = 1.0f; @@ -947,7 +947,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) /* shape keys are no longer applied to the mesh itself, but rather * to the derivedmesh/displist, so here we ensure that the basis * shape key is always set in the mesh coordinates. */ - for (me = bmain->mesh.first; me; me = me->id.next) { + for (me = bmain->meshes.first; me; me = me->id.next) { if ((key = blo_do_versions_newlibadr(fd, lib, me->key)) && key->refkey) { data = key->refkey->data; tot = MIN2(me->totvert, key->refkey->totelem); @@ -957,7 +957,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) } } - for (lt = bmain->lattice.first; lt; lt = lt->id.next) { + for (lt = bmain->lattices.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); @@ -967,7 +967,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) } } - for (cu = bmain->curve.first; cu; cu = cu->id.next) { + for (cu = bmain->curves.first; cu; cu = cu->id.next) { if ((key = blo_do_versions_newlibadr(fd, lib, cu->key)) && key->refkey) { data = key->refkey->data; @@ -997,7 +997,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile < 250 || (bmain->versionfile == 250 && bmain->subversionfile < 8)) { { - Scene *sce = bmain->scene.first; + Scene *sce = bmain->scenes.first; while (sce) { if (sce->r.frame_step == 0) sce->r.frame_step = 1; @@ -1008,7 +1008,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) { /* ensure all nodes have unique names */ - bNodeTree *ntree = bmain->nodetree.first; + bNodeTree *ntree = bmain->nodetrees.first; while (ntree) { bNode *node = ntree->nodes.first; @@ -1022,7 +1022,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) } { - Object *ob = bmain->object.first; + Object *ob = bmain->objects.first; while (ob) { /* shaded mode disabled for now */ if (ob->dt == OB_MATERIAL) @@ -1036,7 +1036,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) ScrArea *sa; SpaceLink *sl; - for (screen = bmain->screen.first; screen; screen = screen->id.next) { + for (screen = bmain->screens.first; screen; screen = screen->id.next) { for (sa = screen->areabase.first; sa; sa = sa->next) { for (sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -1051,9 +1051,9 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) /* only convert old 2.50 files with color management */ if (bmain->versionfile == 250) { - Scene *sce = bmain->scene.first; - Material *ma = bmain->mat.first; - Tex *tex = bmain->tex.first; + Scene *sce = bmain->scenes.first; + Material *ma = bmain->materials.first; + Tex *tex = bmain->textures.first; int i, convert = 0; /* convert to new color management system: @@ -1094,15 +1094,15 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) Mesh *me; Object *ob; - for (sce = bmain->scene.first; sce; sce = sce->id.next) + for (sce = bmain->scenes.first; sce; sce = sce->id.next) if (!sce->toolsettings->particle.selectmode) sce->toolsettings->particle.selectmode = SCE_SELECT_PATH; if (bmain->versionfile == 250 && bmain->subversionfile > 1) { - for (me = bmain->mesh.first; me; me = me->id.next) + for (me = bmain->meshes.first; me; me = me->id.next) multires_load_old_250(me); - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { MultiresModifierData *mmd = (MultiresModifierData *)modifiers_findByType(ob, eModifierType_Multires); if (mmd) { @@ -1119,7 +1119,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) Object *ob; /* properly initialize hair clothsim data on old files */ - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Cloth) { @@ -1139,7 +1139,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) SpaceLink *sl; /* remove all preview window in wrong spaces */ - for (screen = bmain->screen.first; screen; screen = screen->id.next) { + for (screen = bmain->screens.first; screen; screen = screen->id.next) { for (sa = screen->areabase.first; sa; sa = sa->next) { for (sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype != SPACE_SEQ) { @@ -1176,7 +1176,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) ScrArea *sa; SpaceLink *sl; - for (screen = bmain->screen.first; screen; screen = screen->id.next) { + for (screen = bmain->screens.first; screen; screen = screen->id.next) { for (sa = screen->areabase.first; sa; sa = sa->next) { for (sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_SEQ) { @@ -1217,7 +1217,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) Brush *brush; /* anim viz changes */ - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { /* initialize object defaults */ animviz_settings_init(&ob->avs); @@ -1262,7 +1262,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) } /* brush texture changes */ - for (brush = bmain->brush.first; brush; brush = brush->id.next) { + for (brush = bmain->brushes.first; brush; brush = brush->id.next) { BKE_texture_mtex_default(&brush->mtex); BKE_texture_mtex_default(&brush->mask_mtex); } @@ -1274,7 +1274,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) Object *ob; /* convert degrees to radians for internal use */ - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { bPoseChannel *pchan; do_version_constraints_radians_degrees_250(&ob->constraints); @@ -1300,7 +1300,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) ScrArea *sa; SpaceLink *sl; - for (screen = bmain->screen.first; screen; screen = screen->id.next) { + for (screen = bmain->screens.first; screen; screen = screen->id.next) { for (sa = screen->areabase.first; sa; sa = sa->next) { for (sl = sa->spacedata.first; sl; sl = sl->next) { ListBase *regionbase; @@ -1329,7 +1329,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) Sequence *seq; /* initialize to sane default so toggling on border shows something */ - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { if (sce->r.border.xmin == 0.0f && sce->r.border.ymin == 0.0f && sce->r.border.xmax == 0.0f && sce->r.border.ymax == 0.0f) { @@ -1349,7 +1349,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) } /* particle brush strength factor was changed from int to float */ - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { ParticleEditSettings *pset = &sce->toolsettings->particle; int a; @@ -1363,7 +1363,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) ScrArea *sa; SpaceLink *sl; - for (screen = bmain->screen.first; screen; screen = screen->id.next) { + for (screen = bmain->screens.first; screen; screen = screen->id.next) { for (sa = screen->areabase.first; sa; sa = sa->next) { for (sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_SEQ) { @@ -1399,7 +1399,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) * 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->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { SpaceLink *sl; @@ -1419,13 +1419,13 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) Scene *scene; bNodeTree *ntree; - for (brush = bmain->brush.first; brush; brush = brush->id.next) { + for (brush = bmain->brushes.first; brush; brush = brush->id.next) { if (brush->curve) brush->curve->preset = CURVE_PRESET_SMOOTH; } /* properly initialize active flag for fluidsim modifiers */ - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Fluidsim) { @@ -1437,7 +1437,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) } /* adjustment to color balance node values */ - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { if (scene->nodetree) { bNode *node = scene->nodetree->nodes.first; @@ -1453,7 +1453,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) } } /* check inside node groups too */ - for (ntree = bmain->nodetree.first; ntree; ntree = ntree->id.next) { + for (ntree = bmain->nodetrees.first; ntree; ntree = ntree->id.next) { bNode *node = ntree->nodes.first; while (node) { @@ -1473,7 +1473,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile < 252 || (bmain->versionfile == 252 && bmain->subversionfile < 2)) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) + for (ob = bmain->objects.first; ob; ob = ob->id.next) blo_do_version_old_trackto_to_constraints(ob); } @@ -1481,7 +1481,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) bScreen *sc; /* Image editor scopes */ - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { @@ -1504,7 +1504,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) Tex *tex; Brush *brush; - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { SpaceLink *sl; @@ -1541,7 +1541,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) do_version_mdef_250(bmain); /* parent type to modifier */ - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->parent) { Object *parent = (Object *)blo_do_versions_newlibadr(fd, lib, ob->parent); if (parent) { /* parent may not be in group */ @@ -1577,7 +1577,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) } /* initialize scene active layer */ - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { int i; for (i = 0; i < 20; i++) { if (scene->lay & (1 << i)) { @@ -1587,7 +1587,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) } } - for (tex = bmain->tex.first; tex; tex = tex->id.next) { + for (tex = bmain->textures.first; tex; tex = tex->id.next) { /* if youre picky, this isn't correct until we do a version bump * since you could set saturation to be 0.0*/ if (tex->saturation == 0.0f) @@ -1596,12 +1596,12 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) { Curve *cu; - for (cu = bmain->curve.first; cu; cu = cu->id.next) { + for (cu = bmain->curves.first; cu; cu = cu->id.next) { cu->smallcaps_scale = 0.75f; } } - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { if (scene) { Sequence *seq; SEQ_BEGIN(scene->ed, seq) @@ -1615,7 +1615,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) /* GSOC 2010 Sculpt - New settings for Brush */ - for (brush = bmain->brush.first; brush; brush = brush->id.next) { + for (brush = bmain->brushes.first; brush; brush = brush->id.next) { /* Sanity Check */ /* infinite number of dabs */ @@ -1691,7 +1691,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) /* GSOC Sculpt 2010 - Sanity check on Sculpt/Paint settings */ if (bmain->versionfile < 253) { Scene *sce; - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { if (sce->toolsettings->sculpt_paint_unified_alpha == 0) sce->toolsettings->sculpt_paint_unified_alpha = 0.5f; @@ -1706,7 +1706,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile < 253 || (bmain->versionfile == 253 && bmain->subversionfile < 1)) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { @@ -1726,7 +1726,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) /* for now just add it to all flow objects in the scene */ { Object *ob2; - for (ob2 = bmain->object.first; ob2; ob2 = ob2->id.next) { + for (ob2 = bmain->objects.first; ob2; ob2 = ob2->id.next) { ModifierData *md2; for (md2 = ob2->modifiers.first; md2; md2 = md2->next) { if (md2->type == eModifierType_Smoke) { @@ -1754,12 +1754,12 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) ParticleSettings *part; bScreen *sc; - for (br = bmain->brush.first; br; br = br->id.next) { + for (br = bmain->brushes.first; br; br = br->id.next) { if (br->ob_mode == 0) br->ob_mode = OB_MODE_ALL_PAINT; } - for (part = bmain->particle.first; part; part = part->id.next) { + for (part = bmain->particles.first; part; part = part->id.next) { if (part->boids) part->boids->pitch = 1.0f; @@ -1767,7 +1767,7 @@ 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->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { SpaceLink *sl; @@ -1798,7 +1798,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) Object *ob; /* ocean res is now squared, reset old ones - will be massive */ - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Ocean) { @@ -1816,7 +1816,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) Key *key; /* Fix for sample line scope initializing with no height */ - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { sa = sc->areabase.first; while (sa) { SpaceLink *sl; @@ -1835,7 +1835,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) * 2.4x would never reveal this to users as a dummy value always ended up getting used * instead */ - for (key = bmain->key.first; key; key = key->id.next) { + for (key = bmain->shapekeys.first; key; key = key->id.next) { KeyBlock *kb; for (kb = key->block.first; kb; kb = kb->next) { @@ -1851,13 +1851,13 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) Bone *bone; Object *ob; - for (arm = bmain->armature.first; arm; arm = arm->id.next) + for (arm = bmain->armatures.first; arm; arm = arm->id.next) for (bone = arm->bonebase.first; bone; bone = bone->next) do_version_bone_roll_256(bone); /* fix for objects which have zero dquat's * since this is multiplied with the quat rather than added */ - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { if (is_zero_v4(ob->dquat)) { unit_qt(ob->dquat); } @@ -1876,7 +1876,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) /* node sockets are not exposed automatically any more, * this mimics the old behavior by adding all unlinked sockets to groups. */ - for (ntree = bmain->nodetree.first; ntree; ntree = ntree->id.next) { + for (ntree = bmain->nodetrees.first; ntree; ntree = ntree->id.next) { /* this adds copies and links from all unlinked internal sockets to group inputs/outputs. */ /* first make sure the own_index for new sockets is valid */ @@ -1952,7 +1952,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) ParticleSettings *part; /* redraws flag in SpaceTime has been moved to Screen level */ - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { if (sc->redraws_flag == 0) { /* just initialize to default? */ /* XXX: we could also have iterated through areas, and taken them from the first timeline available... */ @@ -1960,13 +1960,13 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) } } - for (brush = bmain->brush.first; brush; brush = brush->id.next) { + for (brush = bmain->brushes.first; brush; brush = brush->id.next) { if (brush->height == 0) brush->height = 0.4f; } /* replace 'rim material' option for in offset*/ - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Solidify) { @@ -1980,7 +1980,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) } /* particle draw color from material */ - for (part = bmain->particle.first; part; part = part->id.next) { + for (part = bmain->particles.first; part; part = part->id.next) { if (part->draw & PART_DRAW_MAT_COL) part->draw_col = PART_DRAW_COL_MAT; } @@ -1989,7 +1989,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile < 256 || (bmain->versionfile == 256 && bmain->subversionfile < 6)) { Mesh *me; - for (me = bmain->mesh.first; me; me = me->id.next) + for (me = bmain->meshes.first; me; me = me->id.next) BKE_mesh_calc_normals_tessface(me->mvert, me->totvert, me->mface, me->totface, NULL); } @@ -1997,7 +1997,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) /* update blur area sizes from 0..1 range to 0..100 percentage */ Scene *scene; bNode *node; - for (scene = bmain->scene.first; scene; scene = scene->id.next) + for (scene = bmain->scenes.first; scene; scene = scene->id.next) if (scene->nodetree) for (node = scene->nodetree->nodes.first; node; node = node->next) if (node->type == CMP_NODE_BLUR) { @@ -2013,7 +2013,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) * need to make less ugly - possibly an iterator? */ bScreen *screen; - for (screen = bmain->screen.first; screen; screen = screen->id.next) { + for (screen = bmain->screens.first; screen; screen = screen->id.next) { ScrArea *sa; /* add regions */ for (sa = screen->areabase.first; sa; sa = sa->next) { @@ -2044,7 +2044,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) { ParticleSettings *part; - for (part = bmain->particle.first; part; part = part->id.next) { + for (part = bmain->particles.first; part; part = part->id.next) { /* Initialize particle billboard scale */ part->bb_size[0] = part->bb_size[1] = 1.0f; } @@ -2056,7 +2056,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) Scene *scene; Sequence *seq; - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { scene->r.ffcodecdata.audio_channels = 2; scene->audio.volume = 1.0f; SEQ_BEGIN(scene->ed, seq) @@ -2068,7 +2068,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) { bScreen *screen; - for (screen = bmain->screen.first; screen; screen = screen->id.next) { + for (screen = bmain->screens.first; screen; screen = screen->id.next) { ScrArea *sa; /* add regions */ @@ -2109,7 +2109,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) bAction *act; FCurve *fcu; - for (act = bmain->action.first; act; act = act->id.next) { + for (act = bmain->actions.first; act; act = act->id.next) { for (fcu = act->curves.first; fcu; fcu = fcu->next) { BezTriple *bezt; uint i = 0; @@ -2164,7 +2164,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) */ bNodeTree *ntree; /* all node trees in bmain->nodetree are considered groups */ - for (ntree = bmain->nodetree.first; ntree; ntree = ntree->id.next) + for (ntree = bmain->nodetrees.first; ntree; ntree = ntree->id.next) ntree->nodetype = NODE_GROUP; } } @@ -2173,7 +2173,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) { /* Adaptive time step for particle systems */ ParticleSettings *part; - for (part = bmain->particle.first; part; part = part->id.next) { + for (part = bmain->particles.first; part; part = part->id.next) { part->courant_target = 0.2f; part->time_flag &= ~PART_TIME_AUTOSF; } diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c index 86e4fd47479..31be2244d17 100644 --- a/source/blender/blenloader/intern/versioning_260.c +++ b/source/blender/blenloader/intern/versioning_260.c @@ -609,7 +609,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) Scene *sce; bNodeTree *ntree; - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { /* there are files with invalid audio_channels value, the real cause * is unknown, but we fix it here anyway to avoid crashes */ if (sce->r.ffcodecdata.audio_channels == 0) @@ -619,7 +619,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) do_versions_nodetree_image_default_alpha_output(sce->nodetree); } - for (ntree = bmain->nodetree.first; ntree; ntree = ntree->id.next) + for (ntree = bmain->nodetrees.first; ntree; ntree = ntree->id.next) do_versions_nodetree_image_default_alpha_output(ntree); } @@ -627,7 +627,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) /* support old particle dupliobject rotation settings */ ParticleSettings *part; - for (part = bmain->particle.first; part; part = part->id.next) { + for (part = bmain->particles.first; part; part = part->id.next) { if (ELEM(part->ren_as, PART_DRAW_OB, PART_DRAW_GR)) { part->draw |= PART_DRAW_ROTATE_OB; @@ -641,13 +641,13 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (bmain->versionfile < 260 || (bmain->versionfile == 260 && bmain->subversionfile < 1)) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ob->collision_boundtype = ob->boundtype; } { Camera *cam; - for (cam = bmain->camera.first; cam; cam = cam->id.next) { + for (cam = bmain->cameras.first; cam; cam = cam->id.next) { if (cam->sensor_x < 0.01f) cam->sensor_x = DEFAULT_SENSOR_WIDTH; @@ -682,17 +682,17 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) Material *mat; bNodeTree *ntree; - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { if (sce->nodetree) do_versions_nodetree_convert_angle(sce->nodetree); } - for (mat = bmain->mat.first; mat; mat = mat->id.next) { + for (mat = bmain->materials.first; mat; mat = mat->id.next) { if (mat->nodetree) do_versions_nodetree_convert_angle(mat->nodetree); } - for (ntree = bmain->nodetree.first; ntree; ntree = ntree->id.next) + for (ntree = bmain->nodetrees.first; ntree; ntree = ntree->id.next) do_versions_nodetree_convert_angle(ntree); } @@ -701,7 +701,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) bScreen *sc; MovieClip *clip; - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { SpaceLink *sl; @@ -725,7 +725,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (clip = bmain->movieclip.first; clip; clip = clip->id.next) { + for (clip = bmain->movieclips.first; clip; clip = clip->id.next) { MovieTrackingTrack *track; if (clip->aspx < 1.0f) { @@ -761,11 +761,11 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) Scene *sce; MovieClip *clip; - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { do_versions_image_settings_2_60(sce); } - for (clip = bmain->movieclip.first; clip; clip = clip->id.next) { + for (clip = bmain->movieclips.first; clip; clip = clip->id.next) { MovieTrackingSettings *settings = &clip->tracking.settings; if (settings->default_pattern_size == 0.0f) { @@ -778,7 +778,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { /* convert delta addition into delta scale */ int i; for (i = 0; i < 3; i++) { @@ -800,7 +800,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) * at some point this could be removed. */ else if (bmain->versionfile == 260 && bmain->subversionfile == 6) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { if (is_zero_v3(ob->dscale)) { copy_vn_fl(ob->dscale, 3, 1.0f); } @@ -810,7 +810,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (bmain->versionfile < 260 || (bmain->versionfile == 260 && bmain->subversionfile < 8)) { Brush *brush; - for (brush = bmain->brush.first; brush; brush = brush->id.next) { + for (brush = bmain->brushes.first; brush; brush = brush->id.next) { if (brush->sculpt_tool == SCULPT_TOOL_ROTATE) brush->alpha = 1.0f; } @@ -825,32 +825,32 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) World *world; bNodeTree *ntree; - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { if (sce->nodetree) do_versions_nodetree_socket_use_flags_2_62(sce->nodetree); } - for (mat = bmain->mat.first; mat; mat = mat->id.next) { + for (mat = bmain->materials.first; mat; mat = mat->id.next) { if (mat->nodetree) do_versions_nodetree_socket_use_flags_2_62(mat->nodetree); } - for (tex = bmain->tex.first; tex; tex = tex->id.next) { + for (tex = bmain->textures.first; tex; tex = tex->id.next) { if (tex->nodetree) do_versions_nodetree_socket_use_flags_2_62(tex->nodetree); } - for (Light *la = bmain->light.first; la; la = la->id.next) { + for (Light *la = bmain->lights.first; la; la = la->id.next) { if (la->nodetree) do_versions_nodetree_socket_use_flags_2_62(la->nodetree); } - for (world = bmain->world.first; world; world = world->id.next) { + for (world = bmain->worlds.first; world; world = world->id.next) { if (world->nodetree) do_versions_nodetree_socket_use_flags_2_62(world->nodetree); } - for (ntree = bmain->nodetree.first; ntree; ntree = ntree->id.next) { + for (ntree = bmain->nodetrees.first; ntree; ntree = ntree->id.next) { do_versions_nodetree_socket_use_flags_2_62(ntree); } } @@ -858,7 +858,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) MovieClip *clip; Object *ob; - for (clip = bmain->movieclip.first; clip; clip = clip->id.next) { + for (clip = bmain->movieclips.first; clip; clip = clip->id.next) { MovieTracking *tracking = &clip->tracking; MovieTrackingObject *tracking_object = tracking->objects.first; @@ -878,7 +878,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { bConstraint *con; for (con = ob->constraints.first; con; con = con->next) { if (con->type == CONSTRAINT_TYPE_OBJECTSOLVER) { @@ -897,7 +897,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) /* convert deprecated sculpt_paint_unified_* fields to * UnifiedPaintSettings */ Scene *scene; - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { ToolSettings *ts = scene->toolsettings; UnifiedPaintSettings *ups = &ts->unified_paint_settings; ups->size = ts->sculpt_paint_unified_size; @@ -912,7 +912,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) { /* convert extended ascii to utf-8 for text editor */ Text *text; - for (text = bmain->text.first; text; text = text->id.next) { + for (text = bmain->texts.first; text; text = text->id.next) { if (!(text->flags & TXT_ISEXT)) { TextLine *tl; @@ -930,7 +930,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) { /* set new dynamic paint values */ Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_DynamicPaint) { @@ -952,7 +952,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (bmain->versionfile < 262) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { @@ -970,7 +970,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) * try to correct it, if rate is 0.0 that's likely not intentional */ Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Fluidsim) { @@ -987,13 +987,13 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) Scene *sce; bNodeTree *ntree; - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { if (sce->nodetree) do_versions_nodetree_multi_file_output_format_2_62_1(sce, sce->nodetree); } /* XXX can't associate with scene for group nodes, image format will stay uninitialized */ - for (ntree = bmain->nodetree.first; ntree; ntree = ntree->id.next) + for (ntree = bmain->nodetrees.first; ntree; ntree = ntree->id.next) do_versions_nodetree_multi_file_output_format_2_62_1(NULL, ntree); } @@ -1001,7 +1001,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (bmain->versionfile == 262 && bmain->subversionfile == 1) { { Mesh *me; - for (me = bmain->mesh.first; me; me = me->id.next) { + for (me = bmain->meshes.first; me; me = me->id.next) { do_versions_mesh_mloopcol_swap_2_62_1(me); } } @@ -1010,7 +1010,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (bmain->versionfile < 262 || (bmain->versionfile == 262 && bmain->subversionfile < 2)) { /* Set new idname of keyingsets from their now "label-only" name. */ Scene *scene; - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { KeyingSet *ks; for (ks = scene->keyingsets.first; ks; ks = ks->next) { if (!ks->idname[0]) @@ -1023,7 +1023,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) Object *ob; ModifierData *md; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Lattice) { LatticeModifierData *lmd = (LatticeModifierData *)md; @@ -1037,7 +1037,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) /* Read Viscosity presets from older files */ Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Fluidsim) { @@ -1060,7 +1060,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (bmain->versionfile < 263) { /* Default for old files is to save particle rotations to pointcache */ ParticleSettings *part; - for (part = bmain->particle.first; part; part = part->id.next) { + for (part = bmain->particles.first; part; part = part->id.next) { part->flag |= PART_ROTATIONS; } } @@ -1070,10 +1070,10 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) Scene *sce; bNodeTree *ntree; - for (sce = bmain->scene.first; sce; sce = sce->id.next) + for (sce = bmain->scenes.first; sce; sce = sce->id.next) if (sce->nodetree) do_versions_nodetree_multi_file_output_path_2_63_1(sce->nodetree); - for (ntree = bmain->nodetree.first; ntree; ntree = ntree->id.next) + for (ntree = bmain->nodetrees.first; ntree; ntree = ntree->id.next) do_versions_nodetree_multi_file_output_path_2_63_1(ntree); } @@ -1085,7 +1085,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) * unified paint settings also have weight. Update unified * paint settings and brushes with a default weight value. */ - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { ToolSettings *ts = scene->toolsettings; if (ts) { ts->unified_paint_settings.weight = ts->vgroup_weight; @@ -1093,7 +1093,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (brush = bmain->brush.first; brush; brush = brush->id.next) { + for (brush = bmain->brushes.first; brush; brush = brush->id.next) { brush->weight = 0.5; } } @@ -1101,7 +1101,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 2)) { bScreen *sc; - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { SpaceLink *sl; @@ -1137,14 +1137,14 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) Camera *cam; Curve *cu; - for (cam = bmain->camera.first; cam; cam = cam->id.next) { + for (cam = bmain->cameras.first; cam; cam = cam->id.next) { if (cam->flag & CAM_PANORAMA) { cam->type = CAM_PANO; cam->flag &= ~CAM_PANORAMA; } } - for (cu = bmain->curve.first; cu; cu = cu->id.next) { + for (cu = bmain->curves.first; cu; cu = cu->id.next) { if (cu->bevfac2 == 0.0f) { cu->bevfac1 = 0.0f; cu->bevfac2 = 1.0f; @@ -1158,13 +1158,13 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) Scene *sce; bNodeTree *ntree; - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { if (sce->nodetree) { do_versions_nodetree_file_output_layers_2_64_5(sce->nodetree); do_versions_nodetree_image_layer_2_64_5(sce->nodetree); } } - for (ntree = bmain->nodetree.first; ntree; ntree = ntree->id.next) { + for (ntree = bmain->nodetrees.first; ntree; ntree = ntree->id.next) { do_versions_nodetree_file_output_layers_2_64_5(ntree); do_versions_nodetree_image_layer_2_64_5(ntree); } @@ -1179,34 +1179,34 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) World *world; bNodeTree *ntree; - for (sce = bmain->scene.first; sce; sce = sce->id.next) + for (sce = bmain->scenes.first; sce; sce = sce->id.next) if (sce->nodetree) do_versions_nodetree_frame_2_64_6(sce->nodetree); - for (mat = bmain->mat.first; mat; mat = mat->id.next) + for (mat = bmain->materials.first; mat; mat = mat->id.next) if (mat->nodetree) do_versions_nodetree_frame_2_64_6(mat->nodetree); - for (tex = bmain->tex.first; tex; tex = tex->id.next) + for (tex = bmain->textures.first; tex; tex = tex->id.next) if (tex->nodetree) do_versions_nodetree_frame_2_64_6(tex->nodetree); - for (Light *la = bmain->light.first; la; la = la->id.next) + for (Light *la = bmain->lights.first; la; la = la->id.next) if (la->nodetree) do_versions_nodetree_frame_2_64_6(la->nodetree); - for (world = bmain->world.first; world; world = world->id.next) + for (world = bmain->worlds.first; world; world = world->id.next) if (world->nodetree) do_versions_nodetree_frame_2_64_6(world->nodetree); - for (ntree = bmain->nodetree.first; ntree; ntree = ntree->id.next) + for (ntree = bmain->nodetrees.first; ntree; ntree = ntree->id.next) do_versions_nodetree_frame_2_64_6(ntree); } if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 7)) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Smoke) { @@ -1242,7 +1242,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) { Scene *scene; // composite redesign - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { if (scene->nodetree) { if (scene->nodetree->chunksize == 0) { scene->nodetree->chunksize = 256; @@ -1268,7 +1268,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) { bScreen *sc; - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { @@ -1290,7 +1290,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) { MovieClip *clip; - for (clip = bmain->movieclip.first; clip; clip = clip->id.next) { + for (clip = bmain->movieclips.first; clip; clip = clip->id.next) { clip->start_frame = 1; } } @@ -1299,7 +1299,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 11)) { MovieClip *clip; - for (clip = bmain->movieclip.first; clip; clip = clip->id.next) { + for (clip = bmain->movieclips.first; clip; clip = clip->id.next) { MovieTrackingTrack *track; track = clip->tracking.tracks.first; @@ -1347,7 +1347,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) } FOREACH_NODETREE_END; /* keep compatibility for dupliobject particle size */ - for (part = bmain->particle.first; part; part = part->id.next) + for (part = bmain->particles.first; part; part = part->id.next) if (ELEM(part->ren_as, PART_DRAW_OB, PART_DRAW_GR)) if ((part->draw & PART_DRAW_ROTATE_OB) == 0) part->draw |= PART_DRAW_NO_SCALE_OB; @@ -1376,7 +1376,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 18)) { Scene *scene; - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { if (scene->ed) { Sequence *seq; @@ -1417,7 +1417,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) /* make scenes which are not using color management have got None as display device, * so they wouldn't perform linear-to-sRGB conversion on display */ - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { if ((scene->r.color_mgt_flag & R_COLOR_MANAGEMENT) == 0) { ColorManagedDisplaySettings *display_settings = &scene->display_settings; @@ -1430,7 +1430,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (ima = bmain->image.first; ima; ima = ima->id.next) { + for (ima = bmain->images.first; ima; ima = ima->id.next) { if (ima->source == IMA_SRC_VIEWER) { ima->flag |= IMA_VIEW_AS_RENDER; } @@ -1451,7 +1451,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 20)) { Key *key; - for (key = bmain->key.first; key; key = key->id.next) { + for (key = bmain->shapekeys.first; key; key = key->id.next) { blo_do_versions_key_uidgen(key); } } @@ -1459,7 +1459,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 21)) { { Mesh *me; - for (me = bmain->mesh.first; me; me = me->id.next) { + for (me = bmain->meshes.first; me; me = me->id.next) { CustomData_update_typemap(&me->vdata); CustomData_free_layers(&me->vdata, CD_MSTICKY, me->totvert); } @@ -1473,7 +1473,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (bmain->versionfile < 264) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->pose) { if (ob->pose->avs.path_step == 0) { animviz_settings_init(&ob->pose->avs); @@ -1496,7 +1496,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (bmain->versionfile < 264 || (bmain->versionfile == 264 && bmain->subversionfile < 2)) { MovieClip *clip; - for (clip = bmain->movieclip.first; clip; clip = clip->id.next) { + for (clip = bmain->movieclips.first; clip; clip = clip->id.next) { MovieTracking *tracking = &clip->tracking; MovieTrackingObject *tracking_object; @@ -1517,7 +1517,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Smoke) { @@ -1556,7 +1556,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) { bScreen *sc; - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { SpaceLink *sl; @@ -1580,7 +1580,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) /* set a unwrapping margin and ABF by default */ Scene *scene; - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { if (scene->toolsettings->uvcalc_margin == 0.0f) { scene->toolsettings->uvcalc_margin = 0.001f; scene->toolsettings->unwrapper = 0; @@ -1612,7 +1612,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) { Scene *scene; - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { if (scene->r.tilex == 0 || scene->r.tiley == 1) { scene->r.tilex = scene->r.tiley = 64; } @@ -1622,7 +1622,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) /* collision masks */ { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->col_group == 0) { ob->col_group = 0x01; ob->col_mask = 0xff; @@ -1634,7 +1634,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (bmain->versionfile < 264 || (bmain->versionfile == 264 && bmain->subversionfile < 7)) { MovieClip *clip; - for (clip = bmain->movieclip.first; clip; clip = clip->id.next) { + for (clip = bmain->movieclips.first; clip; clip = clip->id.next) { MovieTrackingTrack *track; MovieTrackingObject *object; @@ -1652,7 +1652,7 @@ 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->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { SpaceLink *sl; @@ -1698,7 +1698,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) Scene *scene; Tex *tex; - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { Sequence *seq; SEQ_BEGIN (scene->ed, seq) @@ -1716,7 +1716,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) scene->r.bake_samples = 256; } - for (Image *image = bmain->image.first; image; image = image->id.next) { + for (Image *image = bmain->images.first; image; image = image->id.next) { if (image->flag & IMA_DO_PREMUL) { image->alpha_mode = IMA_ALPHA_STRAIGHT; } @@ -1725,7 +1725,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (tex = bmain->tex.first; tex; tex = tex->id.next) { + for (tex = bmain->textures.first; tex; tex = tex->id.next) { if (tex->type == TEX_IMAGE && (tex->imaflag & TEX_USEALPHA) == 0) { Image *image = blo_do_versions_newlibadr(fd, tex->id.lib, tex->ima); @@ -1755,7 +1755,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) * for compatibility all textures assumed it to be enabled */ Tex *tex; - for (tex = bmain->tex.first; tex; tex = tex->id.next) + for (tex = bmain->textures.first; tex; tex = tex->id.next) if (tex->type == TEX_IMAGE) tex->imaflag |= TEX_USEALPHA; } @@ -1763,7 +1763,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (bmain->versionfile < 265 || (bmain->versionfile == 265 && bmain->subversionfile < 7)) { Curve *cu; - for (cu = bmain->curve.first; cu; cu = cu->id.next) { + for (cu = bmain->curves.first; cu; cu = cu->id.next) { if (cu->flag & (CU_FRONT | CU_BACK)) { if (cu->ext1 != 0.0f || cu->ext2 != 0.0f) { Nurb *nu; @@ -1797,14 +1797,14 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (MAIN_VERSION_OLDER(bmain, 265, 9)) { Mesh *me; - for (me = bmain->mesh.first; me; me = me->id.next) { + for (me = bmain->meshes.first; me; me = me->id.next) { BKE_mesh_do_versions_cd_flag_init(me); } } if (MAIN_VERSION_OLDER(bmain, 265, 10)) { Brush *br; - for (br = bmain->brush.first; br; br = br->id.next) { + for (br = bmain->brushes.first; br; br = br->id.next) { if (br->ob_mode & OB_MODE_TEXTURE_PAINT) { br->mtex.brush_map_mode = MTEX_MAP_MODE_TILED; } @@ -1833,7 +1833,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (MAIN_VERSION_OLDER(bmain, 266, 2)) { bScreen *sc; - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { SpaceLink *sl; @@ -1907,7 +1907,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 266, 4)) { Brush *brush; - for (brush = bmain->brush.first; brush; brush = brush->id.next) { + for (brush = bmain->brushes.first; brush; brush = brush->id.next) { BKE_texture_mtex_default(&brush->mask_mtex); if (brush->ob_mode & OB_MODE_TEXTURE_PAINT) { @@ -1920,7 +1920,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) Brush *brush; #define BRUSH_TEXTURE_OVERLAY (1 << 21) - for (brush = bmain->brush.first; brush; brush = brush->id.next) { + for (brush = bmain->brushes.first; brush; brush = brush->id.next) { brush->overlay_flags = 0; if (brush->flag & BRUSH_TEXTURE_OVERLAY) brush->overlay_flags |= (BRUSH_OVERLAY_PRIMARY | BRUSH_OVERLAY_CURSOR); @@ -1932,7 +1932,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) //if (!DNA_struct_elem_find(fd->filesdna, "Brush", "int", "stencil_pos")) { Brush *brush; - for (brush = bmain->brush.first; brush; brush = brush->id.next) { + for (brush = bmain->brushes.first; brush; brush = brush->id.next) { if (brush->stencil_dimension[0] == 0) { brush->stencil_dimension[0] = 256; brush->stencil_dimension[1] = 256; @@ -1962,7 +1962,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) SceneRenderLayer *srl; FreestyleLineStyle *linestyle; - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { if (sce->r.line_thickness_mode == 0) { sce->r.line_thickness_mode = R_LINE_THICKNESS_ABSOLUTE; sce->r.unit_line_thickness = 1.0f; @@ -1998,7 +1998,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (linestyle = bmain->linestyle.first; linestyle; linestyle = linestyle->id.next) { + for (linestyle = bmain->linestyles.first; linestyle; linestyle = linestyle->id.next) { #if 1 /* disable the Misc panel for now */ if (linestyle->panel == LS_PANEL_MISC) { @@ -2022,7 +2022,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) Scene *scene; bNodeInstanceKey active_viewer_key = {0}; /* simply pick the first node space and use that for the active viewer key */ - for (screen = bmain->screen.first; screen; screen = screen->id.next) { + for (screen = bmain->screens.first; screen; screen = screen->id.next) { ScrArea *sa; for (sa = screen->areabase.first; sa; sa = sa->next) { SpaceLink *sl; @@ -2044,7 +2044,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) break; } - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { /* NB: scene->nodetree is a local ID block, has been direct_link'ed */ if (scene->nodetree) scene->nodetree->active_viewer_key = active_viewer_key; @@ -2054,7 +2054,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (MAIN_VERSION_OLDER(bmain, 267, 1)) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Smoke) { @@ -2074,7 +2074,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 268, 1)) { Brush *brush; - for (brush = bmain->brush.first; brush; brush = brush->id.next) { + for (brush = bmain->brushes.first; brush; brush = brush->id.next) { brush->spacing = MAX2(1, brush->spacing); } } @@ -2082,7 +2082,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 268, 2)) { Brush *brush; #define BRUSH_FIXED (1 << 6) - for (brush = bmain->brush.first; brush; brush = brush->id.next) { + for (brush = bmain->brushes.first; brush; brush = brush->id.next) { brush->flag &= ~BRUSH_FIXED; if (brush->cursor_overlay_alpha < 2) @@ -2100,7 +2100,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) bScreen *sc; Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { bConstraint *con; for (con = ob->constraints.first; con; con = con->next) { if (con->type == CONSTRAINT_TYPE_SHRINKWRAP) { @@ -2113,7 +2113,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Smoke) { @@ -2132,7 +2132,7 @@ 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->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { SpaceLink *sl; @@ -2153,7 +2153,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) ScrArea *sa; /* add missing (+) expander in node editor */ - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { for (sa = sc->areabase.first; sa; sa = sa->next) { ARegion *ar, *arnew; @@ -2232,7 +2232,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) Scene *scene; /* Update files using invalid (outdated) outlinevis Outliner values. */ - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { for (sa = sc->areabase.first; sa; sa = sa->next) { for (sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_OUTLINER) { @@ -2253,7 +2253,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "MovieTrackingTrack", "float", "weight")) { MovieClip *clip; - for (clip = bmain->movieclip.first; clip; clip = clip->id.next) { + for (clip = bmain->movieclips.first; clip; clip = clip->id.next) { MovieTracking *tracking = &clip->tracking; MovieTrackingObject *tracking_object; for (tracking_object = tracking->objects.first; @@ -2274,7 +2274,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "TriangulateModifierData", "int", "quad_method")) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Triangulate) { @@ -2292,7 +2292,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { /* this can now be turned off */ ToolSettings *ts = scene->toolsettings; if (ts->sculpt) @@ -2318,11 +2318,11 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) Scene *scene; Object *ob; - for (Light *la = bmain->light.first; la; la = la->id.next) { + for (Light *la = bmain->lights.first; la; la = la->id.next) { la->spotsize = DEG2RADF(la->spotsize); } - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { @@ -2337,7 +2337,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { Sequence *seq; SEQ_BEGIN (scene->ed, seq) { @@ -2371,7 +2371,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "MovieTrackingPlaneTrack", "float", "image_opacity")) { MovieClip *clip; - for (clip = bmain->movieclip.first; clip; clip = clip->id.next) { + for (clip = bmain->movieclips.first; clip; clip = clip->id.next) { MovieTrackingPlaneTrack *plane_track; for (plane_track = clip->tracking.plane_tracks.first; plane_track; @@ -2385,7 +2385,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 269, 7)) { Scene *scene; - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { Sculpt *sd = scene->toolsettings->sculpt; if (sd) { @@ -2412,7 +2412,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 269, 8)) { Curve *cu; - for (cu = bmain->curve.first; cu; cu = cu->id.next) { + for (cu = bmain->curves.first; cu; cu = cu->id.next) { if (cu->str) { cu->len_wchar = BLI_strlen_utf8(cu->str); } @@ -2422,7 +2422,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 269, 9)) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Build) { @@ -2438,7 +2438,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 269, 11)) { bScreen *sc; - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { SpaceLink *space_link; diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c index ab32a6d60a1..3ea9c812d15 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.c @@ -406,7 +406,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "BevelModifierData", "float", "profile")) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Bevel) { @@ -433,7 +433,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) { bScreen *screen; - for (screen = bmain->screen.first; screen; screen = screen->id.next) { + for (screen = bmain->screens.first; screen; screen = screen->id.next) { ScrArea *area; for (area = screen->areabase.first; area; area = area->next) { SpaceLink *space_link; @@ -451,7 +451,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "MovieTrackingSettings", "float", "default_weight")) { MovieClip *clip; - for (clip = bmain->movieclip.first; clip; clip = clip->id.next) { + for (clip = bmain->movieclips.first; clip; clip = clip->id.next) { clip->tracking.settings.default_weight = 1.0f; } } @@ -461,7 +461,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) Object *ob; /* Update Transform constraint (another deg -> rad stuff). */ - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { do_version_constraints_radians_degrees_270_1(&ob->constraints); if (ob->pose) { @@ -478,7 +478,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) Mesh *me; /* Mesh smoothresh deg->rad. */ - for (me = bmain->mesh.first; me; me = me->id.next) { + for (me = bmain->meshes.first; me; me = me->id.next) { me->smoothresh = DEG2RADF(me->smoothresh); } } @@ -486,7 +486,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 270, 3)) { FreestyleLineStyle *linestyle; - for (linestyle = bmain->linestyle.first; linestyle; linestyle = linestyle->id.next) { + for (linestyle = bmain->linestyles.first; linestyle; linestyle = linestyle->id.next) { linestyle->flag |= LS_NO_SORTING; linestyle->sort_key = LS_SORT_KEY_DISTANCE_FROM_CAMERA; linestyle->integration_type = LS_INTEGRATION_MEAN; @@ -499,7 +499,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) */ bScreen *sc; - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { SpaceLink *sl; @@ -520,7 +520,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) Object *ob; /* Update Transform constraint (again :|). */ - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { do_version_constraints_radians_degrees_270_5(&ob->constraints); if (ob->pose) { @@ -537,7 +537,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "BakeData", "bake")) { Scene *sce; - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { sce->r.bake.flag = R_BAKE_CLEAR; sce->r.bake.width = 512; sce->r.bake.height = 512; @@ -559,7 +559,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "FreestyleLineStyle", "float", "texstep")) { FreestyleLineStyle *linestyle; - for (linestyle = bmain->linestyle.first; linestyle; linestyle = linestyle->id.next) { + for (linestyle = bmain->linestyles.first; linestyle; linestyle = linestyle->id.next) { linestyle->flag |= LS_TEXTURE; linestyle->texstep = 1.0; } @@ -567,7 +567,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) { Scene *scene; - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { int num_layers = BLI_listbase_count(&scene->r.layers); scene->r.actlay = min_ff(scene->r.actlay, num_layers - 1); } @@ -578,7 +578,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "Material", "float", "line_col[4]")) { Material *mat; - for (mat = bmain->mat.first; mat; mat = mat->id.next) { + for (mat = bmain->materials.first; mat; mat = mat->id.next) { mat->line_col[0] = mat->line_col[1] = mat->line_col[2] = 0.0f; mat->line_col[3] = mat->alpha; } @@ -586,7 +586,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "int", "preview_start_resolution")) { Scene *scene; - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { scene->r.preview_start_resolution = 64; } } @@ -595,13 +595,13 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 271, 3)) { Brush *br; - for (br = bmain->brush.first; br; br = br->id.next) { + for (br = bmain->brushes.first; br; br = br->id.next) { br->fill_threshold = 0.2f; } if (!DNA_struct_elem_find(fd->filesdna, "BevelModifierData", "int", "mat")) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { @@ -616,7 +616,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 271, 6)) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { @@ -633,7 +633,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 272, 0)) { if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "int", "preview_start_resolution")) { Scene *scene; - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { scene->r.preview_start_resolution = 64; } } @@ -641,7 +641,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 272, 1)) { Brush *br; - for (br = bmain->brush.first; br; br = br->id.next) { + for (br = bmain->brushes.first; br; br = br->id.next) { if ((br->ob_mode & OB_MODE_SCULPT) && ELEM(br->sculpt_tool, SCULPT_TOOL_GRAB, SCULPT_TOOL_SNAKE_HOOK)) br->alpha = 1.0f; } @@ -650,7 +650,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 272, 2)) { if (!DNA_struct_elem_find(fd->filesdna, "Image", "float", "gen_color")) { Image *image; - for (image = bmain->image.first; image != NULL; image = image->id.next) { + for (image = bmain->images.first; image != NULL; image = image->id.next) { image->gen_color[3] = 1.0f; } } @@ -659,7 +659,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) Object *ob; /* Update Transform constraint (again :|). */ - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { do_version_constraints_stretch_to_limits(&ob->constraints); if (ob->pose) { @@ -679,7 +679,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) Brush *br; - for (br = bmain->brush.first; br; br = br->id.next) { + for (br = bmain->brushes.first; br; br = br->id.next) { if (br->flag & BRUSH_RAKE) { br->mtex.brush_angle_mode |= MTEX_ANGLE_RAKE; br->mask_mtex.brush_angle_mode |= MTEX_ANGLE_RAKE; @@ -701,7 +701,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "Scene", "DisplaySafeAreas", "safe_areas")) { Scene *scene; - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { copy_v2_fl2(scene->safe_areas.title, 3.5f / 100.0f, 3.5f / 100.0f); copy_v2_fl2(scene->safe_areas.action, 10.0f / 100.0f, 5.0f / 100.0f); copy_v2_fl2(scene->safe_areas.title_center, 17.5f / 100.0f, 5.0f / 100.0f); @@ -712,7 +712,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 273, 3)) { ParticleSettings *part; - for (part = bmain->particle.first; part; part = part->id.next) { + for (part = bmain->particles.first; part; part = part->id.next) { if (part->clumpcurve) part->child_flag |= PART_CHILD_USE_CLUMP_CURVE; if (part->roughcurve) @@ -724,7 +724,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "ClothSimSettings", "float", "bending_damping")) { Object *ob; ModifierData *md; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Cloth) { ClothModifierData *clmd = (ClothModifierData *)md; @@ -742,21 +742,21 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "ParticleSettings", "float", "clump_noise_size")) { ParticleSettings *part; - for (part = bmain->particle.first; part; part = part->id.next) { + for (part = bmain->particles.first; part; part = part->id.next) { part->clump_noise_size = 1.0f; } } if (!DNA_struct_elem_find(fd->filesdna, "ParticleSettings", "int", "kink_extra_steps")) { ParticleSettings *part; - for (part = bmain->particle.first; part; part = part->id.next) { + for (part = bmain->particles.first; part; part = part->id.next) { part->kink_extra_steps = 4; } } if (!DNA_struct_elem_find(fd->filesdna, "MTex", "float", "kinkampfac")) { ParticleSettings *part; - for (part = bmain->particle.first; part; part = part->id.next) { + for (part = bmain->particles.first; part; part = part->id.next) { int a; for (a = 0; a < MAX_MTEX; a++) { MTex *mtex = part->mtex[a]; @@ -770,7 +770,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "HookModifierData", "char", "flag")) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Hook) { @@ -800,7 +800,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "Camera", "GPUDOFSettings", "gpu_dof")) { Camera *ca; - for (ca = bmain->camera.first; ca; ca = ca->id.next) { + for (ca = bmain->cameras.first; ca; ca = ca->id.next) { ca->gpu_dof.fstop = 128.0f; ca->gpu_dof.focal_length = 1.0f; ca->gpu_dof.focus_distance = 1.0f; @@ -811,7 +811,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 273, 8)) { Object *ob; - for (ob = bmain->object.first; ob != NULL; ob = ob->id.next) { + for (ob = bmain->objects.first; ob != NULL; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.last; md != NULL; md = md->prev) { if (modifier_unique_name(&ob->modifiers, md)) { @@ -830,7 +830,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) ARegion *ar; /* Make sure sequencer preview area limits zoom */ - for (scr = bmain->screen.first; scr; scr = scr->id.next) { + 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) { @@ -853,7 +853,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) { Object *ob; ParticleSystem *psys; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { for (psys = ob->particlesystem.first; psys; psys = psys->next) { if ((psys->pointcache->flag & PTCACHE_BAKED) == 0) { psys->recalc |= ID_RECALC_PSYS_RESET; @@ -865,7 +865,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) /* hysteresis setted to 10% but not actived */ if (!DNA_struct_elem_find(fd->filesdna, "LodLevel", "int", "obhysteresis")) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { LodLevel *level; for (level = ob->lodlevels.first; level; level = level->next) { level->obhysteresis = 10; @@ -883,7 +883,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) Camera *cam; Image *ima; - for (scene = bmain->scene.first; scene; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene; scene = scene->id.next) { Sequence *seq; BKE_scene_add_render_view(scene, STEREO_LEFT_NAME); @@ -912,7 +912,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } SEQ_END; } - for (screen = bmain->screen.first; screen; screen = screen->id.next) { + for (screen = bmain->screens.first; screen; screen = screen->id.next) { ScrArea *sa; for (sa = screen->areabase.first; sa; sa = sa->next) { SpaceLink *sl; @@ -939,12 +939,12 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (cam = bmain->camera.first; cam; cam = cam->id.next) { + for (cam = bmain->cameras.first; cam; cam = cam->id.next) { cam->stereo.interocular_distance = 0.065f; cam->stereo.convergence_distance = 30.0f * 0.065f; } - for (ima = bmain->image.first; ima; ima = ima->id.next) { + for (ima = bmain->images.first; ima; ima = ima->id.next) { ima->stereo3d_format = MEM_callocN(sizeof(Stereo3dFormat), "Image Stereo 3d Format"); if (ima->packedfile) { @@ -968,7 +968,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) bScreen *screen; if (!DNA_struct_elem_find(fd->filesdna, "FileSelectParams", "int", "thumbnail_size")) { - for (screen = bmain->screen.first; screen; screen = screen->id.next) { + for (screen = bmain->screens.first; screen; screen = screen->id.next) { ScrArea *sa; for (sa = screen->areabase.first; sa; sa = sa->next) { @@ -989,7 +989,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "short", "simplify_subsurf_render")) { Scene *scene; - for (scene = bmain->scene.first; scene != NULL; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene != NULL; scene = scene->id.next) { scene->r.simplify_subsurf_render = scene->r.simplify_subsurf; scene->r.simplify_particles_render = scene->r.simplify_particles; } @@ -998,7 +998,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "DecimateModifierData", "float", "defgrp_factor")) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Decimate) { @@ -1013,7 +1013,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 275, 3)) { Brush *br; #define BRUSH_TORUS (1 << 1) - for (br = bmain->brush.first; br; br = br->id.next) { + for (br = bmain->brushes.first; br; br = br->id.next) { br->flag &= ~BRUSH_TORUS; } #undef BRUSH_TORUS @@ -1023,7 +1023,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "bPoseChannel", "float", "custom_scale")) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->pose) { bPoseChannel *pchan; for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) { @@ -1036,7 +1036,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) { bScreen *screen; #define RV3D_VIEW_PERSPORTHO 7 - for (screen = bmain->screen.first; screen; screen = screen->id.next) { + for (screen = bmain->screens.first; screen; screen = screen->id.next) { ScrArea *sa; for (sa = screen->areabase.first; sa; sa = sa->next) { SpaceLink *sl; @@ -1064,7 +1064,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) { #define LA_YF_PHOTON 5 - for (Light *la = bmain->light.first; la; la = la->id.next) { + for (Light *la = bmain->lights.first; la; la = la->id.next) { if (la->type == LA_YF_PHOTON) { la->type = LA_LOCAL; } @@ -1076,7 +1076,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 276, 3)) { if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "CurveMapping", "mblur_shutter_curve")) { Scene *scene; - for (scene = bmain->scene.first; scene != NULL; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene != NULL; scene = scene->id.next) { CurveMapping *curve_mapping = &scene->r.mblur_shutter_curve; curvemapping_set_defaults(curve_mapping, 1, 0.0f, 0.0f, 1.0f, 1.0f); curvemapping_initialize(curve_mapping); @@ -1089,7 +1089,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 276, 4)) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { ToolSettings *ts = scene->toolsettings; if (ts->gp_sculpt.brush[0].size == 0) { @@ -1164,7 +1164,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (bGPdata *gpd = bmain->gpencil.first; gpd; gpd = gpd->id.next) { + for (bGPdata *gpd = bmain->gpencils.first; gpd; gpd = gpd->id.next) { bool enabled = false; /* Ensure that the datablock's onionskinning toggle flag @@ -1198,13 +1198,13 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 276, 7)) { Scene *scene; - for (scene = bmain->scene.first; scene != NULL; scene = scene->id.next) { + for (scene = bmain->scenes.first; scene != NULL; scene = scene->id.next) { scene->r.bake.pass_filter = R_BAKE_PASS_FILTER_ALL; } } if (!MAIN_VERSION_ATLEAST(bmain, 277, 1)) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { ParticleEditSettings *pset = &scene->toolsettings->particle; for (int a = 0; a < ARRAY_SIZE(pset->brush); a++) { if (pset->brush[a].strength > 1.0f) { @@ -1213,7 +1213,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase; @@ -1246,7 +1246,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { CurvePaintSettings *cps = &scene->toolsettings->curve_paint_settings; if (cps->error_threshold == 0) { cps->curve_type = CU_BEZIER; @@ -1257,7 +1257,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { Sequence *seq; SEQ_BEGIN (scene->ed, seq) @@ -1280,7 +1280,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } /* Adding "Properties" region to DopeSheet */ - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { /* handle pushed-back space data first */ for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { @@ -1300,12 +1300,12 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 277, 2)) { if (!DNA_struct_elem_find(fd->filesdna, "Bone", "float", "scaleIn")) { - for (bArmature *arm = bmain->armature.first; arm; arm = arm->id.next) { + for (bArmature *arm = bmain->armatures.first; arm; arm = arm->id.next) { do_version_bones_super_bbone(&arm->bonebase); } } if (!DNA_struct_elem_find(fd->filesdna, "bPoseChannel", "float", "scaleIn")) { - for (Object *ob = bmain->object.first; ob; ob = ob->id.next) { + for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->pose) { for (bPoseChannel *pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) { /* see do_version_bones_super_bbone()... */ @@ -1325,7 +1325,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (Camera *camera = bmain->camera.first; camera != NULL; camera = camera->id.next) { + for (Camera *camera = bmain->cameras.first; camera != NULL; camera = camera->id.next) { if (camera->stereo.pole_merge_angle_from == 0.0f && camera->stereo.pole_merge_angle_to == 0.0f) { @@ -1337,7 +1337,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "NormalEditModifierData", "float", "mix_limit")) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_NormalEdit) { @@ -1350,7 +1350,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "BooleanModifierData", "float", "double_threshold")) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Boolean) { @@ -1361,7 +1361,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (Brush *br = bmain->brush.first; br; br = br->id.next) { + for (Brush *br = bmain->brushes.first; br; br = br->id.next) { if (br->sculpt_tool == SCULPT_TOOL_FLATTEN) { br->flag |= BRUSH_ACCUMULATE; } @@ -1370,7 +1370,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "ClothSimSettings", "float", "time_scale")) { Object *ob; ModifierData *md; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Cloth) { ClothModifierData *clmd = (ClothModifierData *)md; @@ -1390,7 +1390,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 277, 3)) { /* ------- init of grease pencil initialization --------------- */ if (!DNA_struct_elem_find(fd->filesdna, "bGPDstroke", "bGPDpalettecolor", "*palcolor")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { ToolSettings *ts = scene->toolsettings; /* initialize use position for sculpt brushes */ ts->gp_sculpt.flag |= GP_SCULPT_SETT_FLAG_APPLY_POSITION; @@ -1409,7 +1409,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) /* Convert Grease Pencil to new palettes/brushes * Loop all strokes and create the palette and all colors */ - for (bGPdata *gpd = bmain->gpencil.first; gpd; gpd = gpd->id.next) { + for (bGPdata *gpd = bmain->gpencils.first; gpd; gpd = gpd->id.next) { if (BLI_listbase_is_empty(&gpd->palettes)) { /* create palette */ bGPDpalette *palette = BKE_gpencil_palette_addnew(gpd, "GP_Palette"); @@ -1456,7 +1456,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 278, 0)) { if (!DNA_struct_elem_find(fd->filesdna, "MovieTrackingTrack", "float", "weight_stab")) { MovieClip *clip; - for (clip = bmain->movieclip.first; clip; clip = clip->id.next) { + for (clip = bmain->movieclips.first; clip; clip = clip->id.next) { MovieTracking *tracking = &clip->tracking; MovieTrackingObject *tracking_object; for (tracking_object = tracking->objects.first; @@ -1477,7 +1477,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "MovieTrackingStabilization", "int", "tot_rot_track")) { MovieClip *clip; - for (clip = bmain->movieclip.first; clip != NULL; clip = clip->id.next) { + for (clip = bmain->movieclips.first; clip != NULL; clip = clip->id.next) { if (clip->tracking.stabilization.rot_track) { migrate_single_rot_stabilization_track_settings(&clip->tracking.stabilization); } @@ -1499,13 +1499,13 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 278, 2)) { if (!DNA_struct_elem_find(fd->filesdna, "FFMpegCodecData", "int", "ffmpeg_preset")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { /* "medium" is the preset FFmpeg uses when no presets are given. */ scene->r.ffcodecdata.ffmpeg_preset = FFM_PRESET_MEDIUM; } } if (!DNA_struct_elem_find(fd->filesdna, "FFMpegCodecData", "int", "constant_rate_factor")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { /* fall back to behavior from before we introduced CRF for old files */ scene->r.ffcodecdata.constant_rate_factor = FFM_CRF_NONE; } @@ -1515,7 +1515,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) Object *ob; ModifierData *md; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Smoke) { SmokeModifierData *smd = (SmokeModifierData *)md; @@ -1531,7 +1531,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 278, 3)) { - for (Scene *scene = bmain->scene.first; scene != NULL; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene != NULL; scene = scene->id.next) { if (scene->toolsettings != NULL) { ToolSettings *ts = scene->toolsettings; ParticleEditSettings *pset = &ts->particle; @@ -1545,7 +1545,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!DNA_struct_elem_find(fd->filesdna, "RigidBodyCon", "float", "spring_stiffness_ang_x")) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { RigidBodyCon *rbc = ob->rigidbody_constraint; if (rbc) { rbc->spring_stiffness_ang_x = 10.0; @@ -1560,7 +1560,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) /* constant detail for sculpting is now a resolution value instead of * a percentage, we reuse old DNA struct member but convert it */ - for (Scene *scene = bmain->scene.first; scene != NULL; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene != NULL; scene = scene->id.next) { if (scene->toolsettings != NULL) { ToolSettings *ts = scene->toolsettings; if (ts->sculpt && ts->sculpt->constant_detail != 0.0f) { @@ -1572,14 +1572,14 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 278, 4)) { const float sqrt_3 = (float)M_SQRT3; - for (Brush *br = bmain->brush.first; br; br = br->id.next) { + for (Brush *br = bmain->brushes.first; br; br = br->id.next) { br->fill_threshold /= sqrt_3; } /* Custom motion paths */ if (!DNA_struct_elem_find(fd->filesdna, "bMotionPath", "int", "line_thickness")) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { bMotionPath *mpath; bPoseChannel *pchan; mpath = ob->mpath; @@ -1609,7 +1609,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 278, 5)) { /* Mask primitive adding code was not initializing correctly id_type of its points' parent. */ - for (Mask *mask = bmain->mask.first; mask; mask = mask->id.next) { + for (Mask *mask = bmain->masks.first; mask; mask = mask->id.next) { for (MaskLayer *mlayer = mask->masklayers.first; mlayer; mlayer = mlayer->next) { for (MaskSpline *mspline = mlayer->splines.first; mspline; mspline = mspline->next) { int i = 0; @@ -1647,7 +1647,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "SurfaceDeformModifierData", "float", "mat[4][4]")) { - for (Object *ob = bmain->object.first; ob; ob = ob->id.next) { + for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { for (ModifierData *md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_SurfaceDeform) { SurfaceDeformModifierData *smd = (SurfaceDeformModifierData *)md; @@ -1665,14 +1665,14 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 279, 0)) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { if (scene->r.im_format.exr_codec == R_IMF_EXR_CODEC_DWAB) { scene->r.im_format.exr_codec = R_IMF_EXR_CODEC_DWAA; } } /* Fix related to VGroup modifiers creating named defgroup CD layers! See T51520. */ - for (Mesh *me = bmain->mesh.first; me; me = me->id.next) { + for (Mesh *me = bmain->meshes.first; me; me = me->id.next) { CustomData_set_layer_name(&me->vdata, CD_MDEFORMVERT, 0, ""); } } @@ -1682,7 +1682,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) Object *ob; ModifierData *md; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Smoke) { SmokeModifierData *smd = (SmokeModifierData *)md; @@ -1697,7 +1697,7 @@ 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->screen.first; sc; sc = sc->id.next) { + for (bScreen *sc = bmain->screens.first; sc; sc = sc->id.next) { for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) { if (sa->full && sc->state == SCREENNORMAL) { sa->full = NULL; @@ -1706,7 +1706,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "Brush", "float", "falloff_angle")) { - for (Brush *br = bmain->brush.first; br; br = br->id.next) { + for (Brush *br = bmain->brushes.first; br; br = br->id.next) { br->falloff_angle = DEG2RADF(80); br->flag &= ~( BRUSH_FLAG_DEPRECATED_1 | BRUSH_FLAG_DEPRECATED_6 | @@ -1714,7 +1714,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) BRUSH_FRONTFACE_FALLOFF); } - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { ToolSettings *ts = scene->toolsettings; for (int i = 0; i < 2; i++) { VPaint *vp = i ? ts->vpaint : ts->wpaint; @@ -1729,7 +1729,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) /* Simple deform modifier no longer assumes Z axis (X for bend type). * Must set previous defaults. */ if (!DNA_struct_elem_find(fd->filesdna, "SimpleDeformModifierData", "char", "deform_axis")) { - for (Object *ob = bmain->object.first; ob; ob = ob->id.next) { + for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { for (ModifierData *md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_SimpleDeform) { SimpleDeformModifierData *smd = (SimpleDeformModifierData *)md; @@ -1739,7 +1739,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { int preset = scene->r.ffcodecdata.ffmpeg_preset; if (preset == FFM_PRESET_NONE || preset >= FFM_PRESET_GOOD) { continue; @@ -1757,7 +1757,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "ParticleInstanceModifierData", "float", "particle_amount")) { - for (Object *ob = bmain->object.first; ob; ob = ob->id.next) { + for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { for (ModifierData *md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_ParticleInstance) { ParticleInstanceModifierData *pimd = (ParticleInstanceModifierData *)md; diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index d00554e7cd4..d68f0fe5d2c 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -113,7 +113,7 @@ static bScreen *screen_parent_find(const bScreen *screen) static void do_version_workspaces_create_from_screens(Main *bmain) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { const bScreen *screen_parent = screen_parent_find(screen); WorkSpace *workspace; if (screen->temp) { @@ -124,7 +124,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->workspace, screen_parent->id.name + 2, offsetof(ID, name) + 2); + &bmain->workspaces, screen_parent->id.name + 2, offsetof(ID, name) + 2); } else { workspace = BKE_workspace_add(bmain, screen->id.name + 2); @@ -177,7 +177,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->workspace)); + BLI_assert(BLI_listbase_is_empty(&bmain->workspaces)); do_version_workspaces_create_from_screens(bmain); @@ -195,7 +195,7 @@ static void do_version_workspaces_after_lib_link(Main *bmain) continue; } - WorkSpace *workspace = BLI_findstring(&bmain->workspace, screen->id.name + 2, offsetof(ID, name) + 2); + WorkSpace *workspace = BLI_findstring(&bmain->workspaces, screen->id.name + 2, offsetof(ID, name) + 2); BLI_assert(workspace != NULL); ListBase *layouts = BKE_workspace_layouts_get(workspace); @@ -219,7 +219,7 @@ static void do_version_workspaces_after_lib_link(Main *bmain) } } - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { /* Deprecated from now on! */ BLI_freelistN(&screen->scene->transform_spaces); screen->scene = NULL; @@ -571,7 +571,7 @@ void do_versions_after_linking_280(Main *bmain) use_collection_compat_28 = false; /* Convert group layer visibility flags to hidden nested collection. */ - for (Collection *collection = bmain->collection.first; collection; collection = collection->id.next) { + for (Collection *collection = bmain->collections.first; collection; collection = collection->id.next) { /* Add fake user for all existing groups. */ id_fake_user_set(&collection->id); @@ -612,18 +612,18 @@ void do_versions_after_linking_280(Main *bmain) /* We need to assign lib pointer to generated hidden collections *after* all have been created, otherwise we'll * end up with several datablocks sharing same name/library, which is FORBIDDEN! * Note: we need this to be recursive, since a child collection may be sorted before its parent in bmain... */ - for (Collection *collection = bmain->collection.first; collection != NULL; collection = collection->id.next) { + for (Collection *collection = bmain->collections.first; collection != NULL; collection = collection->id.next) { do_version_collection_propagate_lib_to_children(collection); } /* Convert layers to collections. */ - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { do_version_layers_to_collections(bmain, scene); } } if (!MAIN_VERSION_ATLEAST(bmain, 280, 0)) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { /* same render-layer as do_version_workspaces_after_lib_link will activate, * so same layer as BKE_view_layer_default_view would return */ ViewLayer *layer = screen->scene->view_layers.first; @@ -664,7 +664,7 @@ void do_versions_after_linking_280(Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 2)) { /* Cleanup any remaining SceneRenderLayer data for files that were created * with Blender 2.8 before the SceneRenderLayer > RenderLayer refactor. */ - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { for (SceneRenderLayer *srl = scene->r.layers.first; srl; srl = srl->next) { if (srl->prop) { IDP_FreeProperty(srl->prop); @@ -679,7 +679,7 @@ void do_versions_after_linking_280(Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 3)) { /* Due to several changes to particle RNA and draw code particles from older files may no longer * be visible. Here we correct this by setting a default draw size for those files. */ - for (Object *object = bmain->object.first; object; object = object->id.next) { + for (Object *object = bmain->objects.first; object; object = object->id.next) { for (ParticleSystem *psys = object->particlesystem.first; psys; psys = psys->next) { if (psys->part->draw_size == 0.0f) { psys->part->draw_size = 0.1f; @@ -689,7 +689,7 @@ void do_versions_after_linking_280(Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 280, 4)) { - for (Object *object = bmain->object.first; object; object = object->id.next) { + for (Object *object = bmain->objects.first; object; object = object->id.next) { if (object->particlesystem.first) { object->duplicator_visibility_flag = OB_DUPLI_FLAG_VIEWPORT; for (ParticleSystem *psys = object->particlesystem.first; psys; psys = psys->next) { @@ -708,7 +708,7 @@ void do_versions_after_linking_280(Main *bmain) } /* Cleanup deprecated flag from particlesettings data-blocks. */ - for (ParticleSettings *part = bmain->particle.first; part; part = part->id.next) { + for (ParticleSettings *part = bmain->particles.first; part; part = part->id.next) { part->draw &= ~PART_DRAW_EMITTER; } } @@ -716,7 +716,7 @@ void do_versions_after_linking_280(Main *bmain) /* SpaceTime & SpaceLogic removal/replacing */ if (!MAIN_VERSION_ATLEAST(bmain, 280, 9)) { const wmWindowManager *wm = bmain->wm.first; - const Scene *scene = bmain->scene.first; + const Scene *scene = bmain->scenes.first; if (wm != NULL) { /* Action editors need a scene for creation. First, update active @@ -736,7 +736,7 @@ void do_versions_after_linking_280(Main *bmain) } } if (scene != NULL) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *area = screen->areabase.first; area; area = area->next) { if (ELEM(area->butspacetype, SPACE_TIME, SPACE_LOGIC)) { /* Areas that were already handled won't be handled again */ @@ -752,11 +752,11 @@ void do_versions_after_linking_280(Main *bmain) #ifdef USE_COLLECTION_COMPAT_28 if (use_collection_compat_28 && !MAIN_VERSION_ATLEAST(bmain, 280, 14)) { - for (Collection *group = bmain->collection.first; group; group = group->id.next) { + for (Collection *group = bmain->collections.first; group; group = group->id.next) { do_version_group_collection_to_collection(bmain, group); } - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { do_version_scene_collection_to_collection(bmain, scene); } } @@ -764,7 +764,7 @@ void do_versions_after_linking_280(Main *bmain) /* Update Curve object Shape Key data layout to include the Radius property */ if (!MAIN_VERSION_ATLEAST(bmain, 280, 23)) { - for (Curve *cu = bmain->curve.first; cu; cu = cu->id.next) { + for (Curve *cu = bmain->curves.first; cu; cu = cu->id.next) { if (!cu->key || cu->key->elemsize != sizeof(float[4])) continue; @@ -832,7 +832,7 @@ void do_versions_after_linking_280(Main *bmain) /* Move B-Bone custom handle settings from bPoseChannel to Bone. */ if (!MAIN_VERSION_ATLEAST(bmain, 280, 25)) { - for (Object *ob = bmain->object.first; ob; ob = ob->id.next) { + for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { bArmature *arm = ob->data; /* If it is an armature from the same file. */ @@ -865,7 +865,7 @@ void do_versions_after_linking_280(Main *bmain) /* Tag pose rebuild for all objects that use this armature. */ if (rebuild) { - for (Object *ob2 = bmain->object.first; ob2; ob2 = ob2->id.next) { + for (Object *ob2 = bmain->objects.first; ob2; ob2 = ob2->id.next) { if (ob2->pose && ob2->data == arm) { ob2->pose->flag |= POSE_RECALC; } @@ -876,7 +876,7 @@ void do_versions_after_linking_280(Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 280, 30)) { - for (Brush *brush = bmain->brush.first; brush; brush = brush->id.next) { + for (Brush *brush = bmain->brushes.first; brush; brush = brush->id.next) { if (brush->gpencil_settings != NULL) { brush->gpencil_tool = brush->gpencil_settings->brush_type; } @@ -886,7 +886,7 @@ void do_versions_after_linking_280(Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 38)) { /* Ensure we get valid rigidbody object/constraint data in relevant collections' objects. */ - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { RigidBodyWorld *rbw = scene->rigidbody_world; if (rbw == NULL) { @@ -918,20 +918,20 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 0)) { use_collection_compat_28 = false; - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { scene->r.gauss = 1.5f; } } if (!MAIN_VERSION_ATLEAST(bmain, 280, 1)) { if (!DNA_struct_elem_find(fd->filesdna, "Light", "float", "bleedexp")) { - for (Light *la = bmain->light.first; la; la = la->id.next) { + for (Light *la = bmain->lights.first; la; la = la->id.next) { la->bleedexp = 2.5f; } } if (!DNA_struct_elem_find(fd->filesdna, "GPUDOFSettings", "float", "ratio")) { - for (Camera *ca = bmain->camera.first; ca; ca = ca->id.next) { + for (Camera *ca = bmain->cameras.first; ca; ca = ca->id.next) { ca->gpu_dof.ratio = 1.0f; } } @@ -939,7 +939,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) /* MTexPoly now removed. */ if (DNA_struct_find(fd->filesdna, "MTexPoly")) { const int cd_mtexpoly = 15; /* CD_MTEXPOLY, deprecated */ - for (Mesh *me = bmain->mesh.first; me; me = me->id.next) { + for (Mesh *me = bmain->meshes.first; me; me = me->id.next) { /* If we have UV's, so this file will have MTexPoly layers too! */ if (me->mloopuv != NULL) { CustomData_update_typemap(&me->pdata); @@ -952,7 +952,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 2)) { if (!DNA_struct_elem_find(fd->filesdna, "Light", "float", "cascade_max_dist")) { - for (Light *la = bmain->light.first; la; la = la->id.next) { + for (Light *la = bmain->lights.first; la; la = la->id.next) { la->cascade_max_dist = 1000.0f; la->cascade_count = 4; la->cascade_exponent = 0.8f; @@ -961,7 +961,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "Light", "float", "contact_dist")) { - for (Light *la = bmain->light.first; la; la = la->id.next) { + for (Light *la = bmain->lights.first; la; la = la->id.next) { la->contact_dist = 0.2f; la->contact_bias = 0.03f; la->contact_spread = 0.2f; @@ -970,7 +970,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "LightProbe", "float", "vis_bias")) { - for (LightProbe *probe = bmain->lightprobe.first; probe; probe = probe->id.next) { + for (LightProbe *probe = bmain->lightprobes.first; probe; probe = probe->id.next) { probe->vis_bias = 1.0f; probe->vis_blur = 0.2f; } @@ -1038,7 +1038,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) (DNA_struct_elem_find(fd->filesdna, "ViewLayer", "FreestyleConfig", "freestyle_config") == false) && DNA_struct_elem_find(fd->filesdna, "Scene", "ListBase", "view_layers")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { ViewLayer *view_layer; for (view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { view_layer->flag |= VIEW_LAYER_FREESTYLE; @@ -1054,7 +1054,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) { /* Grease pencil sculpt and paint cursors */ if (!DNA_struct_elem_find(fd->filesdna, "GP_Sculpt_Settings", "int", "weighttype")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { /* sculpt brushes */ GP_Sculpt_Settings *gset = &scene->toolsettings->gp_sculpt; if (gset) { @@ -1069,7 +1069,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) ARRAY_SET_ITEMS(curcolor_sub, 0.6f, 0.6f, 1.0f); GP_Sculpt_Data *gp_brush; - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { ToolSettings *ts = scene->toolsettings; /* sculpt brushes */ GP_Sculpt_Settings *gset = &ts->gp_sculpt; @@ -1084,21 +1084,21 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) /* Init grease pencil edit line color */ if (!DNA_struct_elem_find(fd->filesdna, "bGPdata", "float", "line_color[4]")) { - for (bGPdata *gpd = bmain->gpencil.first; gpd; gpd = gpd->id.next) { + for (bGPdata *gpd = bmain->gpencils.first; gpd; gpd = gpd->id.next) { ARRAY_SET_ITEMS(gpd->line_color, 0.6f, 0.6f, 0.6f, 0.5f); } } /* Init grease pencil pixel size factor */ if (!DNA_struct_elem_find(fd->filesdna, "bGPdata", "int", "pixfactor")) { - for (bGPdata *gpd = bmain->gpencil.first; gpd; gpd = gpd->id.next) { + for (bGPdata *gpd = bmain->gpencils.first; gpd; gpd = gpd->id.next) { gpd->pixfactor = GP_DEFAULT_PIX_FACTOR; } } /* Grease pencil multiframe falloff curve */ if (!DNA_struct_elem_find(fd->filesdna, "GP_Sculpt_Settings", "CurveMapping", "cur_falloff")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { /* sculpt brushes */ GP_Sculpt_Settings *gset = &scene->toolsettings->gp_sculpt; if ((gset) && (gset->cur_falloff == NULL)) { @@ -1116,14 +1116,14 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) #ifdef USE_COLLECTION_COMPAT_28 if (use_collection_compat_28 && !MAIN_VERSION_ATLEAST(bmain, 280, 3)) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { ViewLayer *view_layer; for (view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { do_version_view_layer_visibility(view_layer); } } - for (Collection *group = bmain->collection.first; group; group = group->id.next) { + for (Collection *group = bmain->collections.first; group; group = group->id.next) { if (group->view_layer != NULL) { do_version_view_layer_visibility(group->view_layer); } @@ -1134,7 +1134,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 3)) { /* init grease pencil grids and paper */ if (!DNA_struct_elem_find(fd->filesdna, "gp_paper_opacity", "float", "gpencil_paper_color[3]")) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.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) { @@ -1155,7 +1155,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) SpaceLink *sl; /* Update files using invalid (outdated) outlinevis Outliner values. */ - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { for (sa = sc->areabase.first; sa; sa = sa->next) { for (sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_OUTLINER) { @@ -1177,12 +1177,12 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "LightProbe", "float", "intensity")) { - for (LightProbe *probe = bmain->lightprobe.first; probe; probe = probe->id.next) { + for (LightProbe *probe = bmain->lightprobes.first; probe; probe = probe->id.next) { probe->intensity = 1.0f; } } - for (Object *ob = bmain->object.first; ob; ob = ob->id.next) { + for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { bConstraint *con, *con_next; con = ob->constraints.first; while (con) { @@ -1196,7 +1196,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (bScreen *sc = bmain->screen.first; sc; sc = sc->id.next) { + for (bScreen *sc = bmain->screens.first; sc; sc = sc->id.next) { for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -1220,7 +1220,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) * development, we assume any files saved in 2.8 had Eevee set * as scene render engine. */ if (MAIN_VERSION_ATLEAST(bmain, 280, 0)) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { BLI_strncpy(scene->r.engine, RE_engine_id_BLENDER_EEVEE, sizeof(scene->r.engine)); } } @@ -1228,7 +1228,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 8)) { /* Blender Internal removal */ - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { if (STREQ(scene->r.engine, "BLENDER_RENDER") || STREQ(scene->r.engine, "BLENDER_GAME")) { @@ -1238,7 +1238,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) scene->r.bake_mode = 0; } - for (Tex *tex = bmain->tex.first; tex; tex = tex->id.next) { + for (Tex *tex = bmain->textures.first; tex; tex = tex->id.next) { /* Removed envmap, pointdensity, voxeldata, ocean textures. */ if (ELEM(tex->type, 10, 14, 15, 16)) { tex->type = 0; @@ -1250,7 +1250,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 11)) { /* Remove info editor, but only if at the top of the window. */ - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { /* Calculate window width/height from screen vertices */ int win_width = 0, win_height = 0; for (ScrVert *vert = screen->vertbase.first; vert; vert = vert->next) { @@ -1281,7 +1281,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 280, 11)) { - for (Light *la = bmain->light.first; la; la = la->id.next) { + for (Light *la = bmain->lights.first; la; la = la->id.next) { if (la->mode & (1 << 13)) { /* LA_SHAD_RAY */ la->mode |= LA_SHADOW; la->mode &= ~(1 << 13); @@ -1291,7 +1291,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 12)) { /* Remove tool property regions. */ - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (ELEM(sl->spacetype, SPACE_VIEW3D, SPACE_CLIP)) { @@ -1314,13 +1314,13 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 13)) { /* Initialize specular factor. */ if (!DNA_struct_elem_find(fd->filesdna, "Light", "float", "spec_fac")) { - for (Light *la = bmain->light.first; la; la = la->id.next) { + for (Light *la = bmain->lights.first; la; la = la->id.next) { la->spec_fac = 1.0f; } } /* Initialize new view3D options. */ - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -1342,24 +1342,24 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 14)) { if (!DNA_struct_elem_find(fd->filesdna, "Scene", "SceneDisplay", "display")) { /* Initialize new scene.SceneDisplay */ - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { copy_v3_v3(scene->display.light_direction, (float[3]){-M_SQRT1_3, -M_SQRT1_3, M_SQRT1_3}); } } if (!DNA_struct_elem_find(fd->filesdna, "SceneDisplay", "float", "shadow_shift")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { scene->display.shadow_shift = 0.1; } } if (!DNA_struct_elem_find(fd->filesdna, "ToolSettings", "char", "transform_pivot_point")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { scene->toolsettings->transform_pivot_point = V3D_AROUND_CENTER_MEDIAN; } } if (!DNA_struct_find(fd->filesdna, "SceneEEVEE")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { /* First set the default for all the properties. */ scene->eevee.gi_diffuse_bounces = 3; @@ -1540,13 +1540,13 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 15)) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { scene->display.matcap_ssao_distance = 0.2f; scene->display.matcap_ssao_attenuation = 1.0f; scene->display.matcap_ssao_samples = 16; } - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_OUTLINER) { @@ -1558,7 +1558,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { switch (scene->toolsettings->snap_mode) { case 0: scene->toolsettings->snap_mode = SCE_SNAP_MODE_INCREMENT; break; case 1: scene->toolsettings->snap_mode = SCE_SNAP_MODE_VERTEX ; break; @@ -1579,7 +1579,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } ParticleSettings *part; - for (part = bmain->particle.first; part; part = part->id.next) { + for (part = bmain->particles.first; part; part = part->id.next) { part->shape_flag = PART_SHAPE_CLOSE_TIP; part->shape = 0.0f; part->rad_root = 1.0f; @@ -1592,7 +1592,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 18)) { if (!DNA_struct_elem_find(fd->filesdna, "Material", "float", "roughness")) { - for (Material *mat = bmain->mat.first; mat; mat = mat->id.next) { + for (Material *mat = bmain->materials.first; mat; mat = mat->id.next) { if (mat->use_nodes) { if (MAIN_VERSION_ATLEAST(bmain, 280, 0)) { mat->roughness = mat->gloss_mir; @@ -1607,7 +1607,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) mat->metallic = mat->ray_mirror; } - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -1620,7 +1620,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "View3DShading", "float", "xray_alpha")) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -1635,7 +1635,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) StudioLight *default_matcap = BKE_studiolight_find_default(STUDIOLIGHT_TYPE_MATCAP); /* when loading the internal file is loaded before the matcaps */ if (default_matcap) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -1648,7 +1648,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } if (!DNA_struct_elem_find(fd->filesdna, "View3DOverlay", "float", "wireframe_threshold")) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -1660,7 +1660,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } if (!DNA_struct_elem_find(fd->filesdna, "View3DShading", "float", "cavity_valley_factor")) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -1673,7 +1673,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } if (!DNA_struct_elem_find(fd->filesdna, "View3DOverlay", "float", "xray_alpha_bone")) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -1688,7 +1688,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 19)) { if (!DNA_struct_elem_find(fd->filesdna, "Image", "ListBase", "renderslot")) { - for (Image *ima = bmain->image.first; ima; ima = ima->id.next) { + for (Image *ima = bmain->images.first; ima; ima = ima->id.next) { if (ima->type == IMA_TYPE_R_RESULT) { for (int i = 0; i < 8; i++) { RenderSlot *slot = MEM_callocN(sizeof(RenderSlot), "Image Render Slot Init"); @@ -1699,7 +1699,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } if (!DNA_struct_elem_find(fd->filesdna, "SpaceAction", "char", "mode_prev")) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_ACTION) { @@ -1714,7 +1714,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -1732,14 +1732,14 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 280, 21)) { - for (Scene *sce = bmain->scene.first; sce != NULL; sce = sce->id.next) { + for (Scene *sce = bmain->scenes.first; sce != NULL; sce = sce->id.next) { if (sce->ed != NULL && sce->ed->seqbase.first != NULL) { do_versions_seq_unique_name_all_strips(sce, &sce->ed->seqbase); } } if (!DNA_struct_elem_find(fd->filesdna, "View3DOverlay", "float", "texture_paint_mode_opacity")) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -1756,7 +1756,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "View3DShading", "char", "background_type")) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -1769,20 +1769,20 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "SceneEEVEE", "float", "gi_cubemap_draw_size")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { scene->eevee.gi_irradiance_draw_size = 0.1f; scene->eevee.gi_cubemap_draw_size = 0.3f; } } - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { if (scene->toolsettings->gizmo_flag == 0) { scene->toolsettings->gizmo_flag = SCE_GIZMO_SHOW_TRANSLATE | SCE_GIZMO_SHOW_ROTATE | SCE_GIZMO_SHOW_SCALE; } } if (!DNA_struct_elem_find(fd->filesdna, "RigidBodyWorld", "RigidBodyWorld_Shared", "*shared")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { RigidBodyWorld *rbw = scene->rigidbody_world; if (rbw == NULL) { @@ -1808,7 +1808,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "SoftBody", "SoftBody_Shared", "*shared")) { - for (Object *ob = bmain->object.first; ob; ob = ob->id.next) { + for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { SoftBody *sb = ob->soft; if (sb == NULL) { continue; @@ -1827,7 +1827,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "View3DShading", "short", "type")) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -1844,13 +1844,13 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "SceneDisplay", "View3DShading", "shading")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { BKE_screen_view3d_shading_init(&scene->display.shading); } } /* initialize grease pencil view data */ if (!DNA_struct_elem_find(fd->filesdna, "SpaceView3D", "float", "vertex_opacity")) { - for (bScreen *sc = bmain->screen.first; sc; sc = sc->id.next) { + for (bScreen *sc = bmain->screens.first; sc; sc = sc->id.next) { for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -1867,13 +1867,13 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 22)) { if (!DNA_struct_elem_find(fd->filesdna, "ToolSettings", "char", "annotate_v3d_align")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { scene->toolsettings->annotate_v3d_align = GP_PROJECT_VIEWSPACE | GP_PROJECT_CURSOR; scene->toolsettings->annotate_thickness = 3; } } if (!DNA_struct_elem_find(fd->filesdna, "bGPDlayer", "short", "line_change")) { - for (bGPdata *gpd = bmain->gpencil.first; gpd; gpd = gpd->id.next) { + for (bGPdata *gpd = bmain->gpencils.first; gpd; gpd = gpd->id.next) { for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) { gpl->line_change = gpl->thickness; if ((gpl->thickness < 1) || (gpl->thickness > 10)) { @@ -1883,7 +1883,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } if (!DNA_struct_elem_find(fd->filesdna, "View3DOverlay", "float", "gpencil_paper_opacity")) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -1895,7 +1895,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } if (!DNA_struct_elem_find(fd->filesdna, "View3DOverlay", "float", "gpencil_grid_opacity")) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -1909,7 +1909,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) /* default loc axis */ if (!DNA_struct_elem_find(fd->filesdna, "GP_Sculpt_Settings", "int", "lock_axis")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { /* lock axis */ GP_Sculpt_Settings *gset = &scene->toolsettings->gp_sculpt; if (gset) { @@ -1920,7 +1920,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) /* Versioning code for Subsurf modifier. */ if (!DNA_struct_elem_find(fd->filesdna, "SubsurfModifier", "short", "uv_smooth")) { - for (Object *object = bmain->object.first; object != NULL; object = object->id.next) { + for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) { for (ModifierData *md = object->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Subsurf) { SubsurfModifierData *smd = (SubsurfModifierData *)md; @@ -1936,7 +1936,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "SubsurfModifier", "short", "quality")) { - for (Object *object = bmain->object.first; object != NULL; object = object->id.next) { + for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) { for (ModifierData *md = object->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Subsurf) { SubsurfModifierData *smd = (SubsurfModifierData *)md; @@ -1947,7 +1947,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } /* Versioning code for Multires modifier. */ if (!DNA_struct_elem_find(fd->filesdna, "MultiresModifier", "short", "quality")) { - for (Object *object = bmain->object.first; object != NULL; object = object->id.next) { + for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) { for (ModifierData *md = object->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Multires) { MultiresModifierData *mmd = (MultiresModifierData *)md; @@ -1964,7 +1964,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "ClothSimSettings", "short", "bending_model")) { - for (Object *ob = bmain->object.first; ob; ob = ob->id.next) { + for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { for (ModifierData *md = ob->modifiers.first; md; md = md->next) { ClothModifierData *clmd = NULL; if (md->type == eModifierType_Cloth) { @@ -1993,7 +1993,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "BrushGpencilSettings", "float", "era_strength_f")) { - for (Brush *brush = bmain->brush.first; brush; brush = brush->id.next) { + for (Brush *brush = bmain->brushes.first; brush; brush = brush->id.next) { if (brush->gpencil_settings != NULL) { BrushGpencilSettings *gp = brush->gpencil_settings; if (gp->brush_type == GPAINT_TOOL_ERASE) { @@ -2004,7 +2004,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (Object *ob = bmain->object.first; ob; ob = ob->id.next) { + for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { for (ModifierData *md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Cloth) { ClothModifierData *clmd = (ClothModifierData *)md; @@ -2033,7 +2033,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 280, 24)) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -2054,7 +2054,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "ShrinkwrapModifierData", "char", "shrinkMode")) { - for (Object *ob = bmain->object.first; ob; ob = ob->id.next) { + for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { for (ModifierData *md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Shrinkwrap) { ShrinkwrapModifierData *smd = (ShrinkwrapModifierData *)md; @@ -2068,7 +2068,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "PartDeflect", "float", "pdef_cfrict")) { - for (Object *ob = bmain->object.first; ob; ob = ob->id.next) { + for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->pd) { ob->pd->pdef_cfrict = 5.0f; } @@ -2084,7 +2084,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "View3DShading", "float", "xray_alpha_wire")) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -2095,7 +2095,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -2109,7 +2109,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 280, 25)) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { UnitSettings *unit = &scene->unit; if (unit->system != USER_UNIT_NONE) { unit->length_unit = bUnit_GetBaseUnitOfType(scene->unit.system, B_UNIT_LENGTH); @@ -2119,7 +2119,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } /* gpencil grid settings */ - for (bGPdata *gpd = bmain->gpencil.first; gpd; gpd = gpd->id.next) { + for (bGPdata *gpd = bmain->gpencils.first; gpd; gpd = gpd->id.next) { ARRAY_SET_ITEMS(gpd->grid.color, 0.5f, 0.5f, 0.5f); // Color ARRAY_SET_ITEMS(gpd->grid.scale, 1.0f, 1.0f); // Scale gpd->grid.lines = GP_DEFAULT_GRID_LINES; // Number of lines @@ -2127,7 +2127,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 280, 29)) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -2142,7 +2142,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_PROPERTIES) { @@ -2168,7 +2168,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) /* grease pencil fade layer opacity */ if (!DNA_struct_elem_find(fd->filesdna, "View3DOverlay", "float", "gpencil_fade_layer")) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -2183,7 +2183,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 30)) { /* grease pencil main material show switches */ - for (Material *mat = bmain->mat.first; mat; mat = mat->id.next) { + for (Material *mat = bmain->materials.first; mat; mat = mat->id.next) { if (mat->gp_style) { mat->gp_style->flag |= GP_STYLE_STROKE_SHOW; mat->gp_style->flag |= GP_STYLE_FILL_SHOW; @@ -2198,7 +2198,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) ARRAY_SET_ITEMS(curcolor_add, 1.0f, 0.6f, 0.6f); ARRAY_SET_ITEMS(curcolor_sub, 0.6f, 0.6f, 1.0f); - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { /* sculpt brushes */ GP_Sculpt_Settings *gset = &scene->toolsettings->gp_sculpt; if (gset) { @@ -2215,12 +2215,12 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "SceneEEVEE", "float", "overscan")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { scene->eevee.overscan = 3.0f; } } - for (Light *la = bmain->light.first; la; la = la->id.next) { + for (Light *la = bmain->lights.first; la; la = la->id.next) { /* Removed Hemi lights. */ if (!ELEM(la->type, LA_LOCAL, LA_SUN, LA_SPOT, LA_AREA)) { la->type = LA_SUN; @@ -2228,25 +2228,25 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "SceneEEVEE", "float", "light_threshold")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { scene->eevee.light_threshold = 0.01f; } } if (!DNA_struct_elem_find(fd->filesdna, "SceneEEVEE", "float", "gi_irradiance_smoothing")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { scene->eevee.gi_irradiance_smoothing = 0.1f; } } if (!DNA_struct_elem_find(fd->filesdna, "SceneEEVEE", "float", "gi_filter_quality")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { scene->eevee.gi_filter_quality = 1.0f; } } if (!DNA_struct_elem_find(fd->filesdna, "Light", "float", "att_dist")) { - for (Light *la = bmain->light.first; la; la = la->id.next) { + for (Light *la = bmain->lights.first; la; la = la->id.next) { la->att_dist = la->clipend; } } @@ -2276,7 +2276,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) #define PAINT_BLEND_ALPHA_SUB 19 #define PAINT_BLEND_ALPHA_ADD 20 - for (Brush *brush = bmain->brush.first; brush; brush = brush->id.next) { + for (Brush *brush = bmain->brushes.first; brush; brush = brush->id.next) { if (brush->ob_mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) { const char tool_init = brush->vertexpaint_tool; bool is_blend = false; @@ -2352,7 +2352,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 280, 34)) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *area = screen->areabase.first; area; area = area->next) { for (SpaceLink *slink = area->spacedata.first; slink; slink = slink->next) { if (slink->spacetype == SPACE_USERPREF) { @@ -2377,7 +2377,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 36)) { if (!DNA_struct_elem_find(fd->filesdna, "View3DShading", "float", "curvature_ridge_factor")) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -2391,7 +2391,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } /* Rename OpenGL to Workbench. */ - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { if (STREQ(scene->r.engine, "BLENDER_OPENGL")) { STRNCPY(scene->r.engine, RE_engine_id_BLENDER_WORKBENCH); } @@ -2399,7 +2399,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) /* init Annotations onion skin */ if (!DNA_struct_elem_find(fd->filesdna, "bGPDlayer", "int", "gstep")) { - for (bGPdata *gpd = bmain->gpencil.first; gpd; gpd = gpd->id.next) { + for (bGPdata *gpd = bmain->gpencils.first; gpd; gpd = gpd->id.next) { for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) { ARRAY_SET_ITEMS(gpl->gcolor_prev, 0.302f, 0.851f, 0.302f); ARRAY_SET_ITEMS(gpl->gcolor_next, 0.250f, 0.1f, 1.0f); @@ -2409,7 +2409,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) /* Move studio_light selection to lookdev_light. */ if (!DNA_struct_elem_find(fd->filesdna, "View3DShading", "char", "lookdev_light[256]")) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -2423,7 +2423,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) /* Change Solid mode shadow orientation. */ if (!DNA_struct_elem_find(fd->filesdna, "SceneDisplay", "float", "shadow_focus")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { float *dir = scene->display.light_direction; SWAP(float, dir[2], dir[1]); dir[2] = -dir[2]; @@ -2433,10 +2433,10 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 280, 37)) { - for (Camera *ca = bmain->camera.first; ca; ca = ca->id.next) { + for (Camera *ca = bmain->cameras.first; ca; ca = ca->id.next) { ca->drawsize *= 2.0f; } - for (Object *ob = bmain->object.first; ob; ob = ob->id.next) { + for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->type != OB_EMPTY) { if (UNLIKELY(ob->transflag & OB_DUPLICOLLECTION)) { BKE_object_type_set_empty_for_versioning(ob); @@ -2446,7 +2446,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) /* Grease pencil primitive curve */ if (!DNA_struct_elem_find(fd->filesdna, "GP_Sculpt_Settings", "CurveMapping", "cur_primitive")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { GP_Sculpt_Settings *gset = &scene->toolsettings->gp_sculpt; if ((gset) && (gset->cur_primitive == NULL)) { gset->cur_primitive = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); @@ -2464,7 +2464,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 38)) { if (DNA_struct_elem_find(fd->filesdna, "Object", "char", "empty_image_visibility_flag")) { - for (Object *ob = bmain->object.first; ob; ob = ob->id.next) { + for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { ob->empty_image_visibility_flag ^= ( OB_EMPTY_IMAGE_HIDE_PERSPECTIVE | OB_EMPTY_IMAGE_HIDE_ORTHOGRAPHIC | @@ -2472,7 +2472,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.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) { switch (sl->spacetype) { @@ -2562,7 +2562,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { scene->r.mode &= ~( R_MODE_DEPRECATED_1 | R_MODE_DEPRECATED_2 | @@ -2615,7 +2615,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - for (World *world = bmain->world.first; world; world = world->id.next) { + for (World *world = bmain->worlds.first; world; world = world->id.next) { world->flag &= ~( WO_MODE_DEPRECATED_1 | WO_MODE_DEPRECATED_2 | @@ -2625,7 +2625,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) WO_MODE_DEPRECATED_7); } - for (Image *image = bmain->image.first; image; image = image->id.next) { + for (Image *image = bmain->images.first; image; image = image->id.next) { image->flag &= ~( IMA_FLAG_DEPRECATED_0 | IMA_FLAG_DEPRECATED_1 | @@ -2636,7 +2636,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) IMA_FLAG_DEPRECATED_16); } - for (Object *ob = bmain->object.first; ob; ob = ob->id.next) { + for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { ob->flag &= ~( OB_FLAG_DEPRECATED_11 | OB_FLAG_DEPRECATED_12); @@ -2646,7 +2646,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) ob->shapeflag &= ~OB_SHAPE_FLAG_DEPRECATED_1; } - for (Mesh *me = bmain->mesh.first; me; me = me->id.next) { + for (Mesh *me = bmain->meshes.first; me; me = me->id.next) { me->flag &= ~( ME_FLAG_DEPRECATED_0 | ME_FLAG_DEPRECATED_1 | @@ -2657,7 +2657,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) ME_FLAG_DEPRECATED_8); } - for (Material *mat = bmain->mat.first; mat; mat = mat->id.next) { + for (Material *mat = bmain->materials.first; mat; mat = mat->id.next) { mat->blend_flag &= ~( MA_BL_FLAG_DEPRECATED_2); } @@ -2665,13 +2665,13 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 40)) { if (!DNA_struct_elem_find(fd->filesdna, "ToolSettings", "char", "snap_transform_mode_flag")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { scene->toolsettings->snap_transform_mode_flag = SCE_SNAP_TRANSFORM_MODE_TRANSLATE; } } - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.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) { switch (sl->spacetype) { @@ -2691,7 +2691,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_find(fd->filesdna, "TransformOrientationSlot")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { for (int i = 0; i < ARRAY_SIZE(scene->orientation_slots); i++) { scene->orientation_slots[i].index_custom = -1; } @@ -2700,7 +2700,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) /* Grease pencil target weight */ if (!DNA_struct_elem_find(fd->filesdna, "GP_Sculpt_Settings", "float", "weight")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { /* sculpt brushes */ GP_Sculpt_Settings *gset = &scene->toolsettings->gp_sculpt; if (gset) { @@ -2714,7 +2714,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) /* Grease pencil cutter/select segment intersection threshold */ if (!DNA_struct_elem_find(fd->filesdna, "GP_Sculpt_Settings", "float", "isect_threshold")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { GP_Sculpt_Settings *gset = &scene->toolsettings->gp_sculpt; if (gset) { gset->isect_threshold = 0.1f; @@ -2723,13 +2723,13 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } /* Fix anamorphic bokeh eevee rna limits.*/ - for (Camera *ca = bmain->camera.first; ca; ca = ca->id.next) { + for (Camera *ca = bmain->cameras.first; ca; ca = ca->id.next) { if (ca->gpu_dof.ratio < 0.01f) { ca->gpu_dof.ratio = 0.01f; } } - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.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_USERPREF) { @@ -2762,12 +2762,12 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 44)) { if (!DNA_struct_elem_find(fd->filesdna, "Material", "float", "a")) { - for (Material *mat = bmain->mat.first; mat; mat = mat->id.next) { + for (Material *mat = bmain->materials.first; mat; mat = mat->id.next) { mat->a = 1.0f; } } - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { enum { R_ALPHAKEY = 2, }; @@ -2788,7 +2788,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 280, 45)) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.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_SEQ) { @@ -2803,7 +2803,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 46)) { /* Add wireframe color. */ if (!DNA_struct_elem_find(fd->filesdna, "View3DShading", "char", "wire_color_type")) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -2816,7 +2816,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!DNA_struct_elem_find(fd->filesdna, "View3DCursor", "short", "rotation_mode")) { - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { if (is_zero_v3(scene->cursor.rotation_axis)) { scene->cursor.rotation_mode = ROT_MODE_XYZ; scene->cursor.rotation_quaternion[0] = 1.0f; @@ -2827,14 +2827,14 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 280, 47)) { - LISTBASE_FOREACH (Scene *, scene, &bmain->scene) { + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { ParticleEditSettings *pset = &scene->toolsettings->particle; if (pset->brushtype < 0) { pset->brushtype = PE_BRUSH_COMB; } } - LISTBASE_FOREACH (Object *, ob, &bmain->object) { + LISTBASE_FOREACH (Object *, ob, &bmain->objects) { { enum { PARCURVE = 1, PARKEY = 2, PAR_DEPRECATED = 16}; if (ELEM(ob->partype, PARCURVE, PARKEY, PAR_DEPRECATED)) { @@ -2859,7 +2859,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) ob->nlaflag &= ~(OB_ADS_DEPRECATED_1 | OB_ADS_DEPRECATED_2); } - LISTBASE_FOREACH (bArmature *, arm, &bmain->armature) { + LISTBASE_FOREACH (bArmature *, arm, &bmain->armatures) { arm->flag &= ~( ARM_FLAG_DEPRECATED_1 | ARM_FLAG_DEPRECATED_5 | @@ -2867,7 +2867,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) ARM_FLAG_DEPRECATED_12); } - LISTBASE_FOREACH (Text *, text, &bmain->text) { + LISTBASE_FOREACH (Text *, text, &bmain->texts) { enum { TXT_READONLY = 1 << 8, TXT_FOLLOW = 1 << 9}; text->flags &= ~(TXT_READONLY | TXT_FOLLOW); } diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index 4a49dddfd2c..1f8bf3724db 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -140,7 +140,7 @@ static ID *rename_id_for_versioning(Main *bmain, const short id_type, const char void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template) { /* For all startup.blend files. */ - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) { /* Remove all stored panels, we want to use defaults (order, open/closed) as defined by UI code here! */ @@ -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->workspace.first; workspace; workspace = workspace->id.next) { + for (WorkSpace *workspace = bmain->workspaces.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); @@ -202,7 +202,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template) { /* 'UV Editing' should use UV mode. */ - bScreen *screen = BLI_findstring(&bmain->screen, "UV Editing", offsetof(ID, name) + 2); + bScreen *screen = BLI_findstring(&bmain->screens, "UV Editing", offsetof(ID, name) + 2); for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_IMAGE) { @@ -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->workspace.first; workspace; workspace = workspace->id.next) { + for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) { const char *name = workspace->id.name + 2; if (STREQ(name, "Drawing")) { @@ -226,7 +226,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template) } } /* set object in drawing mode */ - for (Object *object = bmain->object.first; object; object = object->id.next) { + for (Object *object = bmain->objects.first; object; object = object->id.next) { if (object->type == OB_GPENCIL) { bGPdata *gpd = (bGPdata *)object->data; object->mode = OB_MODE_PAINT_GPENCIL; @@ -236,7 +236,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template) } /* Be sure curfalloff and primitive are initializated */ - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { ToolSettings *ts = scene->toolsettings; if (ts->gp_sculpt.cur_falloff == NULL) { ts->gp_sculpt.cur_falloff = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); @@ -271,13 +271,13 @@ 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->workspace.first; workspace; workspace = workspace->id.next) { + for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) { while (!BLI_listbase_is_empty(&workspace->tools)) { BKE_workspace_tool_remove(workspace, workspace->tools.first); } } - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { /* Hide channels in timelines. */ for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { SpaceAction *saction = (sa->spacetype == SPACE_ACTION) ? sa->spacedata.first : NULL; @@ -292,7 +292,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template) } } - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { BLI_strncpy(scene->r.engine, RE_engine_id_BLENDER_EEVEE, sizeof(scene->r.engine)); scene->r.cfra = 1.0f; @@ -330,13 +330,13 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template) rename_id_for_versioning(bmain, ID_OB, "Light", "Light"); rename_id_for_versioning(bmain, ID_LA, "Light", "Light"); - for (Mesh *mesh = bmain->mesh.first; mesh; mesh = mesh->id.next) { + for (Mesh *mesh = bmain->meshes.first; mesh; mesh = mesh->id.next) { /* Match default for new meshes. */ mesh->smoothresh = DEG2RADF(30); } } - for (bScreen *sc = bmain->screen.first; sc; sc = sc->id.next) { + for (bScreen *sc = bmain->screens.first; sc; sc = sc->id.next) { for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { @@ -347,7 +347,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template) } } - for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { copy_v3_v3(scene->display.light_direction, (float[3]){M_SQRT1_3, M_SQRT1_3, M_SQRT1_3}); copy_v2_fl2(scene->safe_areas.title, 0.1f, 0.05f); copy_v2_fl2(scene->safe_areas.action, 0.035f, 0.035f); diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index 9f26ddf4ffd..5d7905b200e 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -479,7 +479,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile == 100) { /* tex->extend and tex->imageflag have changed: */ - Tex *tex = bmain->tex.first; + Tex *tex = bmain->textures.first; while (tex) { if (tex->id.tag & LIB_TAG_NEED_LINK) { @@ -500,7 +500,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile <= 101) { /* frame mapping */ - Scene *sce = bmain->scene.first; + Scene *sce = bmain->scenes.first; while (sce) { sce->r.framapto = 100; sce->r.images = 100; @@ -511,7 +511,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile <= 103) { /* new variable in object: colbits */ - Object *ob = bmain->object.first; + Object *ob = bmain->objects.first; int a; while (ob) { ob->colbits = 0; @@ -527,7 +527,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile <= 104) { /* timeoffs moved */ - Object *ob = bmain->object.first; + Object *ob = bmain->objects.first; while (ob) { if (ob->transflag & 1) { ob->transflag -= 1; @@ -538,7 +538,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile <= 106) { /* mcol changed */ - Mesh *me = bmain->mesh.first; + Mesh *me = bmain->meshes.first; while (me) { if (me->mcol) vcol_to_fcol(me); @@ -549,7 +549,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile <= 107) { Object *ob; - ob = bmain->object.first; + ob = bmain->objects.first; while (ob) { if (ob->dt == 0) ob->dt = OB_SOLID; @@ -560,7 +560,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile <= 109) { /* new variable: gridlines */ - bScreen *sc = bmain->screen.first; + bScreen *sc = bmain->screens.first; while (sc) { ScrArea *sa = sc->areabase.first; while (sa) { @@ -581,7 +581,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } if (bmain->versionfile <= 134) { - Tex *tex = bmain->tex.first; + Tex *tex = bmain->textures.first; while (tex) { if ((tex->rfac == 0.0f) && (tex->gfac == 0.0f) && @@ -598,7 +598,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile <= 140) { /* r-g-b-fac in texture */ - Tex *tex = bmain->tex.first; + Tex *tex = bmain->textures.first; while (tex) { if ((tex->rfac == 0.0f) && (tex->gfac == 0.0f) && @@ -614,7 +614,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } if (bmain->versionfile <= 153) { - Scene *sce = bmain->scene.first; + Scene *sce = bmain->scenes.first; while (sce) { if (sce->r.blurfac == 0.0f) sce->r.blurfac = 1.0f; @@ -623,7 +623,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } if (bmain->versionfile <= 163) { - Scene *sce = bmain->scene.first; + Scene *sce = bmain->scenes.first; while (sce) { if (sce->r.frs_sec == 0) sce->r.frs_sec = 25; @@ -632,7 +632,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } if (bmain->versionfile <= 164) { - Mesh *me = bmain->mesh.first; + Mesh *me = bmain->meshes.first; while (me) { me->smoothresh = 30; me = me->id.next; @@ -640,7 +640,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } if (bmain->versionfile <= 165) { - Mesh *me = bmain->mesh.first; + Mesh *me = bmain->meshes.first; TFace *tface; int nr; char *cp; @@ -667,7 +667,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } if (bmain->versionfile <= 169) { - Mesh *me = bmain->mesh.first; + Mesh *me = bmain->meshes.first; while (me) { if (me->subdiv == 0) me->subdiv = 1; @@ -676,7 +676,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } if (bmain->versionfile <= 169) { - bScreen *sc = bmain->screen.first; + bScreen *sc = bmain->screens.first; while (sc) { ScrArea *sa = sc->areabase.first; while (sa) { @@ -695,7 +695,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } if (bmain->versionfile <= 170) { - Object *ob = bmain->object.first; + Object *ob = bmain->objects.first; PartEff *paf; while (ob) { paf = blo_do_version_give_parteff_245(ob); @@ -709,7 +709,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } if (bmain->versionfile <= 171) { - bScreen *sc = bmain->screen.first; + bScreen *sc = bmain->screens.first; while (sc) { ScrArea *sa = sc->areabase.first; while (sa) { @@ -729,7 +729,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile <= 173) { int a, b; - Mesh *me = bmain->mesh.first; + Mesh *me = bmain->meshes.first; while (me) { if (me->tface) { TFace *tface = me->tface; @@ -747,7 +747,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile <= 204) { bSound *sound; - sound = bmain->sound.first; + sound = bmain->sounds.first; while (sound) { if (sound->volume < 0.01f) { sound->volume = 1.0f; @@ -760,7 +760,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) bSound *sound; Mesh *me; - sound = bmain->sound.first; + sound = bmain->sounds.first; while (sound) { sound->max_gain = 1.0; sound->min_gain = 0.0; @@ -779,7 +779,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) * it a subsurf, and reset the subdiv level because subsurf * takes a lot more work to calculate. */ - for (me = bmain->mesh.first; me; me = me->id.next) { + for (me = bmain->meshes.first; me; me = me->id.next) { enum { ME_SMESH = (1 << 6), ME_SUBSURF = (1 << 7), @@ -806,7 +806,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) * old file vertex colors are undefined, reset them * to be fully opaque. -zr */ - for (me = bmain->mesh.first; me; me = me->id.next) { + for (me = bmain->meshes.first; me; me = me->id.next) { if (me->mcol) { int i; @@ -833,7 +833,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile <= 223) { VFont *vf; - for (vf = bmain->vfont.first; vf; vf = vf->id.next) { + for (vf = bmain->fonts.first; vf; vf = vf->id.next) { if (STREQ(vf->name + strlen(vf->name) - 6, ".Bfont")) { strcpy(vf->name, FO_BUILTIN_NAME); } @@ -846,7 +846,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) Mesh *me; bScreen *sc; - for (sound = bmain->sound.first; sound; sound = sound->id.next) { + for (sound = bmain->sounds.first; sound; sound = sound->id.next) { if (sound->packedfile) { if (sound->newpackedfile == NULL) { sound->newpackedfile = sound->packedfile; @@ -855,19 +855,19 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } } /* Make sure that old subsurf meshes don't have zero subdivision level for rendering */ - for (me = bmain->mesh.first; me; me = me->id.next) { + for (me = bmain->meshes.first; me; me = me->id.next) { enum { ME_SUBSURF = (1 << 7) }; if ((me->flag & ME_SUBSURF) && (me->subdivr == 0)) { me->subdivr = me->subdiv; } } - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { sce->r.stereomode = 1; // no stereo } /* some oldfile patch, moved from set_func_space */ - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { @@ -891,7 +891,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) /* As of now, this insures that the transition from the old Track system * to the new full constraint Track is painless for everyone. - theeth */ - ob = bmain->object.first; + ob = bmain->objects.first; while (ob) { ListBase *list; @@ -934,13 +934,13 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) ob = ob->id.next; } - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { sce->audio.mixrate = 48000; sce->audio.flag |= AUDIO_SCRUB; } /* patch for old wrong max view2d settings, allows zooming out more */ - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { @@ -967,7 +967,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) /* As of now, this insures that the transition from the old Track system * to the new full constraint Track is painless for everyone. */ - ob = bmain->object.first; + ob = bmain->objects.first; while (ob) { ListBase *list; @@ -1007,7 +1007,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } /* convert old mainb values for new button panels */ - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { @@ -1077,7 +1077,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) bScreen *sc; /* new variable blockscale, for panels in any area */ - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { @@ -1095,7 +1095,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } if (bmain->versionfile <= 231) { - bScreen *sc = bmain->screen.first; + bScreen *sc = bmain->screens.first; /* new bit flags for showing/hiding grid floor and axes */ @@ -1123,8 +1123,8 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } if (bmain->versionfile <= 232) { - Tex *tex = bmain->tex.first; - World *wrld = bmain->world.first; + Tex *tex = bmain->textures.first; + World *wrld = bmain->worlds.first; bScreen *sc; while (tex) { @@ -1161,7 +1161,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) /* new variable blockscale, for panels in any area, do again because new * areas didnt initialize it to 0.7 yet */ - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { SpaceLink *sl; @@ -1179,7 +1179,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile <= 233) { bScreen *sc; - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { SpaceLink *sl; @@ -1196,7 +1196,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile <= 234) { bScreen *sc; - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { SpaceLink *sl; @@ -1212,8 +1212,8 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } if (bmain->versionfile <= 235) { - Tex *tex = bmain->tex.first; - Scene *sce = bmain->scene.first; + Tex *tex = bmain->textures.first; + Scene *sce = bmain->scenes.first; Sequence *seq; Editing *ed; @@ -1238,7 +1238,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile <= 236) { Object *ob; - Camera *cam = bmain->camera.first; + Camera *cam = bmain->cameras.first; while (cam) { if (cam->ortho_scale == 0.0f) { @@ -1252,7 +1252,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) /* set time line var */ /* softbody init new vars */ - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->soft) { if (ob->soft->defgoal == 0.0f) ob->soft->defgoal = 0.7f; @@ -1282,13 +1282,13 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) Bone *bone; /* armature recode checks */ - for (arm = bmain->armature.first; arm; arm = arm->id.next) { + for (arm = bmain->armatures.first; arm; arm = arm->id.next) { BKE_armature_where_is(arm); for (bone = arm->bonebase.first; bone; bone = bone->next) do_version_bone_head_tail_237(bone); } - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->parent) { Object *parent = blo_do_versions_newlibadr(fd, lib, ob->parent); if (parent && parent->type == OB_LATTICE) @@ -1362,7 +1362,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) bArmature *arm; Mesh *me; Key *key; - Scene *sce = bmain->scene.first; + Scene *sce = bmain->scenes.first; while (sce) { if (sce->toolsettings == NULL) { @@ -1372,7 +1372,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) sce = sce->id.next; } - for (lt = bmain->lattice.first; lt; lt = lt->id.next) { + for (lt = bmain->lattices.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); @@ -1380,7 +1380,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } } - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; PartEff *paf; @@ -1447,12 +1447,12 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } } - for (arm = bmain->armature.first; arm; arm = arm->id.next) { + for (arm = bmain->armatures.first; arm; arm = arm->id.next) { bone_version_238(&arm->bonebase); arm->deformflag |= ARM_DEF_VGROUP; } - for (me = bmain->mesh.first; me; me = me->id.next) { + for (me = bmain->meshes.first; me; me = me->id.next) { if (!me->medge) { BKE_mesh_calc_edges_legacy(me, true); /* true = use mface->edcode */ } @@ -1461,7 +1461,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } } - for (key = bmain->key.first; key; key = key->id.next) { + for (key = bmain->shapekeys.first; key; key = key->id.next) { KeyBlock *kb; int index = 1; @@ -1483,12 +1483,12 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile <= 239) { bArmature *arm; Object *ob; - Scene *sce = bmain->scene.first; - Camera *cam = bmain->camera.first; + Scene *sce = bmain->scenes.first; + Camera *cam = bmain->cameras.first; int set_passepartout = 0; /* deformflag is local in modifier now */ - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; for (md = ob->modifiers.first; md; md = md->next) { @@ -1504,7 +1504,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } /* updating stepsize for ghost drawing */ - for (arm = bmain->armature.first; arm; arm = arm->id.next) { + for (arm = bmain->armatures.first; arm; arm = arm->id.next) { bone_version_239(&arm->bonebase); if (arm->layer == 0) arm->layer = 1; @@ -1539,12 +1539,12 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) bNodeTree *ntree; /* updating layers still */ - for (arm = bmain->armature.first; arm; arm = arm->id.next) { + for (arm = bmain->armatures.first; arm; arm = arm->id.next) { bone_version_239(&arm->bonebase); if (arm->layer == 0) arm->layer = 1; } - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { if (sce->audio.mixrate == 0) sce->audio.mixrate = 48000; @@ -1571,15 +1571,15 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } } - for (ntree = bmain->nodetree.first; ntree; ntree = ntree->id.next) + for (ntree = bmain->nodetrees.first; ntree; ntree = ntree->id.next) ntree_version_241(ntree); - for (la = bmain->light.first; la; la = la->id.next) + for (la = bmain->lights.first; la; la = la->id.next) if (la->buffers == 0) la->buffers = 1; /* for empty drawsize and drawtype */ - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->empty_drawsize == 0.0f) { ob->empty_drawtype = OB_ARROWS; ob->empty_drawsize = 1.0; @@ -1589,7 +1589,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) /* during 2.41 images with this name were used for viewer node output, lets fix that */ if (bmain->versionfile == 241) { Image *ima; - for (ima = bmain->image.first; ima; ima = ima->id.next) { + for (ima = bmain->images.first; ima; ima = ima->id.next) { if (STREQ(ima->name, "Compositor")) { strcpy(ima->id.name + 2, "Viewer Node"); strcpy(ima->name, "Viewer Node"); @@ -1612,7 +1612,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) bNodeTree *ntree; int a; - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; sa = sc->areabase.first; while (sa) { @@ -1629,7 +1629,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } } - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { enum { R_THREADS = (1 << 19), }; @@ -1645,11 +1645,11 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) ntree_version_242(sce->nodetree); } - for (ntree = bmain->nodetree.first; ntree; ntree = ntree->id.next) + for (ntree = bmain->nodetrees.first; ntree; ntree = ntree->id.next) ntree_version_242(ntree); /* add default radius values to old curve points */ - for (cu = bmain->curve.first; cu; cu = cu->id.next) { + for (cu = bmain->curves.first; cu; cu = cu->id.next) { for (nu = cu->nurb.first; nu; nu = nu->next) { if (nu) { if (nu->bezt) { @@ -1668,7 +1668,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } } - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ModifierData *md; ListBase *list; list = &ob->constraints; @@ -1756,15 +1756,15 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } - for (ma = bmain->mat.first; ma; ma = ma->id.next) { + for (ma = bmain->materials.first; ma; ma = ma->id.next) { if (ma->nodetree) ntree_version_242(ma->nodetree); } - for (me = bmain->mesh.first; me; me = me->id.next) + for (me = bmain->meshes.first; me; me = me->id.next) customdata_version_242(me); - for (collection = bmain->collection.first; collection; collection = collection->id.next) + for (collection = bmain->collections.first; collection; collection = collection->id.next) if (collection->layer == 0) collection->layer = (1 << 20) - 1; @@ -1774,7 +1774,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) Tex *tex; /* Image refactor initialize */ - for (ima = bmain->image.first; ima; ima = ima->id.next) { + for (ima = bmain->images.first; ima; ima = ima->id.next) { ima->source = IMA_SRC_FILE; ima->type = IMA_TYPE_IMAGE; @@ -1791,7 +1791,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } } - for (tex = bmain->tex.first; tex; tex = tex->id.next) { + for (tex = bmain->textures.first; tex; tex = tex->id.next) { enum { TEX_ANIMCYCLIC = (1 << 6), TEX_ANIM5 = (1 << 7), @@ -1808,19 +1808,19 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) tex->iuser.sfra = tex->sfra; tex->iuser.cycl = (tex->imaflag & TEX_ANIMCYCLIC) != 0; } - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { if (sce->nodetree) do_version_ntree_242_2(sce->nodetree); } - for (ntree = bmain->nodetree.first; ntree; ntree = ntree->id.next) + for (ntree = bmain->nodetrees.first; ntree; ntree = ntree->id.next) do_version_ntree_242_2(ntree); - for (ma = bmain->mat.first; ma; ma = ma->id.next) + for (ma = bmain->materials.first; ma; ma = ma->id.next) if (ma->nodetree) do_version_ntree_242_2(ma->nodetree); } if (bmain->subversionfile < 4) { - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { sce->r.bake_mode = 1; /* prevent to include render stuff here */ sce->r.bake_filter = 16; sce->r.bake_flag = R_BAKE_CLEAR; @@ -1829,7 +1829,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } if (bmain->versionfile <= 243) { - Object *ob = bmain->object.first; + Object *ob = bmain->objects.first; for (; ob; ob = ob->id.next) { bDeformGroup *curdef; @@ -1870,7 +1870,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) /* render layer added, this is not the active layer */ if (bmain->versionfile <= 243 || bmain->subversionfile < 2) { Mesh *me; - for (me = bmain->mesh.first; me; me = me->id.next) + for (me = bmain->meshes.first; me; me = me->id.next) customdata_version_243(me); } @@ -1881,7 +1881,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile != 244 || bmain->subversionfile < 2) { /* correct older action editors - incorrect scrolling */ - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; sa = sc->areabase.first; while (sa) { @@ -1921,7 +1921,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if (!(bmain->versionfile == 244 && bmain->subversionfile == 3) && ((bmain->versionfile < 245) || (bmain->versionfile == 245 && bmain->subversionfile == 0)) ) { - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { ListBase *list; list = &ob->constraints; @@ -1991,13 +1991,13 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile != 245) { /* repair preview from 242 - 244*/ - for (ima = bmain->image.first; ima; ima = ima->id.next) { + for (ima = bmain->images.first; ima; ima = ima->id.next) { ima->preview = NULL; } } /* add point caches */ - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->soft && !ob->soft->pointcache) ob->soft->pointcache = BKE_ptcache_add(&ob->soft->ptcaches); @@ -2025,7 +2025,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) /* Copy over old per-level multires vertex data * into a single vertex array in struct Multires */ - for (me = bmain->mesh.first; me; me = me->id.next) { + for (me = bmain->meshes.first; me; me = me->id.next) { if (me->mr && !me->mr->verts) { MultiresLevel *lvl = me->mr->levels.last; if (lvl) { @@ -2041,7 +2041,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } if (bmain->versionfile != 245 || bmain->subversionfile < 1) { - for (la = bmain->light.first; la; la = la->id.next) { + for (la = bmain->lights.first; la; la = la->id.next) { la->falloff_type = LA_FALLOFF_INVLINEAR; if (la->curfalloff == NULL) { @@ -2051,18 +2051,18 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } } - for (ma = bmain->mat.first; ma; ma = ma->id.next) { + for (ma = bmain->materials.first; ma; ma = ma->id.next) { if (ma->gloss_mir == 0.0f) { ma->gloss_mir = 1.0f; } } - for (part = bmain->particle.first; part; part = part->id.next) { + for (part = bmain->particles.first; part; part = part->id.next) { if (part->ren_child_nbr == 0) part->ren_child_nbr = part->child_nbr; } - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { if (sce->nodetree) ntree_version_245(fd, lib, sce->nodetree); @@ -2072,18 +2072,18 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } } - for (ntree = bmain->nodetree.first; ntree; ntree = ntree->id.next) + for (ntree = bmain->nodetrees.first; ntree; ntree = ntree->id.next) ntree_version_245(fd, lib, ntree); /* fix for temporary flag changes during 245 cycle */ - for (ima = bmain->image.first; ima; ima = ima->id.next) { + for (ima = bmain->images.first; ima; ima = ima->id.next) { if (ima->flag & IMA_OLD_PREMUL) { ima->flag &= ~IMA_OLD_PREMUL; ima->alpha_mode = IMA_ALPHA_STRAIGHT; } } - for (tex = bmain->tex.first; tex; tex = tex->id.next) { + for (tex = bmain->textures.first; tex; tex = tex->id.next) { if (tex->iuser.flag & IMA_OLD_PREMUL) { tex->iuser.flag &= ~IMA_OLD_PREMUL; } @@ -2100,7 +2100,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) Image *ima; /* initialize 1:1 Aspect */ - for (ima = bmain->image.first; ima; ima = ima->id.next) { + for (ima = bmain->images.first; ima; ima = ima->id.next) { ima->aspx = ima->aspy = 1.0f; } } @@ -2110,10 +2110,10 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) ModifierData *md; Object *ob; - for (arm = bmain->armature.first; arm; arm = arm->id.next) + for (arm = bmain->armatures.first; arm; arm = arm->id.next) arm->deformflag |= ARM_DEF_B_BONE_REST; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Armature) ((ArmatureModifierData *)md)->deformflag |= ARM_DEF_B_BONE_REST; @@ -2124,7 +2124,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if ((bmain->versionfile < 245) || (bmain->versionfile == 245 && bmain->subversionfile < 5)) { /* foreground color needs to be something other then black */ Scene *sce; - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { sce->r.fg_stamp[0] = sce->r.fg_stamp[1] = sce->r.fg_stamp[2] = 0.8f; sce->r.fg_stamp[3] = 1.0f; /* don't use text alpha yet */ sce->r.bg_stamp[3] = 0.25f; /* make sure the background has full alpha */ @@ -2135,7 +2135,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if ((bmain->versionfile < 245) || (bmain->versionfile == 245 && bmain->subversionfile < 6)) { Scene *sce; /* fix frs_sec_base */ - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { if (sce->r.frs_sec_base == 0) { sce->r.frs_sec_base = 1; } @@ -2146,7 +2146,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) Object *ob; bPoseChannel *pchan; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->pose) { for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) { do_version_constraints_245(&pchan->constraints); @@ -2176,7 +2176,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) Object *ob; PartEff *paf = NULL; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->soft && ob->soft->keys) { SoftBody *sb = ob->soft; int k; @@ -2283,7 +2283,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) /* dupliobjects */ if (ob->transflag & OB_DUPLIVERTS) { - Object *dup = bmain->object.first; + Object *dup = bmain->objects.first; for (; dup; dup = dup->id.next) { if (ob == blo_do_versions_newlibadr(fd, lib, dup->parent)) { @@ -2311,7 +2311,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } } - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { ParticleEditSettings *pset = &sce->toolsettings->particle; int a; @@ -2336,7 +2336,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) Object *ob; /* dupliface scale */ - for (ob = bmain->object.first; ob; ob = ob->id.next) + for (ob = bmain->objects.first; ob; ob = ob->id.next) ob->instance_faces_scale = 1.0f; } @@ -2345,7 +2345,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) bActionStrip *strip; /* nla-strips - scale */ - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { for (strip = ob->nlastrips.first; strip; strip = strip->next) { float length, actlength, repeat; @@ -2374,7 +2374,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) Scene *sce; Sequence *seq; - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { SEQ_BEGIN (sce->ed, seq) { if (seq->blend_mode == 0) @@ -2385,38 +2385,38 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) /* fix broken group lengths in id properties */ if ((bmain->versionfile < 245) || (bmain->versionfile == 245 && bmain->subversionfile < 15)) { - idproperties_fix_group_lengths(bmain->scene); - idproperties_fix_group_lengths(bmain->library); - idproperties_fix_group_lengths(bmain->object); - idproperties_fix_group_lengths(bmain->mesh); - idproperties_fix_group_lengths(bmain->curve); - idproperties_fix_group_lengths(bmain->mball); - idproperties_fix_group_lengths(bmain->mat); - idproperties_fix_group_lengths(bmain->tex); - idproperties_fix_group_lengths(bmain->image); - idproperties_fix_group_lengths(bmain->lattice); - idproperties_fix_group_lengths(bmain->light); - idproperties_fix_group_lengths(bmain->camera); + idproperties_fix_group_lengths(bmain->scenes); + idproperties_fix_group_lengths(bmain->libraries); + idproperties_fix_group_lengths(bmain->objects); + idproperties_fix_group_lengths(bmain->meshes); + idproperties_fix_group_lengths(bmain->curves); + idproperties_fix_group_lengths(bmain->metaballs); + idproperties_fix_group_lengths(bmain->materials); + idproperties_fix_group_lengths(bmain->textures); + idproperties_fix_group_lengths(bmain->images); + idproperties_fix_group_lengths(bmain->lattices); + idproperties_fix_group_lengths(bmain->lights); + idproperties_fix_group_lengths(bmain->cameras); idproperties_fix_group_lengths(bmain->ipo); - idproperties_fix_group_lengths(bmain->key); - idproperties_fix_group_lengths(bmain->world); - idproperties_fix_group_lengths(bmain->screen); - idproperties_fix_group_lengths(bmain->vfont); - idproperties_fix_group_lengths(bmain->text); - idproperties_fix_group_lengths(bmain->sound); - idproperties_fix_group_lengths(bmain->collection); - idproperties_fix_group_lengths(bmain->armature); - idproperties_fix_group_lengths(bmain->action); - idproperties_fix_group_lengths(bmain->nodetree); - idproperties_fix_group_lengths(bmain->brush); - idproperties_fix_group_lengths(bmain->particle); + idproperties_fix_group_lengths(bmain->shapekeys); + idproperties_fix_group_lengths(bmain->worlds); + idproperties_fix_group_lengths(bmain->screens); + idproperties_fix_group_lengths(bmain->fonts); + idproperties_fix_group_lengths(bmain->texts); + idproperties_fix_group_lengths(bmain->sounds); + idproperties_fix_group_lengths(bmain->collections); + idproperties_fix_group_lengths(bmain->armatures); + idproperties_fix_group_lengths(bmain->actions); + idproperties_fix_group_lengths(bmain->nodetrees); + idproperties_fix_group_lengths(bmain->brushes); + idproperties_fix_group_lengths(bmain->particles); } /* convert fluids to modifier */ if (bmain->versionfile < 246 || (bmain->versionfile == 246 && bmain->subversionfile < 1)) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->fluidsimSettings) { FluidsimModifierData *fluidmd = (FluidsimModifierData *)modifier_new(eModifierType_Fluidsim); BLI_addhead(&ob->modifiers, (ModifierData *)fluidmd); @@ -2435,7 +2435,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) if (bmain->versionfile < 246 || (bmain->versionfile == 246 && bmain->subversionfile < 1)) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->pd && (ob->pd->forcefield == PFIELD_WIND)) ob->pd->f_noise = 0.0f; } @@ -2446,7 +2446,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) Curve *cu; Nurb *nu; - for (cu = bmain->curve.first; cu; cu = cu->id.next) { + for (cu = bmain->curves.first; cu; cu = cu->id.next) { for (nu = cu->nurb.first; nu; nu = nu->next) { if (nu) { nu->radius_interp = 3; @@ -2468,7 +2468,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) Scene *sce; /* Note, these will need to be added for painting */ - for (sce = bmain->scene.first; sce; sce = sce->id.next) { + for (sce = bmain->scenes.first; sce; sce = sce->id.next) { sce->toolsettings->imapaint.seam_bleed = 2; sce->toolsettings->imapaint.normal_angle = 80; } @@ -2478,7 +2478,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) bScreen *sc; /* adjust default settings for Animation Editors */ - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { @@ -2515,7 +2515,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) /* correct introduce of seed for wind force */ if (bmain->versionfile < 249 && bmain->subversionfile < 1) { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->pd) ob->pd->seed = ((uint)(ceil(PIL_check_seconds_timer())) + 1) % 128; } @@ -2523,7 +2523,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) } if (bmain->versionfile < 249 && bmain->subversionfile < 2) { - Scene *sce = bmain->scene.first; + Scene *sce = bmain->scenes.first; Sequence *seq; Editing *ed; diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 4226b111d16..c2cd6f282e8 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1206,7 +1206,7 @@ static void write_renderinfo(WriteData *wd, Main *mainvar) /* XXX in future, handle multiple windows with multiple screens? */ current_screen_compat(mainvar, false, &curscreen, &curscene, &view_layer); - for (sce = mainvar->scene.first; sce; sce = sce->id.next) { + for (sce = mainvar->scenes.first; sce; sce = sce->id.next) { if (sce->id.lib == NULL && (sce == curscene || (sce->r.scemode & R_BG_RENDER))) { data.sfra = sce->r.sfra; data.efra = sce->r.efra; |