diff options
author | Bastien Montagne <bastien@blender.org> | 2020-10-16 16:22:20 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-10-16 16:22:20 +0300 |
commit | 5b9296f0d6d240d9d775f7cbe9a1e5f7706ad6dd (patch) | |
tree | 4211eb8e6cf8ec69aef219f15d42314019965b85 /source/blender/windowmanager/intern | |
parent | 6430849366a513b5b46cbfaf9ced5f723d95d9d6 (diff) |
Fix (reported by studio team) crash in relocate lib code.
We do not always find a matching ID in new library.
Diffstat (limited to 'source/blender/windowmanager/intern')
-rw-r--r-- | source/blender/windowmanager/intern/wm_files_link.c | 3 |
1 files changed, 3 insertions, 0 deletions
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) { |