blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

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.
This commit is contained in:
Bastien Montagne 2020-06-15 18:48:25 +02:00
parent 6a0ebb8088
commit 4db63b6486
Notes: blender-bot 2023-02-14 06:00:47 +01:00 
Referenced by issue #77910, Sometimes the Viewport is damaged.
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/collection.c
View File

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