diff options
| author | sanikoyes <sanikoyes@163.com> | 2014-08-21 15:51:18 +0800 |
|---|---|---|
| committer | sanikoyes <sanikoyes@163.com> | 2014-08-21 15:51:18 +0800 |
| commit | d7eb4550b0d33d3b932c166d2216a4c468d49649 (patch) | |
| tree | 8b8edc16a321d96a548b3837c9f2fc5105541bb9 /scene/animation | |
| parent | 5668cec030e67a89994a97db06ca7101ab9be272 (diff) | |
Fix reset
Diffstat (limited to 'scene/animation')
| -rw-r--r-- | scene/animation/tween.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scene/animation/tween.cpp b/scene/animation/tween.cpp index 48a2fd564b..4acf509283 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; } |