summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-07-25 10:22:06 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-07-25 10:22:06 +0200
commit0b26cc1c39da7e1d1a5eca3e3a7e35b4a7245109 (patch)
treeb4efe9414fc2cbc8ce2e0c29fe7b3872b98e95ca
parentf0e20efb33adbf9d6d9c111d646685a30bdd8f4f (diff)
parent7c4bc0a37813e0503d89b8b13bdb938413d70590 (diff)
downloadredot-engine-0b26cc1c39da7e1d1a5eca3e3a7e35b4a7245109.tar.gz
Merge pull request #94722 from TokageItLab/total-weight-vector-type
AnimationMixer: Fix `processed_hashes` type to `Animation::TypeHash` instead of `int`
-rw-r--r--scene/animation/animation_mixer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/animation/animation_mixer.cpp b/scene/animation/animation_mixer.cpp
index e011dec79b..20dd12f8c3 100644
--- a/scene/animation/animation_mixer.cpp
+++ b/scene/animation/animation_mixer.cpp
@@ -1081,7 +1081,7 @@ void AnimationMixer::_blend_calc_total_weight() {
Ref<Animation> a = ai.animation_data.animation;
real_t weight = ai.playback_info.weight;
Vector<real_t> track_weights = ai.playback_info.track_weights;
- Vector<int> processed_hashes;
+ Vector<Animation::TypeHash> processed_hashes;
for (int i = 0; i < a->get_track_count(); i++) {
if (!a->track_is_enabled(i)) {
continue;