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

Merge pull request #17381 from poke1024/fix-anim-scrub

Browse Source 
AnimationPlayer: fix scrubbing after play backwards
This commit is contained in:
Rémi Verschelde 2018-03-13 11:51:30 +01:00 committed by GitHub
commit b49746f3cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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);
} else {
player->stop(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();
if (p_reset) {
c.current.from = NULL;
c.current.speed_scale = 1;
}
_set_process(false);
queued.clear();