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:
authorCampbell Barton <ideasman42@gmail.com>2016-07-08 14:06:38 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-07-08 14:13:19 +0300
commitc206b7cbb6d32e0353d9f2b253151b4caafdefa0 (patch)
tree8f1347fc0c3ae33d5b073ceb7dd4a84a3cf39f82 /source/blender/ikplugin/intern/iksolver_plugin.c
parenta62967787cc9aa1bc6d4cca400e776b529838f4f (diff)
Correct error in non-uniform scale IK commit
Rename arg to avoid confusion
Diffstat (limited to 'source/blender/ikplugin/intern/iksolver_plugin.c')
-rw-r--r--source/blender/ikplugin/intern/iksolver_plugin.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/ikplugin/intern/iksolver_plugin.c b/source/blender/ikplugin/intern/iksolver_plugin.c
index 30dd5e45a2b..6ea311b2c7b 100644
--- a/source/blender/ikplugin/intern/iksolver_plugin.c
+++ b/source/blender/ikplugin/intern/iksolver_plugin.c
@@ -527,10 +527,10 @@ void iksolver_initialize_tree(struct Scene *UNUSED(scene), struct Object *ob, fl
ob->pose->flag &= ~POSE_WAS_REBUILT;
}
-void iksolver_execute_tree(struct Scene *scene, struct Object *ob, struct bPoseChannel *pchan, float ctime)
+void iksolver_execute_tree(struct Scene *scene, Object *ob, bPoseChannel *pchan_root, float ctime)
{
- while (pchan->iktree.first) {
- PoseTree *tree = pchan->iktree.first;
+ while (pchan_root->iktree.first) {
+ PoseTree *tree = pchan_root->iktree.first;
int a;
/* stop on the first tree that isn't a standard IK chain */
@@ -573,14 +573,14 @@ void iksolver_execute_tree(struct Scene *scene, struct Object *ob, struct bPose
#ifdef USE_NONUNIFORM_SCALE
for (a = 0; a < tree->totchannel; a++) {
- normalize_v3_length(pchan->pose_mat[0], pchan_scale_data[a][0]);
- normalize_v3_length(pchan->pose_mat[2], pchan_scale_data[a][2]);
+ normalize_v3_length(tree->pchan[a]->pose_mat[0], pchan_scale_data[a][0]);
+ normalize_v3_length(tree->pchan[a]->pose_mat[2], pchan_scale_data[a][2]);
}
MEM_freeN(pchan_scale_data);
#endif
/* 7. and free */
- BLI_remlink(&pchan->iktree, tree);
+ BLI_remlink(&pchan_root->iktree, tree);
free_posetree(tree);
}
}