blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 762 Projects 19 Wiki Activity

Cleanup: Typo in comments: `data-lock` -> `data-block`.

This commit is contained in:
Bastien Montagne 2022-07-26 09:59:45 +02:00
parent bdb4ebebf1
commit c869f54dcb
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/gpencil.c
View File

@ -271,7 +271,7 @@ static void greasepencil_blend_read_lib(BlendLibReader *reader, ID *id)
{
bGPdata *gpd = (bGPdata *)id;
/* Relink all data-lock linked by GP data-lock */
/* Relink all data-block linked by GP data-block. */
/* Layers */
LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
/* Layer -> Parent References */

4
source/blender/blenkernel/intern/layer.c
View File

@ -2303,7 +2303,7 @@ static void direct_link_layer_collections(BlendDataReader *reader, ListBase *lb,
BLO_read_data_address(reader, &lc->scene_collection);
#endif
/* Master collection is not a real data-lock. */
/* Master collection is not a real data-block. */
if (master) {
BLO_read_data_address(reader, &lc->collection);
}
@ -2343,7 +2343,7 @@ static void lib_link_layer_collection(BlendLibReader *reader,
LayerCollection *layer_collection,
bool master)
{
/* Master collection is not a real data-lock. */
/* Master collection is not a real data-block. */
if (!master) {
BLO_read_id_address(reader, lib, &layer_collection->collection);
}

14
source/blender/blenloader/intern/readfile.c
View File

@ -517,7 +517,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 data-lock should ever be linked anyway, but just in case, better be explicit. */
/* No ID_LI data-block should ever be linked anyway, but just in case, better be explicit. */
continue;
}
split_libdata(lbarray[i], lib_main_array, lib_main_array_len);
@ -4175,7 +4175,7 @@ static void expand_doit_library(void *fdhandle, Main *mainvar, void *old)
}
if (bhead->code == ID_LINK_PLACEHOLDER) {
/* Placeholder link to data-lock in another library. */
/* Placeholder link to data-block in another library. */
BHead *bheadlib = find_previous_lib(fd, bhead);
if (bheadlib == NULL) {
return;
@ -4229,7 +4229,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 data-lock and not a placeholder, we need to
/* If "id" is a real data-block and not a placeholder, we need to
* update fd->libmap to replace ID_LINK_PLACEHOLDER with the real
* ID_* code.
*
@ -4890,11 +4890,11 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
}
}
/* Read linked data-locks for each link placeholder, and replace
* the placeholder with the real data-lock. */
/* Read linked data-blocks for each link placeholder, and replace
* the placeholder with the real data-block. */
read_library_linked_ids(basefd, fd, mainlist, mainptr);
/* Test if linked data-locks need to read further linked data-locks
/* Test if linked data-blocks need to read further linked data-blocks
* and create link placeholders for them. */
BLO_expand_main(fd, mainptr);
}
@ -4906,7 +4906,7 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
/* Drop weak links for which no data-block was found. */
read_library_clear_weak_links(basefd, mainlist, mainptr);
/* Do versioning for newly added linked data-locks. If no data-locks
/* Do versioning for newly added linked data-blocks. If no data-blocks
* were read from a library versionfile will still be zero and we can
* skip it. */
if (mainptr->versionfile) {