noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #120478 from vaner-org/oneshot-abort-on-reset-fix

Browse Source 
Fix `Abort on Reset` functionality in AnimationNodeOneShot
This commit is contained in:
Thaddeus Crews
2026-06-23 07:01:02 -05:00
parent 05924d6259 48327b235b
commit 1f59966493
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scene/animation/animation_blend_tree.cpp
+8 -8
View File
@@ -600,15 +600,15 @@ AnimationNode::NodeTimeInfo AnimationNodeOneShot::_process(ProcessState &p_proce
bool p_is_external_seeking = p_playback_info.is_external_seeking;
bool do_start = cur_request == ONE_SHOT_REQUEST_FIRE;
bool is_reset = Math::is_zero_approx(p_time) && p_seek && !p_is_external_seeking;
if (is_reset && cur_internal_active) {
do_start = true;
}
bool is_abort = cur_request == ONE_SHOT_REQUEST_ABORT;
if (is_reset && !do_start && (is_fading_out || (abort_on_reset && cur_active))) {
is_abort = true;
bool is_reset = Math::is_zero_approx(p_time) && p_seek && !p_is_external_seeking;
if (is_reset) {
if (!do_start && (is_fading_out || (abort_on_reset && cur_active))) {
is_abort = true;
}
if (cur_internal_active) {
do_start = true;
}
}
if (is_abort) {