Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

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
commit 76addfff12
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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;
}