diff options
author | Bastien Montagne <b.mont29@gmail.com> | 2019-11-08 19:48:30 +0300 |
---|---|---|
committer | Bastien Montagne <b.mont29@gmail.com> | 2019-11-08 19:48:30 +0300 |
commit | f0bee884439af6d5e840fda1f6b55da064f386b5 (patch) | |
tree | 28f637a92cb8d90a2bdabe0d8a1772df208a8e7f /source/blender/blenloader | |
parent | a67aa11b12ec27a1abb9badb513a516c8d90daf5 (diff) | |
parent | 8c695404a481488879eb811b04e126fcdb92a915 (diff) |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 452e75081d6..167917f7b6a 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2618,10 +2618,13 @@ static void lib_link_id(FileData *fd, Main *main) ID *id; for (id = lb->first; id; id = id->next) { - if (id->override_library) { - id->override_library->reference = newlibadr_us( - fd, id->lib, id->override_library->reference); - id->override_library->storage = newlibadr_us(fd, id->lib, id->override_library->storage); + if (id->tag & LIB_TAG_NEED_LINK) { + if (id->override_library) { + id->override_library->reference = newlibadr_us( + fd, id->lib, id->override_library->reference); + id->override_library->storage = newlibadr_us(fd, id->lib, id->override_library->storage); + } + /* DO NOT clear LIB_TAG_NEED_LINK here, it is used again by per-ID-type linkers. */ } } } |