Tween: Add a unique identifier to InterpolateData to be able to remove the right one when finished

1 files changed, 4 insertions, 1 deletions

diff --git a/scene/animation/tween.h b/scene/animation/tween.h
index 9997349c64..aa47c00717 100644
--- a/scene/animation/tween.h
+++ b/scene/animation/tween.h
@@ -100,6 +100,7 @@ private:
 		real_t delay;
 		int args;
 		Variant arg[5];
+		int uid;
 	};
 
 	String autoplay;
@@ -107,6 +108,7 @@ private:
 	bool repeat;
 	float speed_scale;
 	mutable int pending_update;
+	int uid;
 
 	List<InterpolateData> interpolates;
 
@@ -131,7 +133,8 @@ private:
 	bool _apply_tween_value(InterpolateData &p_data, Variant &value);
 
 	void _tween_process(float p_delta);
-	void _remove(Object *p_object, StringName p_key, bool first_only);
+	void _remove_by_uid(int uid);
+	void _push_interpolate_data(InterpolateData &p_data);
 
 protected:
 	bool _set(const StringName &p_name, const Variant &p_value);