Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <b.mont29@gmail.com>2020-02-14 14:16:16 +0300
committerBastien Montagne <b.mont29@gmail.com>2020-02-14 14:18:21 +0300
commit38ced52d34328adf97ec30880ab49fbf53c13d46 (patch)
tree61d9aabbbf2b02e978315d5befee6fb968ec9c7d /source/blender/blenloader/intern
parent38c8378f529d08c9da587055a3b6173439d08bde (diff)
Fix minor issue with new libraries ID usercount.
Library data-blocks are supposed to be tagged as 'real user', i.e. have one virtual user, since nothing else actually uses (refcounts) them. That was done in liblink code, but not for newly added ID-LI IDs when linking from a new libblend file e.g.
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r--source/blender/blenloader/intern/readfile.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 93352a1ec90..48416736ce3 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -680,6 +680,9 @@ static Main *blo_find_main(FileData *fd, const char *filepath, const char *relab
/* Important, consistency with main ID reading code from read_libblock(). */
lib->id.us = ID_FAKE_USERS(lib);
+ /* Matches lib_link_library(). */
+ id_us_ensure_real(&lib->id);
+
BLI_strncpy(lib->name, filepath, sizeof(lib->name));
BLI_strncpy(lib->filepath, name1, sizeof(lib->filepath));