diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-05-23 07:58:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-23 07:58:27 +0200 |
| commit | c088386c5b5e7631ce670cb4fa0e6563d29d0973 (patch) | |
| tree | 1ae4f1cb3c9d1aae5aa406811472a5d6a902fc07 /editor/plugins/animation_player_editor_plugin.cpp | |
| parent | 1acc918166e653eb4121868e8000991e9485ac83 (diff) | |
| parent | 88153fbb6109f897ec3eac2180cdb757502aebb4 (diff) | |
Merge pull request #29109 from RandomShaper/fix_onion_skinning
Fix onion skinning
Diffstat (limited to 'editor/plugins/animation_player_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/animation_player_editor_plugin.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index 0a9436952b..3c67d26828 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -1431,6 +1431,7 @@ void AnimationPlayerEditor::_prepare_onion_layers_2() { new_state["show_rulers"] = false; new_state["show_guides"] = false; new_state["show_helpers"] = false; + new_state["show_zoom_control"] = false; // TODO: Save/restore only affected entries CanvasItemEditor::get_singleton()->set_state(new_state); } @@ -1483,7 +1484,7 @@ void AnimationPlayerEditor::_prepare_onion_layers_2() { if (valid) { player->seek(pos, true); get_tree()->flush_transform_notifications(); // Needed for transforms of Spatials - values_backup.update_skeletons(); // Needed for Skeletons + values_backup.update_skeletons(); // Needed for Skeletons (2D & 3D) VS::get_singleton()->viewport_set_active(onion.captures[cidx], true); VS::get_singleton()->viewport_set_parent_viewport(root_vp, onion.captures[cidx]); |