summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Millner <jacob.millner@outlook.com>2024-07-03 09:56:39 -0400
committerJacob Millner <jacob.millner@outlook.com>2024-07-03 10:01:32 -0400
commit825cb3e6c52b998cceb1a4bbaf06989de4121012 (patch)
treece331082a5f44a6247dd4f99a987618ed4c18a07
parentf0d15bbfdfde1c1076903afb7a7db373580d5534 (diff)
downloadredot-engine-825cb3e6c52b998cceb1a4bbaf06989de4121012.tar.gz
fix the sorting of blend_times in animation player
Modify BlendKey's sort to use AlphaCompare in order to create a deterministic sort Co-authored-by: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>
-rw-r--r--scene/animation/animation_player.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/animation/animation_player.h b/scene/animation/animation_player.h
index f270f32193..508b2c49fa 100644
--- a/scene/animation/animation_player.h
+++ b/scene/animation/animation_player.h
@@ -95,9 +95,9 @@ private:
}
bool operator<(const BlendKey &bk) const {
if (from == bk.from) {
- return to < bk.to;
+ return StringName::AlphCompare()(to, bk.to);
} else {
- return from < bk.from;
+ return StringName::AlphCompare()(from, bk.from);
}
}
};