blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Fix T91987: Linking overrides does not apply overrides rules. 

Just a matter of calling `BKE_lib_override_library_main_update` in
`library_link_end`.
This commit is contained in:
Bastien Montagne 2021-10-06 16:41:47 +02:00
parent b7dc0346aa
commit bbfa6a92cf
Notes: blender-bot 2023-02-14 04:40:22 +01:00 
Referenced by issue #91987, Linking overrides does not apply overrides rules.
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5040,7 +5040,6 @@ static void library_link_end(Main *mainl,
add_main_to_main(mainvar, main_newid);
}
BKE_main_free(main_newid);
blo_join_main((*fd)->mainlist);
mainvar = (*fd)->mainlist->first;
MEM_freeN((*fd)->mainlist);
@ -5054,6 +5053,15 @@ static void library_link_end(Main *mainl,
placeholders_ensure_valid(mainvar);
/* Apply overrides of newly linked data if needed. Already existing IDs need to split out, to
* avoid re-applying their own overrides. */
BLI_assert(BKE_main_is_empty(main_newid));
split_main_newid(mainvar, main_newid);
BKE_lib_override_library_main_validate(main_newid, (*fd)->reports->reports);
BKE_lib_override_library_main_update(main_newid);
add_main_to_main(mainvar, main_newid);
BKE_main_free(main_newid);
BKE_main_id_tag_all(mainvar, LIB_TAG_NEW, false);
/* Make all relative paths, relative to the open blend file. */