Merge pull request godotengine#115125 from TokageItLab/clear-os-fadeout-fire

Repiteo · Repiteo · commit 2327a823578a · 2026-02-23T11:59:17.000-06:00
Clear fade-out on request firing in AnimationNodeOneShot
diff --git a/scene/animation/animation_blend_tree.cpp b/scene/animation/animation_blend_tree.cpp
@@ -644,6 +644,9 @@ AnimationNode::NodeTimeInfo AnimationNodeOneShot::_process(const AnimationMixer:
 		set_parameter(request, ONE_SHOT_REQUEST_NONE);
 		set_parameter(internal_active, true);
 		set_parameter(active, true);
+		// Clear fade-out.
+		is_fading_out = false;
+		cur_fade_out_remaining = 0;
 	}
 
 	real_t blend = 1.0;

Original file line number	Diff line number	Diff line change
`@@ -644,6 +644,9 @@ AnimationNode::NodeTimeInfo AnimationNodeOneShot::_process(const AnimationMixer:`
`644`	`644`	`set_parameter(request, ONE_SHOT_REQUEST_NONE);`
`645`	`645`	`set_parameter(internal_active, true);`
`646`	`646`	`set_parameter(active, true);`
	`647`	`+ // Clear fade-out.`
	`648`	`+ is_fading_out = false;`
	`649`	`+ cur_fade_out_remaining = 0;`
`647`	`650`	`}`
`648`	`651`
`649`	`652`	`real_t blend = 1.0;`