Merge pull request #62337 from reduz/respect-disabled-animation-tracks

Respect disabled animation tracks

2 files changed, 7 insertions, 0 deletions

diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp
index e3c83e3a9e..2afe9ac35f 100644
--- a/scene/animation/animation_player.cpp
+++ b/scene/animation/animation_player.cpp
@@ -283,6 +283,9 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim, Node *p_root_ov
 	setup_pass++;
 
 	for (int i = 0; i < a->get_track_count(); i++) {
+		if (!a->track_is_enabled(i)) {
+			continue;
+		}
 		p_anim->node_cache.write[i] = nullptr;
 		Ref<Resource> resource;
 		Vector<StringName> leftover_path;
diff --git a/scene/animation/animation_tree.cpp b/scene/animation/animation_tree.cpp
index 136285c4dc..d95b00dd32 100644
--- a/scene/animation/animation_tree.cpp
+++ b/scene/animation/animation_tree.cpp
@@ -965,6 +965,10 @@ void AnimationTree::_process_graph(double p_delta) {
 #endif // _3D_DISABLED
 
 			for (int i = 0; i < a->get_track_count(); i++) {
+				if (!a->track_is_enabled(i)) {
+					continue;
+				}
+
 				NodePath path = a->track_get_path(i);
 
 				ERR_CONTINUE(!track_cache.has(path));