godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

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

Browse Source 
Fixed switching back to AnimationPlayerEditor with empty animation list
This commit is contained in:
Rémi Verschelde
2019-09-19 20:32:05 +02:00
committed by GitHub
parent c3d5c96494 b01d07e049
commit 2add51d082
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/plugins/animation_player_editor_plugin.cpp
View File

@@ -690,11 +690,13 @@ void AnimationPlayerEditor::set_state(const Dictionary &p_state) {
if (p_state.has("animation")) { if (p_state.has("animation")) {
String anim = p_state["animation"]; String anim = p_state["animation"];
if (!anim.empty() && player->has_animation(anim)) {
_select_anim_by_name(anim); _select_anim_by_name(anim);
_animation_edit(); _animation_edit();
} }
} }
} }
}
if (p_state.has("track_editor_state")) { if (p_state.has("track_editor_state")) {
track_editor->set_state(p_state["track_editor_state"]); track_editor->set_state(p_state["track_editor_state"]);