godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #64386 from timothyqiu/anim-disable

Browse Source 
Fix crash when loading Animation Library after reloading a scene
This commit is contained in:
Rémi Verschelde 2022-08-29 07:50:00 +02:00 committed by GitHub
commit 1782557339
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/plugins/animation_player_editor_plugin.cpp
View File

@ -843,15 +843,16 @@ void AnimationPlayerEditor::_update_player() {
animation->clear(); animation->clear();
tool_anim->set_disabled(player == nullptr);
pin->set_disabled(player == nullptr);
if (!player) { if (!player) {
AnimationPlayerEditor::get_singleton()->get_track_editor()->update_keying(); AnimationPlayerEditor::get_singleton()->get_track_editor()->update_keying();
return; return;
} }
List<StringName> libraries; List<StringName> libraries;
if (player) { player->get_animation_library_list(&libraries);
player->get_animation_library_list(&libraries);
}
int active_idx = -1; int active_idx = -1;
bool no_anims_found = true; bool no_anims_found = true;
@ -926,10 +927,8 @@ void AnimationPlayerEditor::_update_player() {
frame->set_editable(!no_anims_found); frame->set_editable(!no_anims_found);
animation->set_disabled(no_anims_found); animation->set_disabled(no_anims_found);
autoplay->set_disabled(no_anims_found); autoplay->set_disabled(no_anims_found);
tool_anim->set_disabled(player == nullptr);
onion_toggle->set_disabled(no_anims_found); onion_toggle->set_disabled(no_anims_found);
onion_skinning->set_disabled(no_anims_found); onion_skinning->set_disabled(no_anims_found);
pin->set_disabled(player == nullptr);
_update_animation_list_icons(); _update_animation_list_icons();