summaryrefslogtreecommitdiffstats
path: root/scene/animation/animation_cache.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-06-19 01:43:02 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-06-19 01:43:02 -0300
commit7c20c386c519185bd7884dd770588a360fec9a11 (patch)
tree6b40350e17dc0e4f7f1e871922f7c177e485251f /scene/animation/animation_cache.cpp
parent29177e1e9b2644cfa2d5efe6fcfe2605b84ed68c (diff)
downloadredot-engine-7c20c386c519185bd7884dd770588a360fec9a11.tar.gz
-Added trigger mode to tracks, useful for properties that work as triggers, such as playing a sample, an animation, etc.
-Better interpolation of discrete tracks, fixes #4417
Diffstat (limited to 'scene/animation/animation_cache.cpp')
-rw-r--r--scene/animation/animation_cache.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/animation/animation_cache.cpp b/scene/animation/animation_cache.cpp
index b1123897b2..113e2c2278 100644
--- a/scene/animation/animation_cache.cpp
+++ b/scene/animation/animation_cache.cpp
@@ -301,7 +301,7 @@ void AnimationCache::set_all(float p_time, float p_delta) {
} break;
case Animation::TYPE_VALUE: {
- if (animation->value_track_is_continuous(i)) {
+ if (animation->value_track_get_update_mode(i)==Animation::UPDATE_CONTINUOUS || (animation->value_track_get_update_mode(i)==Animation::UPDATE_DISCRETE && p_delta==0)) {
Variant v = animation->value_track_interpolate(i,p_time);
set_track_value(i,v);
} else {