[Bf-blender-cvs] [7756973b0c3] blender2.8: Fix T57320: Crash when adding a linked scene, then deleting it.

Bastien Montagne noreply at git.blender.org
Sun Oct 21 17:23:48 CEST 2018


Commit: 7756973b0c35c5759db240158717d0f5bf0f45dc
Author: Bastien Montagne
Date:   Sun Oct 21 17:22:09 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB7756973b0c35c5759db240158717d0f5bf0f45dc

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...

===================================================================

M	source/blender/blenkernel/intern/library_remap.c

===================================================================

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;
 		}



More information about the Bf-blender-cvs mailing list