Merge pull request #38107 from EspeuteClement/master

godotengine · Sep 15, 2021 · f2c4494 · f2c4494
2 parents 3b0c195 + aa72af4
commit f2c4494
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp
@@ -737,7 +737,7 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double
 					if (anim->has_loop()) {
 						at_anim_pos = Math::fposmod(p_time - pos, (double)anim->get_length()); //seek to loop
 					} else {
-						at_anim_pos = MAX((double)anim->get_length(), p_time - pos); //seek to end
+						at_anim_pos = MIN((double)anim->get_length(), p_time - pos); //seek to end
 					}
 
 					if (player->is_playing() || p_seeked) {
@@ -765,6 +765,7 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double
 							}
 						} else {
 							player->play(anim_name);
+							player->seek(0.0, true);
 							nc->animation_playing = true;
 							playing_caches.insert(nc);
 						}