summaryrefslogtreecommitdiff
path: root/scene/animation
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-05-21 01:06:21 +0200
committerGitHub <noreply@github.com>2022-05-21 01:06:21 +0200
commit8adf04804550957f43c810b13fcce66dd76e5fd8 (patch)
tree2ee58365f1092587277770ceaedfc1e35454acfd /scene/animation
parentf4126cc902b0cbb100bcf1b37ee15df5a8430d21 (diff)
parent45af29da8095af16729955117a165d23e77cd740 (diff)
Merge pull request #61194 from reduz/new-hash-set
Add a new HashSet template
Diffstat (limited to 'scene/animation')
-rw-r--r--scene/animation/animation_player.h2
-rw-r--r--scene/animation/animation_tree.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/animation/animation_player.h b/scene/animation/animation_player.h
index 3ef87dba28..c679405dfe 100644
--- a/scene/animation/animation_player.h
+++ b/scene/animation/animation_player.h
@@ -184,7 +184,7 @@ private:
int cache_update_prop_size = 0;
TrackNodeCache::BezierAnim *cache_update_bezier[NODE_CACHE_UPDATE_MAX];
int cache_update_bezier_size = 0;
- RBSet<TrackNodeCache *> playing_caches;
+ HashSet<TrackNodeCache *> playing_caches;
uint64_t accum_pass = 1;
float speed_scale = 1.0;
diff --git a/scene/animation/animation_tree.h b/scene/animation/animation_tree.h
index 37cd22568a..b646efede4 100644
--- a/scene/animation/animation_tree.h
+++ b/scene/animation/animation_tree.h
@@ -267,7 +267,7 @@ private:
};
HashMap<NodePath, TrackCache *> track_cache;
- RBSet<TrackCache *> playing_caches;
+ HashSet<TrackCache *> playing_caches;
Ref<AnimationNode> root;