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

AnimationPlayer: fix scrubbing after play backwards 

(cherry picked from commit b553b38e7b)
This commit is contained in:
Bernhard Liebl 2018-03-09 18:42:24 +01:00 committed by Hein-Pieter van Braam
parent d49579b038
commit 6d767b0f9a
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/plugins/animation_player_editor_plugin.cpp
View File

@ -1011,6 +1011,7 @@ void AnimationPlayerEditor::_seek_value_changed(float p_value, bool p_set) {
player->seek_delta(pos, pos - cpos); player->seek_delta(pos, pos - cpos);
} else { } else {
player->stop(true);
player->seek(pos, true); player->seek(pos, true);
} }

1
scene/animation/animation_player.cpp
View File

@ -1010,6 +1010,7 @@ void AnimationPlayer::stop(bool p_reset) {
c.blend.clear(); c.blend.clear();
if (p_reset) { if (p_reset) {
c.current.from = NULL; c.current.from = NULL;
c.current.speed_scale = 1;
} }
_set_process(false); _set_process(false);
queued.clear(); queued.clear();