aboutsummaryrefslogtreecommitdiff
path: root/scene/animation/animation_tree_player.cpp
diff options
context:
space:
mode:
authorAndreaCatania2017-10-03 18:49:32 +0200
committerAndrea Catania2018-05-07 21:03:16 +0200
commit9e57a07fb60fcd6c55bd51cf63d4c3cf4c6a3b26 (patch)
treeccf404b982a662dfba1c3c5d663ba16b6f7ba2e3 /scene/animation/animation_tree_player.cpp
parent8c30337565326f313e398f6428eda5cb17614f14 (diff)
downloadgodot-9e57a07fb60fcd6c55bd51cf63d4c3cf4c6a3b26.tar.gz
godot-9e57a07fb60fcd6c55bd51cf63d4c3cf4c6a3b26.tar.zst
godot-9e57a07fb60fcd6c55bd51cf63d4c3cf4c6a3b26.zip
Diffstat (limited to 'scene/animation/animation_tree_player.cpp')
-rw-r--r--scene/animation/animation_tree_player.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/scene/animation/animation_tree_player.cpp b/scene/animation/animation_tree_player.cpp
index afdb8b6f7..ce5b372d7 100644
--- a/scene/animation/animation_tree_player.cpp
+++ b/scene/animation/animation_tree_player.cpp
@@ -812,6 +812,12 @@ void AnimationTreePlayer::_process_animation(float p_delta) {
t.value = t.object->get_indexed(t.subpath);
t.value.zero();
+
+ if (t.skeleton) {
+ t.skip = t.skeleton->is_bone_ignore_animation(t.bone_idx);
+ } else {
+ t.skip = false;
+ }
}
/* STEP 2 PROCESS ANIMATIONS */
@@ -884,7 +890,7 @@ void AnimationTreePlayer::_process_animation(float p_delta) {
Track &t = E->get();
- if (!t.object)
+ if (t.skip || !t.object)
continue;
if (t.subpath.size()) { // value track