From d7eb4550b0d33d3b932c166d2216a4c468d49649 Mon Sep 17 00:00:00 2001
From: sanikoyes <sanikoyes@163.com>
Date: Thu, 21 Aug 2014 15:51:18 +0800
Subject: [PATCH] Fix reset

---
 scene/animation/tween.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scene/animation/tween.cpp b/scene/animation/tween.cpp
index 48a2fd564b8..4acf509283b 100644
--- a/scene/animation/tween.cpp
+++ b/scene/animation/tween.cpp
@@ -464,7 +464,8 @@ bool Tween::reset(Variant p_object, String p_key) {
 
 			data.elapsed = 0;
 			data.finish = false;
-			_apply_tween_value(data, data.initial_val);
+			if(data.delay == 0)
+				_apply_tween_value(data, data.initial_val);
 		}
 	}
 	return true;
@@ -477,7 +478,8 @@ bool Tween::reset_all() {
 		InterpolateData& data = E->get();
 		data.elapsed = 0;
 		data.finish = false;
-		_apply_tween_value(data, data.initial_val);
+		if(data.delay == 0)
+			_apply_tween_value(data, data.initial_val);
 	}
 	return true;
 }