Skip to content

Commit cb649fa

Browse files
committed
Merge mistake
1 parent f907ef1 commit cb649fa

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

scene/2d/animated_sprite_2d.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ void AnimatedSprite2D::set_animation(const StringName &p_name) {
582582
ERR_FAIL_MSG(vformat("There is no animation with name '%s'.", p_name));
583583
}
584584

585-
if (reset_frame_progress_on_animation_change || frame_count < frame) {
585+
if (reset_frame_progress_on_animation_change || frames->get_frame_count(animation) < frame) {
586586
if (std::signbit(get_playing_speed())) {
587587
set_frame_and_progress(frames->get_frame_count(animation) - 1, 1.0);
588588
} else {

0 commit comments

Comments
 (0)