Merge pull request #26068 from luizcarlos1405/master

Fix AnimationPlayer jumping to the beggining after ending on editor.

1 files changed, 8 insertions, 4 deletions

diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp
index 992eb365ed..43ec8cebb0 100644
--- a/scene/animation/animation_player.cpp
+++ b/scene/animation/animation_player.cpp
@@ -938,7 +938,6 @@ void AnimationPlayer::_animation_process(float p_delta) {
 			} else {
 				//stop();
 				playing = false;
-				playback.current.pos = 0;
 				_set_process(false);
 				if (end_notify)
 					emit_signal(SceneStringNames::get_singleton()->animation_finished, playback.assigned);
@@ -1196,9 +1195,14 @@ void AnimationPlayer::play(const StringName &p_name, float p_custom_blend, float
 
 	if (c.assigned != name) { // reset
 		c.current.pos = p_from_end ? c.current.from->animation->get_length() : 0;
-	} else if (p_from_end && c.current.pos == 0) {
-		// Animation reset BUT played backwards, set position to the end
-		c.current.pos = c.current.from->animation->get_length();
+	} else {
+		if (p_from_end && c.current.pos == 0) {
+			// Animation reset BUT played backwards, set position to the end
+			c.current.pos = c.current.from->animation->get_length();
+		} else if (!p_from_end && c.current.pos == c.current.from->animation->get_length()) {
+			// Animation resumed but already ended, set position to the beggining
+			c.current.pos = 0;
+		}
 	}
 
 	c.current.speed_scale = p_custom_scale;