Merge pull request #31964 from nekomatata/fix-animation-player-error

Fixed switching back to AnimationPlayerEditor with empty animation list
godotengine · Sep 19, 2019 · 2add51d · 2add51d
2 parents c3d5c96 + b01d07e
commit 2add51d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp
@@ -690,8 +690,10 @@ void AnimationPlayerEditor::set_state(const Dictionary &p_state) {
 
 			if (p_state.has("animation")) {
 				String anim = p_state["animation"];
-				_select_anim_by_name(anim);
-				_animation_edit();
+				if (!anim.empty() && player->has_animation(anim)) {
+					_select_anim_by_name(anim);
+					_animation_edit();
+				}
 			}
 		}
 	}