diff options
| author | Eric Rybicki <info@ericrybicki.com> | 2020-01-25 10:06:14 +0100 |
|---|---|---|
| committer | Eric Rybicki <info@ericrybicki.com> | 2020-02-09 19:50:13 +0100 |
| commit | bb0358dd8d3ed99c9fb3545efdf821d28e73b68b (patch) | |
| tree | 503e5de13cf75aaca6bbe8c79235e6e20f1abea8 /editor/plugins | |
| parent | 97cc2e53f6fbba7e85a2cbb79f38e077a6e511f7 (diff) | |
Use a new approach to fix bone pose override not being reset when IK animation is stopped.
This reverts PR #35460 & commit 551c37167b0428b1489a8a6f6233624c5f4aa628.
Diffstat (limited to 'editor/plugins')
| -rw-r--r-- | editor/plugins/skeleton_ik_editor_plugin.cpp | 11 | ||||
| -rw-r--r-- | editor/plugins/skeleton_ik_editor_plugin.h | 1 |
2 files changed, 1 insertions, 11 deletions
diff --git a/editor/plugins/skeleton_ik_editor_plugin.cpp b/editor/plugins/skeleton_ik_editor_plugin.cpp index 43dc13b270..eb6ad9498d 100644 --- a/editor/plugins/skeleton_ik_editor_plugin.cpp +++ b/editor/plugins/skeleton_ik_editor_plugin.cpp @@ -41,21 +41,12 @@ void SkeletonIKEditorPlugin::_play() { return; if (play_btn->is_pressed()) { - - initial_bone_poses.resize(skeleton_ik->get_parent_skeleton()->get_bone_count()); - for (int i = 0; i < skeleton_ik->get_parent_skeleton()->get_bone_count(); ++i) { - initial_bone_poses.write[i] = skeleton_ik->get_parent_skeleton()->get_bone_pose(i); - } - skeleton_ik->start(); } else { skeleton_ik->stop(); - if (initial_bone_poses.size() != skeleton_ik->get_parent_skeleton()->get_bone_count()) - return; - for (int i = 0; i < skeleton_ik->get_parent_skeleton()->get_bone_count(); ++i) { - skeleton_ik->get_parent_skeleton()->set_bone_pose(i, initial_bone_poses[i]); + skeleton_ik->get_parent_skeleton()->set_bone_global_pose_override(i, Transform(), 0); } } } diff --git a/editor/plugins/skeleton_ik_editor_plugin.h b/editor/plugins/skeleton_ik_editor_plugin.h index 06c07031f6..814eb8ff5b 100644 --- a/editor/plugins/skeleton_ik_editor_plugin.h +++ b/editor/plugins/skeleton_ik_editor_plugin.h @@ -44,7 +44,6 @@ class SkeletonIKEditorPlugin : public EditorPlugin { Button *play_btn; EditorNode *editor; - Vector<Transform> initial_bone_poses; void _play(); |