godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Fix animation play backward doesn't process current key&animtrack seek

This commit is contained in:
Silc Renew 2022-12-05 09:30:47 +09:00
parent 55da3c1631
commit 8c540b1d71
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/plugins/animation_player_editor_plugin.cpp
View File

@ -216,8 +216,8 @@ void AnimationPlayerEditor::_play_from_pressed() {
player->stop(); //so it won't blend with itself 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."); 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->seek(time);
player->play(current);
} }
//unstop //unstop
@ -254,8 +254,8 @@ void AnimationPlayerEditor::_play_bw_from_pressed() {
player->stop(); //so it won't blend with itself 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."); 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->seek(time);
player->play(current, -1, -1, true);
} }
//unstop //unstop

2
scene/animation/animation_player.cpp
View File

@ -955,7 +955,7 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double
break; break;
} }
if (player->is_playing() || p_seeked) { if (player->is_playing()) {
player->play(anim_name); player->play(anim_name);
player->seek(at_anim_pos); player->seek(at_anim_pos);
nc->animation_playing = true; nc->animation_playing = true;