Merge pull request #46609 from jmb462/fix-no-tween-repeat-after-stop

Fix no tween repeat after stop and restart (Fix #39801)
godotengine · Mar 3, 2021 · 4d1f83a · 4d1f83a
2 parents 43264c6 + b3d7adc
commit 4d1f83a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/scene/animation/tween.cpp b/scene/animation/tween.cpp
@@ -869,8 +869,21 @@ void Tween::start() {
 		return;
 	}
 
+	pending_update++;
+	for (List<InterpolateData>::Element *E = interpolates.front(); E; E = E->next()) {
+		InterpolateData &data = E->get();
+		data.active = true;
+	}
+	pending_update--;
+
 	// We want to be activated
 	set_active(true);
+
+	// Don't resume from current position if stop_all() function has been used
+	if (was_stopped) {
+		seek(0);
+	}
+	was_stopped = false;
 }
 
 void Tween::reset(Object *p_object, StringName p_key) {
@@ -939,7 +952,7 @@ void Tween::stop(Object *p_object, StringName p_key) {
 void Tween::stop_all() {
 	// We no longer need to be active since all tweens have been stopped
 	set_active(false);
-
+	was_stopped = true;
 	// For each interpolation...
 	pending_update++;
 	for (List<InterpolateData>::Element *E = interpolates.front(); E; E = E->next()) {

diff --git a/scene/animation/tween.h b/scene/animation/tween.h
@@ -107,6 +107,7 @@ class Tween : public Node {
 	float speed_scale = 1.0;
 	mutable int pending_update = 0;
 	int uid = 0;
+	bool was_stopped = false;
 
 	List<InterpolateData> interpolates;