bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v2.81-release'

Browse Source
This commit is contained in:
Bastien Montagne 2019-11-08 17:48:30 +01:00
commit f0bee88443
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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. */
}
}
}