[Bf-blender-cvs] [5b9296f0d6d] master: Fix (reported by studio team) crash in relocate lib code.
Bastien Montagne
noreply at git.blender.org
Fri Oct 16 15:23:10 CEST 2020
Commit: 5b9296f0d6d240d9d775f7cbe9a1e5f7706ad6dd
Author: Bastien Montagne
Date: Fri Oct 16 15:22:20 2020 +0200
Branches: master
https://developer.blender.org/rB5b9296f0d6d240d9d775f7cbe9a1e5f7706ad6dd
Fix (reported by studio team) crash in relocate lib code.
We do not always find a matching ID in new library.
===================================================================
M source/blender/windowmanager/intern/wm_files_link.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c
index e97f4ed0fa6..cfbc037d19c 100644
--- a/source/blender/windowmanager/intern/wm_files_link.c
+++ b/source/blender/windowmanager/intern/wm_files_link.c
@@ -890,6 +890,9 @@ static void lib_relocate_do(Main *bmain,
ID *new_id = item->new_id;
lib_relocate_do_remap(bmain, old_id, new_id, reports, do_reload, remap_flags);
+ if (new_id == NULL) {
+ continue;
+ }
/* Usual special code for ShapeKeys snowflakes... */
Key **old_key_p = BKE_key_from_id_p(old_id);
if (old_key_p == NULL) {
More information about the Bf-blender-cvs
mailing list