godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-05 06:11:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27676 from qarmin/small_fixes_2

Browse Source 
Small fixes to static analyzer bugs
This commit is contained in:
Rémi Verschelde
2019-05-01 08:19:04 +02:00
committed by GitHub
parent 8afc9c3938 8460d0678c
commit ae41e35191
14 changed files with 59 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
editor/plugins/animation_player_editor_plugin.cpp
View File

@@ -846,6 +846,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()) {
@@ -858,12 +864,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);