[Bf-blender-cvs] [a0f1bd8ed1d] blender2.8: Depsgraph: Re-hook duplicgroup relation to final transform operation
Sergey Sharybin
noreply at git.blender.org
Thu Jun 21 16:00:10 CEST 2018
Commit: a0f1bd8ed1d9222dfe827562d3bf7138a1098f24
Author: Sergey Sharybin
Date: Thu Jun 21 15:47:55 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa0f1bd8ed1d9222dfe827562d3bf7138a1098f24
Depsgraph: Re-hook duplicgroup relation to final transform operation
Transform evaluation doesn't not depend on objects which are being duplicated,
so should not be any regressions here.
The whole relation should probably be gone as it's kind of rooting back to
legacy times, but that would need more clear research and investigation and
regression testing.
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
===================================================================
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 97e2b0905d7..ff3c9f9e426 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -464,9 +464,9 @@ void DepsgraphRelationBuilder::build_collection(
}
}
const bool group_done = built_map_.checkIsBuiltAndTag(collection);
- OperationKey object_local_transform_key(object != NULL ? &object->id : NULL,
+ OperationKey object_transform_final_key(object != NULL ? &object->id : NULL,
DEG_NODE_TYPE_TRANSFORM,
- DEG_OPCODE_TRANSFORM_LOCAL);
+ DEG_OPCODE_TRANSFORM_FINAL);
if (!group_done) {
LISTBASE_FOREACH (CollectionObject *, cob, &collection->gobject) {
if (allow_restrict_flags) {
@@ -487,7 +487,7 @@ void DepsgraphRelationBuilder::build_collection(
FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_BEGIN(collection, ob, graph_->mode)
{
ComponentKey dupli_transform_key(&ob->id, DEG_NODE_TYPE_TRANSFORM);
- add_relation(dupli_transform_key, object_local_transform_key, "Dupligroup");
+ add_relation(dupli_transform_key, object_transform_final_key, "Dupligroup");
}
FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_END;
}
More information about the Bf-blender-cvs
mailing list