Browse Source

Merge pull request #47142 from jmb462/fix-tween-is_active-always-true-after-stop-and-start

[3.x] Fix Tween.is_active() always true after stop() and then start() (Fix #39760 & #39801)
Rémi Verschelde 4 years ago
parent
commit
ed28ce53bf
2 changed files with 16 additions and 1 deletions
  1. 15 0
      scene/animation/tween.cpp
  2. 1 1
      scene/animation/tween.h

+ 15 - 0
scene/animation/tween.cpp

@@ -873,8 +873,22 @@ bool Tween::start() {
 		return true;
 	}
 
+	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;
+
 	return true;
 }
 
@@ -947,6 +961,7 @@ bool Tween::stop(Object *p_object, StringName p_key) {
 bool 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++;

+ 1 - 1
scene/animation/tween.h

@@ -114,7 +114,7 @@ private:
 	float speed_scale;
 	mutable int pending_update;
 	int uid;
-
+	bool was_stopped = false;
 	List<InterpolateData> interpolates;
 
 	struct PendingCommand {