Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2020-10-28 13:08:42 +0300
committerBastien Montagne <bastien@blender.org>2020-10-28 13:08:42 +0300
commit2f7c6149fce00993e7c2c45ab071a7e8b5588f92 (patch)
tree6d6c50e5b0415b965c720cc02f0d2d7bb127052e
parent24686351746532a72a5dac9a5bca0c6fed4fe832 (diff)
parent0d772221c64187b5004dd687888042f44603257d (diff)
Merge branch 'blender-v2.91-release' into master
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_relations.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index ec5cbc5c605..bac36885dfc 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -591,13 +591,13 @@ void DepsgraphRelationBuilder::build_collection(LayerCollection *from_layer_coll
* recurses into all the nested objects and collections. */
return;
}
- build_idproperties(collection->id.properties);
const bool group_done = built_map_.checkIsBuiltAndTag(collection);
OperationKey object_transform_final_key(object != nullptr ? &object->id : nullptr,
NodeType::TRANSFORM,
OperationCode::TRANSFORM_FINAL);
ComponentKey duplicator_key(object != nullptr ? &object->id : nullptr, NodeType::DUPLI);
if (!group_done) {
+ build_idproperties(collection->id.properties);
LISTBASE_FOREACH (CollectionObject *, cob, &collection->gobject) {
build_object(cob->ob);
}