From b553b38e7be52003f44bb05165fdae25c5863ab7 Mon Sep 17 00:00:00 2001
From: Bernhard Liebl <Bernhard.Liebl@gmx.org>
Date: Fri, 9 Mar 2018 18:42:24 +0100
Subject: [PATCH] AnimationPlayer: fix scrubbing after play backwards

---
 editor/plugins/animation_player_editor_plugin.cpp | 1 +
 scene/animation/animation_player.cpp              | 1 +
 2 files changed, 2 insertions(+)

diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp
index c22e1cd88b2..04c9246aedd 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 9db4a5fb049..04e7d5cc107 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();