Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2020-06-15 19:48:25 +0300
committerBastien Montagne <bastien@blender.org>2020-06-15 19:49:46 +0300
commit4db63b64864390a07851e74388527320feebeafb (patch)
tree8a3b298a888837e4fdbc7d368e5fab3fb002f7b3 /source/blender/blenkernel/intern/collection.c
parent6a0ebb80885be1b86588af57f989cafd9e64305d (diff)
Fix crash when opening some old/broken .blend files after recent fix.
Now that `BKE_main_collections_parent_relations_rebuild()` is called from readfile code, we need to make it resilient to potential NULL master collection pointer in scenes.
Diffstat (limited to 'source/blender/blenkernel/intern/collection.c')
-rw-r--r--source/blender/blenkernel/intern/collection.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 1928a6da0fa..ec9d3cac5a1 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -1261,7 +1261,11 @@ void BKE_main_collections_parent_relations_rebuild(Main *bmain)
/* Scene's master collections will be 'root' parent of most of our collections, so start with
* them. */
for (Scene *scene = bmain->scenes.first; scene != NULL; scene = scene->id.next) {
- collection_parents_rebuild_recursive(scene->master_collection);
+ /* This function can be called from readfile.c, when this pointer is not guaranteed to be NULL.
+ */
+ if (scene->master_collection != NULL) {
+ collection_parents_rebuild_recursive(scene->master_collection);
+ }
}
/* We may have parent chains outside of scene's master_collection context? At least, readfile's