diff options
author | Bastien Montagne <bastien@blender.org> | 2020-08-20 11:37:11 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-08-20 11:39:28 +0300 |
commit | 341ff17326b6ec3f63c9c648c6e64e272f79a981 (patch) | |
tree | fcdc587e31674496da2248e25983b5c07fe4910f | |
parent | efa7aaa97f5c2a6073017a15f1b1d98fdc451ba5 (diff) |
Fix T79935: Inonsistent simplify behavior when linking collection with objects in sub-collection.
RNA update function would only update objects from 'main' instantiated
collection, not those from sub-collections.
This should be comitted to 2.90 (and backported to 2.83 too).
Maniphest Tasks: T79935
Differential Revision: https://developer.blender.org/D8654
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 3ec7963a81e..ec1a77c9520 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1883,11 +1883,10 @@ static void object_simplify_update(Object *ob) } if (ob->instance_collection) { - CollectionObject *cob; - - for (cob = ob->instance_collection->gobject.first; cob; cob = cob->next) { - object_simplify_update(cob->ob); + FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN (ob->instance_collection, ob_collection) { + object_simplify_update(ob_collection); } + FOREACH_COLLECTION_OBJECT_RECURSIVE_END; } } |