diff options
| author | Bernhard Liebl <Bernhard.Liebl@gmx.org> | 2018-03-09 18:42:24 +0100 |
|---|---|---|
| committer | Bernhard Liebl <Bernhard.Liebl@gmx.org> | 2018-03-09 19:41:14 +0100 |
| commit | b553b38e7be52003f44bb05165fdae25c5863ab7 (patch) | |
| tree | 24793aef935813ca551170cb6f3afffbf9c197c8 | |
| parent | 47addcf9d03da717e54158e455d1fc558b4bd66f (diff) | |
AnimationPlayer: fix scrubbing after play backwards
| -rw-r--r-- | editor/plugins/animation_player_editor_plugin.cpp | 1 | ||||
| -rw-r--r-- | scene/animation/animation_player.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index c22e1cd88b..04c9246aed 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -1011,6 +1011,7 @@ void AnimationPlayerEditor::_seek_value_changed(float p_value, bool p_set) { player->seek_delta(pos, pos - cpos); } else { + player->stop(true); player->seek(pos, true); } diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index 9db4a5fb04..04e7d5cc10 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -1010,6 +1010,7 @@ void AnimationPlayer::stop(bool p_reset) { c.blend.clear(); if (p_reset) { c.current.from = NULL; + c.current.speed_scale = 1; } _set_process(false); queued.clear(); |