[Bf-blender-cvs] [c7899fe] depsgraph_refactor: Depsgraph: Removed last of bone_transforms_key() references
Joshua Leung
noreply at git.blender.org
Fri Jan 23 15:58:52 CET 2015
Commit: c7899fefb9a66109b531552c509bb0d2544d0379
Author: Joshua Leung
Date: Fri Jan 23 00:58:51 2015 +1300
Branches: depsgraph_refactor
https://developer.blender.org/rBc7899fefb9a66109b531552c509bb0d2544d0379
Depsgraph: Removed last of bone_transforms_key() references
We may have to reinstate an equivalent of this (for wrapping the rootmap checks)
later, but the old one is now redundant with the BONE_READY node
===================================================================
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 f51ac9a..54001a0 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
@@ -151,15 +151,6 @@ bool modifier_check_depends_on_time(Object *ob, ModifierData *md)
return false;
}
-BLI_INLINE OperationKey bone_transforms_key(Object *ob,
- bPoseChannel *pchan)
-{
- if (pchan->constraints.first != NULL) {
- return OperationKey(&ob->id, DEPSNODE_TYPE_BONE, pchan->name, DEG_OPCODE_BONE_CONSTRAINTS);
- }
- return OperationKey(&ob->id, DEPSNODE_TYPE_BONE, pchan->name, DEG_OPCODE_BONE_POSE_PARENT);
-}
-
void root_map_add_bone(const char *bone,
const char *root,
DepsgraphRelationBuilder::RootPChanMap *root_map)
@@ -1110,7 +1101,7 @@ void DepsgraphRelationBuilder::build_splineik_pose(Object *ob,
{
bSplineIKConstraint *data = (bSplineIKConstraint *)con->data;
bPoseChannel *rootchan = BKE_armature_splineik_solver_find_root(pchan, data);
- OperationKey transforms_key = bone_transforms_key(ob, pchan);
+ OperationKey transforms_key(&ob->id, DEPSNODE_TYPE_BONE, pchan->name, DEG_OPCODE_BONE_READY);
OperationKey solver_key(&ob->id, DEPSNODE_TYPE_EVAL_POSE, rootchan->name, DEG_OPCODE_POSE_SPLINE_IK_SOLVER);
/* attach owner to IK Solver too
More information about the Bf-blender-cvs
mailing list