Skip to content

Commit

Permalink
Merge pull request #25547 from hpvb/fix-25507
Browse files Browse the repository at this point in the history
When an animationplayer sets a property on itself recreate the caches
  • Loading branch information
akien-mga authored Feb 1, 2019
2 parents 58de384 + 37aa06b commit 8698876
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions scene/animation/animation_player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -344,10 +344,16 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float

for (int i = 0; i < a->get_track_count(); i++) {

// If an animation changes this animation (or it animates itself)
// we need to recreate our animation cache
if (p_anim->node_cache.size() != a->get_track_count()) {
_ensure_node_caches(p_anim);
}

TrackNodeCache *nc = p_anim->node_cache[i];

if (!nc) // no node cache for this track, skip it
continue;
if (!nc)
continue; // no node cache for this track, skip it

if (!a->track_is_enabled(i))
continue; // do nothing if the track is disabled
Expand Down

0 comments on commit 8698876

Please sign in to comment.