From 5b9296f0d6d240d9d775f7cbe9a1e5f7706ad6dd Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 16 Oct 2020 15:22:20 +0200 Subject: Fix (reported by studio team) crash in relocate lib code. We do not always find a matching ID in new library. --- source/blender/windowmanager/intern/wm_files_link.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source/blender/windowmanager') 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) { -- cgit v1.2.3