Commit: 35d5ff0b6f8c6a776cc028009124dfc7c1e0af49
Author: Joshua Leung
Date: Fri Dec 19 13:14:42 2014 +1300
Branches: depsgraph_refactor
https://developer.blender.org/rB35d5ff0b6f8c6a776cc028009124dfc7c1e0af49
Code cleanup: Reshuffled + removed duplicate lookup
===================================================================
M source/blender/depsgraph/intern/depsgraph_build_relations.cpp
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
b/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
index 777cf76..b721975 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
@@ -1002,6 +1002,7 @@ void DepsgraphRelationBuilder::build_rig(Scene *scene,
Object *ob)
for (bPoseChannel *pchan = (bPoseChannel *)ob->pose->chanbase.first;
pchan; pchan = pchan->next) {
OperationKey bone_local_key(&ob->id, DEPSNODE_TYPE_BONE,
pchan->name, DEG_OPCODE_BONE_LOCAL);
OperationKey bone_pose_key(&ob->id, DEPSNODE_TYPE_BONE,
pchan->name, DEG_OPCODE_BONE_POSE_PARENT);
+ OperationKey bone_done_key(&ob->id, DEPSNODE_TYPE_BONE,
pchan->name, DEG_OPCODE_BONE_DONE);
pchan->flag &= ~POSE_DONE;
@@ -1021,14 +1022,11 @@ void DepsgraphRelationBuilder::build_rig(Scene *scene,
Object *ob)
if (pchan->constraints.first != NULL) {
build_constraints(scene, &ob->id, DEPSNODE_TYPE_BONE,
pchan->name, &pchan->constraints);
- OperationKey transforms_key(&ob->id,
DEPSNODE_TYPE_BONE, pchan->name, DEG_OPCODE_BONE_POSE_PARENT);
OperationKey constraints_key(&ob->id,
DEPSNODE_TYPE_BONE, pchan->name, DEG_OPCODE_BONE_CONSTRAINTS);
-
- add_relation(transforms_key, constraints_key,
DEPSREL_TYPE_OPERATION, "Constraints Stack");
+ add_relation(bone_pose_key, constraints_key,
DEPSREL_TYPE_OPERATION, "Constraints Stack");
}
-
+
/* TODO(sergey): Assume for now that pose flush depends on all
the pose channels. */
- OperationKey bone_done_key(&ob->id, DEPSNODE_TYPE_BONE,
pchan->name, DEG_OPCODE_BONE_DONE);
add_relation(bone_done_key, flush_key, DEPSREL_TYPE_OPERATION,
"PoseEval Result-Bone Link");
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
