diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-07-26 10:59:45 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-07-26 11:00:20 +0300 |
| commit | c869f54dcb9fe8af1b20690e3c87f5cd9daafbc6 (patch) | |
| tree | 67785acad831fe4cefe71ce0a96e854b7052e51f /source/blender/blenloader | |
| parent | bdb4ebebf1fac82049ffaad70e0c62df675fe71c (diff) | |
Cleanup: Typo in comments: `data-lock` -> `data-block`.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index f0d390677bb..1ed0f2d5dfe 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -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) { |