aboutsummaryrefslogtreecommitdiff
path: root/scene/animation/animation_tree_player.h
diff options
context:
space:
mode:
authorBojidar Marinov2017-05-30 23:20:15 +0300
committerBojidar Marinov2017-11-21 20:58:21 +0200
commit0cf9597758f3af3afc951d0bf02dee1aeb9a6daf (patch)
tree2a5fe6f1ba36a79ccc0091d0235ec48e4d92012e /scene/animation/animation_tree_player.h
parent7bbde636e802f85c4ed9ee95b9ef19abc1aa249d (diff)
downloadgodot-0cf9597758f3af3afc951d0bf02dee1aeb9a6daf.tar.gz
godot-0cf9597758f3af3afc951d0bf02dee1aeb9a6daf.tar.zst
godot-0cf9597758f3af3afc951d0bf02dee1aeb9a6daf.zip
Diffstat (limited to 'scene/animation/animation_tree_player.h')
-rw-r--r--scene/animation/animation_tree_player.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/animation/animation_tree_player.h b/scene/animation/animation_tree_player.h
index 3e2bb8819..c49b0c4d1 100644
--- a/scene/animation/animation_tree_player.h
+++ b/scene/animation/animation_tree_player.h
@@ -78,14 +78,14 @@ private:
struct TrackKey {
uint32_t id;
- StringName property;
+ StringName subpath_concatenated;
int bone_idx;
inline bool operator<(const TrackKey &p_right) const {
if (id == p_right.id) {
if (bone_idx == p_right.bone_idx) {
- return property < p_right.property;
+ return subpath_concatenated < p_right.subpath_concatenated;
} else
return bone_idx < p_right.bone_idx;
} else
@@ -99,7 +99,7 @@ private:
Spatial *spatial;
Skeleton *skeleton;
int bone_idx;
- StringName property;
+ Vector<StringName> subpath;
Vector3 loc;
Quat rot;