diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-07-08 14:06:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-07-08 14:13:19 +0300 |
| commit | c206b7cbb6d32e0353d9f2b253151b4caafdefa0 (patch) | |
| tree | 8f1347fc0c3ae33d5b073ceb7dd4a84a3cf39f82 /source/blender/ikplugin/intern/itasc_plugin.cpp | |
| parent | a62967787cc9aa1bc6d4cca400e776b529838f4f (diff) | |
Correct error in non-uniform scale IK commit
Rename arg to avoid confusion
Diffstat (limited to 'source/blender/ikplugin/intern/itasc_plugin.cpp')
| -rw-r--r-- | source/blender/ikplugin/intern/itasc_plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/ikplugin/intern/itasc_plugin.cpp b/source/blender/ikplugin/intern/itasc_plugin.cpp index d4814a4e3a2..b8ed780397f 100644 --- a/source/blender/ikplugin/intern/itasc_plugin.cpp +++ b/source/blender/ikplugin/intern/itasc_plugin.cpp @@ -1770,7 +1770,7 @@ void itasc_initialize_tree(struct Scene *scene, Object *ob, float ctime) ob->pose->flag &= ~POSE_WAS_REBUILT; } -void itasc_execute_tree(struct Scene *scene, struct Object *ob, struct bPoseChannel *pchan, float ctime) +void itasc_execute_tree(struct Scene *scene, Object *ob, bPoseChannel *pchan_root, float ctime) { if (!ob->pose->ikdata) { // IK tree not yet created, no it now @@ -1784,7 +1784,7 @@ void itasc_execute_tree(struct Scene *scene, struct Object *ob, struct bPoseCha if (!ikparam) ikparam = &DefIKParam; for (IK_Scene *ikscene = ikdata->first; ikscene; ikscene = ikscene->next) { - if (ikscene->channels[0].pchan == pchan) { + if (ikscene->channels[0].pchan == pchan_root) { float timestep = scene->r.frs_sec_base / scene->r.frs_sec; if (ob->pose->flag & POSE_GAME_ENGINE) { timestep = ob->pose->ctime; |