godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed animation_player errors displaying wrong property.

Browse Source 
Fixed animation_player errors displaying wrong property. It appears the cache wasn't created property.

This fixes #17718
This commit is contained in:
DualMatrix 2018-09-09 00:32:57 +02:00
parent 4b6846a59d
commit bb58bcfff6
1 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scene/animation/animation_player.cpp
View File

@ -263,11 +263,7 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim) {
key.id = id; key.id = id;
key.bone_idx = bone_idx; key.bone_idx = bone_idx;
if (node_cache_map.has(key)) { if (!node_cache_map.has(key))
p_anim->node_cache.write[i] = &node_cache_map[key];
} else {
node_cache_map[key] = TrackNodeCache(); node_cache_map[key] = TrackNodeCache();
p_anim->node_cache.write[i] = &node_cache_map[key]; p_anim->node_cache.write[i] = &node_cache_map[key];
@ -283,7 +279,6 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim) {
// cache skeleton // cache skeleton
p_anim->node_cache[i]->skeleton = Object::cast_to<Skeleton>(child); p_anim->node_cache[i]->skeleton = Object::cast_to<Skeleton>(child);
if (p_anim->node_cache[i]->skeleton) { if (p_anim->node_cache[i]->skeleton) {
if (a->track_get_path(i).get_subname_count() == 1) { if (a->track_get_path(i).get_subname_count() == 1) {
StringName bone_name = a->track_get_path(i).get_subname(0); StringName bone_name = a->track_get_path(i).get_subname(0);
@ -294,7 +289,6 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim) {
p_anim->node_cache[i]->spatial = NULL; p_anim->node_cache[i]->spatial = NULL;
printf("bone is %ls\n", String(bone_name).c_str()); printf("bone is %ls\n", String(bone_name).c_str());
ERR_CONTINUE(p_anim->node_cache[i]->bone_idx < 0); ERR_CONTINUE(p_anim->node_cache[i]->bone_idx < 0);
} else {
} }
} else { } else {
// no property, just use spatialnode // no property, just use spatialnode
@ -302,7 +296,6 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim) {
} }
} }
} }
}
if (a->track_get_type(i) == Animation::TYPE_VALUE) { if (a->track_get_type(i) == Animation::TYPE_VALUE) {