Revert "Use AHashMap for RBMap nodes and HashMap input_activity"

This reverts commit c91c604. This caused a critical regression: - Fixes #102374.
godotengine · Feb 4, 2025 · 6d4c2d0 · 6d4c2d0
1 parent 0b6a717
commit 6d4c2d0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -306,8 +306,8 @@ class AnimationTree : public AnimationMixer {
 		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;