blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

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
This commit is contained in:
Bastien Montagne 2020-08-20 10:37:11 +02:00
parent efa7aaa97f
commit 341ff17326
Notes: blender-bot 2023-02-14 08:06:33 +01:00 
Referenced by issue #79935, Inonsistent simplify behavior when linking collection with objects in sub-collection
Referenced by issue #79820, Simplify not working with object in sub-collection when is linked.
Referenced by issue #77348, Blender LTS: Maintenance Task 2.83
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/makesrna/intern/rna_scene.c
View File

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