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 <bastien@blender.org>2021-11-25 17:00:06 +0300
committerBastien Montagne <bastien@blender.org>2021-11-25 17:00:06 +0300
commite216660382e46935e8241e9c877c0b2914481da9 (patch)
treec823e3fc85c3667dc7d0df1726da6d171d60a97f /source/blender/blenkernel/intern/blendfile_link_append.c
parent2378f057a050fff02cd87df305c06178c23ed83b (diff)
parente253fb2143e2a8f1de331d17343d44671ab6e440 (diff)
Merge branch 'blender-v3.0-release'
Conflicts: source/blender/windowmanager/intern/wm_files_link.c
Diffstat (limited to 'source/blender/blenkernel/intern/blendfile_link_append.c')
-rw-r--r--source/blender/blenkernel/intern/blendfile_link_append.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/blendfile_link_append.c b/source/blender/blenkernel/intern/blendfile_link_append.c
index 36f03990953..c2bf3b4a5f9 100644
--- a/source/blender/blenkernel/intern/blendfile_link_append.c
+++ b/source/blender/blenkernel/intern/blendfile_link_append.c
@@ -1389,6 +1389,11 @@ void BKE_blendfile_library_relocate(BlendfileLinkAppendContext *lapp_context,
Main *bmain = lapp_context->params->bmain;
+ /* All override rules need to be up to date, since there will be no do_version here, otherwise
+ * older, now-invalid rules might be applied and likely fail, or some changes might be missing,
+ * etc. See T93353. */
+ BKE_lib_override_library_main_operations_create(bmain, true);
+
/* Remove all IDs to be reloaded from Main. */
lba_idx = set_listbasepointers(bmain, lbarray);
while (lba_idx--) {