diff options
author | Bastien Montagne <bastien@blender.org> | 2020-06-15 18:23:58 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-06-15 18:25:51 +0300 |
commit | eaff606f2dbbf99b09fac57f4034b70c53a398ef (patch) | |
tree | 23bd25a5ab53b3c3410a4b04191318977eab0607 /source/blender/blenkernel/intern/collection.c | |
parent | 89bde99674b50ad313f6b7d459f8293c4993ba06 (diff) |
Fix T77460: Easy to create cyclic dependencies in collections and crash Blender.
Cyclic check was not checking for collections instanciated by objects...
Diffstat (limited to 'source/blender/blenkernel/intern/collection.c')
-rw-r--r-- | source/blender/blenkernel/intern/collection.c | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index a9d3c7c1b65..1928a6da0fa 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -1070,6 +1070,26 @@ void BKE_collections_after_lib_link(Main *bmain) /********************** Collection Children *******************/ +static bool collection_find_instance_recursive(Collection *collection, + Collection *instance_collection) +{ + LISTBASE_FOREACH (CollectionObject *, collection_object, &collection->gobject) { + if (collection_object->ob != NULL && + /* Object from a given collection should never instanciate that collection either. */ + ELEM(collection_object->ob->instance_collection, instance_collection, collection)) { + return true; + } + } + + LISTBASE_FOREACH (CollectionChild *, collection_child, &collection->children) { + if (collection_find_instance_recursive(collection_child->collection, instance_collection)) { + return true; + } + } + + return false; +} + bool BKE_collection_find_cycle(Collection *new_ancestor, Collection *collection) { if (collection == new_ancestor) { @@ -1082,7 +1102,9 @@ bool BKE_collection_find_cycle(Collection *new_ancestor, Collection *collection) } } - return false; + /* Find possible objects in collection or its children, that would instanciate the given ancestor + * collection (that would also make a fully invalid cycle of dependencies) .*/ + return collection_find_instance_recursive(collection, new_ancestor); } static CollectionChild *collection_find_child(Collection *parent, Collection *collection) |