1 files changed, 16 insertions, 3 deletions

diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp
index 3477a6ec30..7d4415ba9e 100644
--- a/editor/plugins/animation_player_editor_plugin.cpp
+++ b/editor/plugins/animation_player_editor_plugin.cpp
@@ -144,6 +144,7 @@ void AnimationPlayerEditor::_notification(int p_what) {
 			ITEM_ICON(TOOL_DUPLICATE_ANIM, "Duplicate");
 			ITEM_ICON(TOOL_RENAME_ANIM, "Rename");
 			ITEM_ICON(TOOL_EDIT_TRANSITIONS, "Blend");
+			ITEM_ICON(TOOL_EDIT_RESOURCE, "Edit");
 			ITEM_ICON(TOOL_REMOVE_ANIM, "Remove");
 			//ITEM_ICON(TOOL_COPY_ANIM, "Copy");
 			//ITEM_ICON(TOOL_PASTE_ANIM, "Paste");
@@ -327,6 +328,9 @@ void AnimationPlayerEditor::_animation_selected(int p_which) {
 	}
 
 	autoplay->set_pressed(current == player->get_autoplay());
+
+	AnimationPlayerEditor::singleton->get_track_editor()->update_keying();
+	EditorNode::get_singleton()->update_keying();
 }
 
 void AnimationPlayerEditor::_animation_new() {
@@ -849,8 +853,11 @@ void AnimationPlayerEditor::_update_player() {
 			active_idx = animation->get_item_count() - 1;
 	}
 
-	if (!player)
+	if (!player) {
+		AnimationPlayerEditor::singleton->get_track_editor()->update_keying();
+		EditorNode::get_singleton()->update_keying();
 		return;
+	}
 
 	updating = false;
 	if (active_idx != -1) {
@@ -863,6 +870,8 @@ void AnimationPlayerEditor::_update_player() {
 		animation->select(0);
 		autoplay->set_pressed(animation->get_item_text(0) == player->get_autoplay());
 		_animation_selected(0);
+	} else {
+		_animation_selected(0);
 	}
 
 	//pause->set_pressed(player->is_paused());
@@ -1102,9 +1111,12 @@ void AnimationPlayerEditor::_animation_about_to_show_menu() {
 
 void AnimationPlayerEditor::_animation_tool_menu(int p_option) {
 
-	String current = animation->get_item_text(animation->get_selected());
+	String current;
+	if (animation->get_selected() >= 0 && animation->get_selected() < animation->get_item_count())
+		current = animation->get_item_text(animation->get_selected());
+
 	Ref<Animation> anim;
-	if (current != "") {
+	if (current != String()) {
 		anim = player->get_animation(current);
 	}
 
@@ -1667,6 +1679,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor, AnimationPlay
 	tool_anim->get_popup()->add_separator();
 	tool_anim->get_popup()->add_shortcut(ED_SHORTCUT("animation_player_editor/rename_animation", TTR("Rename...")), TOOL_RENAME_ANIM);
 	tool_anim->get_popup()->add_shortcut(ED_SHORTCUT("animation_player_editor/edit_transitions", TTR("Edit Transitions...")), TOOL_EDIT_TRANSITIONS);
+	tool_anim->get_popup()->add_shortcut(ED_SHORTCUT("animation_player_editor/open_animation_in_inspector", TTR("Open in Inspector")), TOOL_EDIT_RESOURCE);
 	tool_anim->get_popup()->add_separator();
 	tool_anim->get_popup()->add_shortcut(ED_SHORTCUT("animation_player_editor/remove_animation", TTR("Remove")), TOOL_REMOVE_ANIM);
 	hb->add_child(tool_anim);