diff options
-rw-r--r-- | source/blender/blenkernel/intern/collection.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index 583bb39a851..eda2c6b01da 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -1138,7 +1138,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 |