ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix T79935: Inonsistent simplify behavior when linking collection with objects in sub-collection.

Browse source 
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 83c78529b9
commit 0fae682d61
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1873,11 +1873,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;
}
}