blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Depsgraph: Get pchan index from correct pose 

This code should be replaced with evaluation-time ID block expansion,
but before that it will be helpful to get old design to work again.
This commit is contained in:
Sergey Sharybin 2018-04-04 11:55:06 +02:00
parent a6999a869e
commit 948f4e8c94
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
View File

@ -85,6 +85,7 @@ void DepsgraphNodeBuilder::build_ik_pose(Object *object,
bPoseChannel *pchan,
bConstraint *con)
{
Object *object_cow = get_cow_datablock(object);
bKinematicConstraint *data = (bKinematicConstraint *)con->data;
/* Find the chain's root. */
@ -99,14 +100,14 @@ void DepsgraphNodeBuilder::build_ik_pose(Object *object,
return;
}
int rootchan_index = BLI_findindex(&object->pose->chanbase, rootchan);
int rootchan_index = BLI_findindex(&object_cow->pose->chanbase, rootchan);
BLI_assert(rootchan_index != -1);
/* Operation node for evaluating/running IK Solver. */
add_operation_node(&object->id, DEG_NODE_TYPE_EVAL_POSE, rootchan->name,
function_bind(BKE_pose_iktree_evaluate,
_1,
get_cow_datablock(scene_),
get_cow_datablock(object),
object_cow,
rootchan_index),
DEG_OPCODE_POSE_IK_SOLVER);
}
@ -116,6 +117,7 @@ void DepsgraphNodeBuilder::build_splineik_pose(Object *object,
bPoseChannel *pchan,
bConstraint *con)
{
Object *object_cow = get_cow_datablock(object);
bSplineIKConstraint *data = (bSplineIKConstraint *)con->data;
/* Find the chain's root. */
@ -125,13 +127,13 @@ void DepsgraphNodeBuilder::build_splineik_pose(Object *object,
* Store the "root bone" of this chain in the solver, so it knows where to
* start.
*/
int rootchan_index = BLI_findindex(&object->pose->chanbase, rootchan);
int rootchan_index = BLI_findindex(&object_cow->pose->chanbase, rootchan);
BLI_assert(rootchan_index != -1);
add_operation_node(&object->id, DEG_NODE_TYPE_EVAL_POSE, rootchan->name,
function_bind(BKE_pose_splineik_evaluate,
_1,
get_cow_datablock(scene_),
get_cow_datablock(object),
object_cow,
rootchan_index),
DEG_OPCODE_POSE_SPLINE_IK_SOLVER);
}