summaryrefslogtreecommitdiff
path: root/scene/animation
diff options
context:
space:
mode:
Diffstat (limited to 'scene/animation')
-rw-r--r--scene/animation/tween.cpp6
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;
}