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

Merge pull request #115175 from vaner-org/oneshot-request-fire-override-abort

Browse Source 
Allow `ONE_SHOT_REQUEST_FIRE` to override OneShot abortion
This commit is contained in:
Rémi Verschelde
2026-01-21 18:02:24 +01:00
committed by GitHub
parent 8b2d988ba7 4cd3e5a76e
commit 76addfff12
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scene/animation/animation_blend_tree.cpp
View File

@@ -590,7 +590,7 @@ AnimationNode::NodeTimeInfo AnimationNodeOneShot::_process(const AnimationMixer:
}
bool is_abort = cur_request == ONE_SHOT_REQUEST_ABORT;
if (is_reset && (is_fading_out || (abort_on_reset && cur_active))) {
if (is_reset && !do_start && (is_fading_out || (abort_on_reset && cur_active))) {
is_abort = true;
}