diff options
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 3c8e5b29bb1..16893d92634 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -577,7 +577,7 @@ void blo_split_main(ListBase *mainlist, Main *main) while (i--) { ID *id = lbarray[i]->first; if (id == NULL || GS(id->name) == ID_LI) { - /* No ID_LI datablock should ever be linked anyway, but just in case, better be explicit. */ + /* No ID_LI data-lock should ever be linked anyway, but just in case, better be explicit. */ continue; } split_libdata(lbarray[i], lib_main_array, lib_main_array_len); @@ -1722,7 +1722,7 @@ static void *newdataadr_no_us(FileData *fd, const void *adr) /* only direct data return oldnewmap_lookup_and_inc(fd->datamap, adr, false); } -static void *newglobadr(FileData *fd, const void *adr) /* direct datablocks with global linking */ +static void *newglobadr(FileData *fd, const void *adr) /* direct data-locks with global linking */ { return oldnewmap_lookup_and_inc(fd->globmap, adr, true); } @@ -2657,9 +2657,9 @@ static void direct_link_id(FileData *fd, ID *id) } id->py_instance = NULL; - /* That way datablock reading not going through main read_libblock() + /* That way data-lock reading not going through main read_libblock() * function are still in a clear tag state. - * (glowering at certain nodetree fake datablock here...). */ + * (glowering at certain nodetree fake data-lock here...). */ id->tag = 0; /* Link direct data of overrides. */ @@ -5033,8 +5033,8 @@ static void direct_link_mesh(FileData *fd, Mesh *mesh) mesh->adt = newdataadr(fd, mesh->adt); direct_link_animdata(fd, mesh->adt); - /* normally direct_link_dverts should be called in direct_link_customdata, - * but for backwards compat in do_versions to work we do it here */ + /* Normally direct_link_dverts should be called in direct_link_customdata, + * but for backwards compatibility in do_versions to work we do it here. */ direct_link_dverts(fd, mesh->totvert, mesh->dvert); direct_link_customdata(fd, &mesh->vdata, mesh->totvert); @@ -6083,7 +6083,7 @@ static void direct_link_layer_collections(FileData *fd, ListBase *lb, bool maste lc->scene_collection = newdataadr(fd, lc->scene_collection); #endif - /* Master collection is not a real datablock. */ + /* Master collection is not a real data-lock. */ if (master) { lc->collection = newdataadr(fd, lc->collection); } @@ -6117,7 +6117,7 @@ static void lib_link_layer_collection(FileData *fd, LayerCollection *layer_collection, bool master) { - /* Master collection is not a real datablock. */ + /* Master collection is not a real data-lock. */ if (!master) { layer_collection->collection = newlibadr(fd, lib, layer_collection->collection); } @@ -6981,7 +6981,7 @@ static void direct_link_scene(FileData *fd, Scene *sce) /* relink's grease pencil data's refs */ static void lib_link_gpencil(FileData *fd, Main *main) { - /* Relink all datablock linked by GP datablock */ + /* Relink all data-lock linked by GP data-lock */ for (bGPdata *gpd = main->gpencils.first; gpd; gpd = gpd->id.next) { if (gpd->id.tag & LIB_TAG_NEED_LINK) { /* Layers */ @@ -6990,7 +6990,7 @@ static void lib_link_gpencil(FileData *fd, Main *main) gpl->parent = newlibadr(fd, gpd->id.lib, gpl->parent); } - /* Datablock Stuff */ + /* Data-block Stuff */ IDP_LibLinkProperty(gpd->id.properties, fd); lib_link_animdata(fd, &gpd->id, gpd->adt); @@ -9123,7 +9123,7 @@ static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, const int ta /* this case cannot be direct_linked: it's just the ID part */ if (bhead->code == ID_LINK_PLACEHOLDER) { - /* That way, we know which datablock needs do_versions (required currently for linking). */ + /* That way, we know which data-lock needs do_versions (required currently for linking). */ id->tag = tag | LIB_TAG_NEED_LINK | LIB_TAG_NEW; return blo_bhead_next(fd, bhead); @@ -9138,7 +9138,7 @@ static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, const int ta /* init pointers direct data */ direct_link_id(fd, id); - /* That way, we know which datablock needs do_versions (required currently for linking). */ + /* That way, we know which data-lock needs do_versions (required currently for linking). */ /* Note: doing this after driect_link_id(), which resets that field. */ id->tag = tag | LIB_TAG_NEED_LINK | LIB_TAG_NEW; @@ -9918,7 +9918,7 @@ static void expand_doit_library(void *fdhandle, Main *mainvar, void *old) } if (bhead->code == ID_LINK_PLACEHOLDER) { - /* Placeholder link to datablock in another library. */ + /* Placeholder link to data-lock in another library. */ BHead *bheadlib = find_previous_lib(fd, bhead); if (bheadlib == NULL) { return; @@ -9964,7 +9964,7 @@ static void expand_doit_library(void *fdhandle, Main *mainvar, void *old) */ oldnewmap_insert(fd->libmap, bhead->old, id, bhead->code); - /* If "id" is a real datablock and not a placeholder, we need to + /* If "id" is a real data-lock and not a placeholder, we need to * update fd->libmap to replace ID_LINK_PLACEHOLDER with the real * ID_* code. * @@ -9984,7 +9984,7 @@ static void expand_doit_library(void *fdhandle, Main *mainvar, void *old) MEM_freeN(lib); } else { - /* Datablock in same library. */ + /* Data-block in same library. */ /* In 2.50+ file identifier for screens is patched, forward compatibility. */ if (bhead->code == ID_SCRN) { bhead->code = ID_SCR; @@ -11811,11 +11811,11 @@ static void read_libraries(FileData *basefd, ListBase *mainlist) do_it = true; } - /* Read linked datablocks for each link placeholder, and replace - * the placeholder with the real datablock. */ + /* Read linked data-locks for each link placeholder, and replace + * the placeholder with the real data-lock. */ read_library_linked_ids(basefd, fd, mainlist, mainptr); - /* Test if linked datablocks need to read further linked datablocks + /* Test if linked data-locks need to read further linked data-locks * and create link placeholders for them. */ BLO_expand_main(fd, mainptr); } @@ -11824,7 +11824,7 @@ static void read_libraries(FileData *basefd, ListBase *mainlist) Main *main_newid = BKE_main_new(); for (Main *mainptr = mainl->next; mainptr; mainptr = mainptr->next) { - /* Do versioning for newly added linked datablocks. If no datablocks + /* Do versioning for newly added linked data-locks. If no data-locks * were read from a library versionfile will still be zero and we can * skip it. */ if (mainptr->versionfile) { |