summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-08-20 10:58:00 +0200
committerGitHub <noreply@github.com>2019-08-20 10:58:00 +0200
commit1b9d4e15de771ff83980a61cacd928748c911ade (patch)
tree28cc7cd6bfc4a85f1dc18fae1ff41cd53fca1631 /scene
parentcce148b0242836b5c32a7fa6c39013a2fc1c9eff (diff)
parent9d849c21ccde126dd841d4b9c89dfe3c1c865599 (diff)
Merge pull request #31478 from kubecz3k/anim-fix
fix animation freeze when playing animation from another AnimationPlayer
Diffstat (limited to 'scene')
-rw-r--r--scene/animation/animation_player.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp
index 30aeebfdac..051f832882 100644
--- a/scene/animation/animation_player.cpp
+++ b/scene/animation/animation_player.cpp
@@ -1200,7 +1200,9 @@ void AnimationPlayer::play(const StringName &p_name, float p_custom_blend, float
}
}
- _stop_playing_caches();
+ if (get_current_animation() != p_name) {
+ _stop_playing_caches();
+ }
c.current.from = &animation_set[name];