Fix T57320: Crash when adding a linked scene, then deleting it.
authorBastien Montagne <montagne29@wanadoo.fr>
Sun, 21 Oct 2018 15:22:09 +0000 (17:22 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Sun, 21 Oct 2018 15:22:09 +0000 (17:22 +0200)
You want to check collections (for NULL children) first, before you
actually go into those children collections checking for NULL objects...

source/blender/blenkernel/intern/library_remap.c

index a88eb87dd4003ea4d9057f16d370501920a267bd..9e3001de572bef3920b5ab49050aeaf08d6d7f0a 100644 (file)
@@ -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;
                }