summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilc Renew <tokage.it.lab@gmail.com>2022-12-05 09:30:47 +0900
committerSilc Renew <tokage.it.lab@gmail.com>2022-12-05 15:59:08 +0900
commit8c540b1d7194e41caa11975cb6f71fe988d10447 (patch)
treeeeddaff77d4887c21b824065a6086a578a0c6a29
parent55da3c1631906d7daabcc8bb5b43a74235567f39 (diff)
Fix animation play backward doesn't process current key&animtrack seek
-rw-r--r--editor/plugins/animation_player_editor_plugin.cpp4
-rw-r--r--scene/animation/animation_player.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp
index 338688f274..5183a738ae 100644
--- a/editor/plugins/animation_player_editor_plugin.cpp
+++ b/editor/plugins/animation_player_editor_plugin.cpp
@@ -216,8 +216,8 @@ void AnimationPlayerEditor::_play_from_pressed() {
player->stop(); //so it won't blend with itself
}
ERR_FAIL_COND_EDMSG(!_validate_tracks(player->get_animation(current)), "Animation tracks may have any invalid key, abort playing.");
- player->play(current);
player->seek(time);
+ player->play(current);
}
//unstop
@@ -254,8 +254,8 @@ void AnimationPlayerEditor::_play_bw_from_pressed() {
player->stop(); //so it won't blend with itself
}
ERR_FAIL_COND_EDMSG(!_validate_tracks(player->get_animation(current)), "Animation tracks may have any invalid key, abort playing.");
- player->play(current, -1, -1, true);
player->seek(time);
+ player->play(current, -1, -1, true);
}
//unstop
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp
index ca1befc135..f7baa7facc 100644
--- a/scene/animation/animation_player.cpp
+++ b/scene/animation/animation_player.cpp
@@ -955,7 +955,7 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double
break;
}
- if (player->is_playing() || p_seeked) {
+ if (player->is_playing()) {
player->play(anim_name);
player->seek(at_anim_pos);
nc->animation_playing = true;