blender
/
blender
130
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix (studio-reported) crash in collection management code. 

Code checking for potential collection loop dependencies can be called
in cases where we cannot guarantee that there is no NULL pointers, so we
need to check those. Was already done for objects.
This commit is contained in:
Bastien Montagne 2021-05-31 10:20:23 +02:00
parent 5f749a03ca
commit 421c0b45e5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1423,7 +1423,8 @@ static bool collection_instance_find_recursive(Collection *collection,
}
LISTBASE_FOREACH (CollectionChild *, collection_child, &collection->children) {
if (collection_instance_find_recursive(collection_child->collection, instance_collection)) {
if (collection_child->collection != NULL &&
collection_instance_find_recursive(collection_child->collection, instance_collection)) {
return true;
}
}