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

Merge pull request #32473 from KoBeWi/seaking_ani 

Automatically seek timeline in selected animation
This commit is contained in:
Rémi Verschelde 2019-10-02 11:54:19 +02:00 committed by GitHub
parent 42fca4ba27 d482bd1ef0
commit a737bceb4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/plugins/animation_player_editor_plugin.cpp
View File

@ -304,6 +304,7 @@ void AnimationPlayerEditor::_animation_selected(int p_which) {
AnimationPlayerEditor::singleton->get_track_editor()->update_keying();
EditorNode::get_singleton()->update_keying();
_animation_key_editor_seek(timeline_position, false);
}
void AnimationPlayerEditor::_animation_new() {
@ -1072,6 +1073,8 @@ void AnimationPlayerEditor::_animation_key_editor_anim_len_changed(float p_len)
void AnimationPlayerEditor::_animation_key_editor_seek(float p_pos, bool p_drag) {
timeline_position = p_pos;
if (!is_visible_in_tree())
return;
if (!player)
@ -1753,6 +1756,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor, AnimationPlay
renaming = false;
last_active = false;
timeline_position = 0;
set_process_unhandled_key_input(true);

1
editor/plugins/animation_player_editor_plugin.h
View File

@ -107,6 +107,7 @@ class AnimationPlayerEditor : public VBoxContainer {
UndoRedo *undo_redo;
Ref<Texture> autoplay_icon;
bool last_active;
float timeline_position;
EditorFileDialog *file;
AcceptDialog *accept;