From 6d4c2d002dd99cb4d51d26adaa5ca2977f16aa93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Tue, 4 Feb 2025 20:41:25 +0100
Subject: [PATCH] Revert "Use AHashMap for RBMap nodes and HashMap
 input_activity"

This reverts commit c91c604eaa66d2307d13655ce513392e3bae77d6.

This caused a critical regression:

- Fixes #102374.
---
 scene/animation/animation_blend_tree.h | 2 +-
 scene/animation/animation_tree.h       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scene/animation/animation_blend_tree.h b/scene/animation/animation_blend_tree.h
index 1b3d7f236e..36a391ebdb 100644
--- a/scene/animation/animation_blend_tree.h
+++ b/scene/animation/animation_blend_tree.h
@@ -410,7 +410,7 @@ class AnimationNodeBlendTree : public AnimationRootNode {
 		Vector<StringName> connections;
 	};
 
-	AHashMap<StringName, Node> nodes;
+	RBMap<StringName, Node, StringName::AlphCompare> nodes;
 
 	Vector2 graph_offset;
 
diff --git a/scene/animation/animation_tree.h b/scene/animation/animation_tree.h
index d5b1d4ea46..5ac24b4985 100644
--- a/scene/animation/animation_tree.h
+++ b/scene/animation/animation_tree.h
@@ -306,8 +306,8 @@ private:
 		uint64_t last_pass = 0;
 		real_t activity = 0.0;
 	};
-	mutable AHashMap<StringName, LocalVector<Activity>> input_activity_map;
-	mutable AHashMap<StringName, LocalVector<Activity> *> input_activity_map_get;
+	mutable HashMap<StringName, LocalVector<Activity>> input_activity_map;
+	mutable HashMap<StringName, LocalVector<Activity> *> input_activity_map_get;
 
 	NodePath animation_player;