diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-10-21 18:22:09 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-10-21 18:22:09 +0300 |
| commit | 7756973b0c35c5759db240158717d0f5bf0f45dc (patch) | |
| tree | d616d813d89b800a4faeb24ca825622905165f0f /source/blender/blenkernel | |
| parent | c989c5d37d53968aefd2912dd9994c35323d7059 (diff) | |
Fix T57320: Crash when adding a linked scene, then deleting it.
You want to check collections (for NULL children) first, before you
actually go into those children collections checking for NULL objects...
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/library_remap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c index a88eb87dd40..9e3001de572 100644 --- a/source/blender/blenkernel/intern/library_remap.c +++ b/source/blender/blenkernel/intern/library_remap.c @@ -634,8 +634,8 @@ void BKE_libblock_relink_ex( } else { /* No choice but to check whole objects/collections. */ - libblock_remap_data_postprocess_object_update(bmain, NULL, NULL); libblock_remap_data_postprocess_collection_update(bmain, NULL, NULL); + libblock_remap_data_postprocess_object_update(bmain, NULL, NULL); } break; } |