1 files changed, 27 insertions, 17 deletions

diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp
index bbaf41e3cc..0a9436952b 100644
--- a/editor/plugins/animation_player_editor_plugin.cpp
+++ b/editor/plugins/animation_player_editor_plugin.cpp
@@ -129,8 +129,10 @@ void AnimationPlayerEditor::_notification(int p_what) {
 			autoplay_icon = get_icon("AutoPlay", "EditorIcons");
 			stop->set_icon(get_icon("Stop", "EditorIcons"));
 
+			onion_toggle->set_icon(get_icon("Onion", "EditorIcons"));
+			onion_skinning->set_icon(get_icon("GuiMiniTabMenu", "EditorIcons"));
+
 			pin->set_icon(get_icon("Pin", "EditorIcons"));
-			onion_skinning->set_icon(get_icon("Onion", "EditorIcons"));
 
 			tool_anim->add_style_override("normal", get_stylebox("normal", "Button"));
 			track_editor->get_edit_menu()->add_style_override("normal", get_stylebox("normal", "Button"));
@@ -670,6 +672,7 @@ Dictionary AnimationPlayerEditor::get_state() const {
 	if (EditorNode::get_singleton()->get_edited_scene() && is_visible_in_tree() && player) {
 		d["player"] = EditorNode::get_singleton()->get_edited_scene()->get_path_to(player);
 		d["animation"] = player->get_assigned_animation();
+		d["track_editor_state"] = track_editor->get_state();
 	}
 
 	return d;
@@ -696,6 +699,10 @@ void AnimationPlayerEditor::set_state(const Dictionary &p_state) {
 				_animation_edit();
 			}
 		}
+
+		if (p_state.has("track_editor_state")) {
+			track_editor->set_state(p_state["track_editor_state"]);
+		}
 	}
 }
 
@@ -841,6 +848,12 @@ void AnimationPlayerEditor::_update_player() {
 	onion_skinning->set_disabled(player == NULL);
 	pin->set_disabled(player == NULL);
 
+	if (!player) {
+		AnimationPlayerEditor::singleton->get_track_editor()->update_keying();
+		EditorNode::get_singleton()->update_keying();
+		return;
+	}
+
 	int active_idx = -1;
 	for (List<StringName>::Element *E = animlist.front(); E; E = E->next()) {
 
@@ -853,12 +866,6 @@ void AnimationPlayerEditor::_update_player() {
 			active_idx = animation->get_item_count() - 1;
 	}
 
-	if (!player) {
-		AnimationPlayerEditor::singleton->get_track_editor()->update_keying();
-		EditorNode::get_singleton()->update_keying();
-		return;
-	}
-
 	updating = false;
 	if (active_idx != -1) {
 		animation->select(active_idx);
@@ -1224,7 +1231,6 @@ void AnimationPlayerEditor::_onion_skinning_menu(int p_option) {
 		case ONION_SKINNING_ENABLE: {
 
 			onion.enabled = !onion.enabled;
-			menu->set_item_checked(idx, onion.enabled);
 
 			if (onion.enabled)
 				_start_onion_skinning();
@@ -1703,19 +1709,21 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor, AnimationPlay
 
 	hb->add_child(track_editor->get_edit_menu());
 
+	hb->add_child(memnew(VSeparator));
+
+	onion_toggle = memnew(ToolButton);
+	onion_toggle->set_toggle_mode(true);
+	onion_toggle->set_tooltip(TTR("Enable Onion Skinning"));
+	onion_toggle->connect("pressed", this, "_onion_skinning_menu", varray(ONION_SKINNING_ENABLE));
+	hb->add_child(onion_toggle);
+
 	onion_skinning = memnew(MenuButton);
-	//onion_skinning->set_flat(false);
-	onion_skinning->set_tooltip(TTR("Onion Skinning"));
-	onion_skinning->get_popup()->add_check_shortcut(ED_SHORTCUT("animation_player_editor/onion_skinning", TTR("Enable Onion Skinning")), ONION_SKINNING_ENABLE);
-	onion_skinning->get_popup()->add_separator();
-	onion_skinning->get_popup()->add_item(TTR("Directions"), -1);
-	onion_skinning->get_popup()->set_item_disabled(onion_skinning->get_popup()->get_item_count() - 1, true);
+	onion_skinning->set_tooltip(TTR("Onion Skinning Options"));
+	onion_skinning->get_popup()->add_separator(TTR("Directions"));
 	onion_skinning->get_popup()->add_check_item(TTR("Past"), ONION_SKINNING_PAST);
 	onion_skinning->get_popup()->set_item_checked(onion_skinning->get_popup()->get_item_count() - 1, true);
 	onion_skinning->get_popup()->add_check_item(TTR("Future"), ONION_SKINNING_FUTURE);
-	onion_skinning->get_popup()->add_separator();
-	onion_skinning->get_popup()->add_item(TTR("Depth"), -1);
-	onion_skinning->get_popup()->set_item_disabled(onion_skinning->get_popup()->get_item_count() - 1, true);
+	onion_skinning->get_popup()->add_separator(TTR("Depth"));
 	onion_skinning->get_popup()->add_radio_check_item(TTR("1 step"), ONION_SKINNING_1_STEP);
 	onion_skinning->get_popup()->set_item_checked(onion_skinning->get_popup()->get_item_count() - 1, true);
 	onion_skinning->get_popup()->add_radio_check_item(TTR("2 steps"), ONION_SKINNING_2_STEPS);
@@ -1726,6 +1734,8 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor, AnimationPlay
 	onion_skinning->get_popup()->add_check_item(TTR("Include Gizmos (3D)"), ONION_SKINNING_INCLUDE_GIZMOS);
 	hb->add_child(onion_skinning);
 
+	hb->add_child(memnew(VSeparator));
+
 	pin = memnew(ToolButton);
 	pin->set_toggle_mode(true);
 	pin->set_tooltip(TTR("Pin AnimationPlayer"));