diff options
| author | Juan Linietsky | 2018-05-07 16:12:27 -0300 |
|---|---|---|
| committer | GitHub | 2018-05-07 16:12:27 -0300 |
| commit | 6d46f73ec3e3eadaf25927633bdc0aa1eaca93ab (patch) | |
| tree | 13c691ec60e4307a9ece3272ceaee10d098514f1 /scene/animation/animation_tree_player.cpp | |
| parent | dff3a2f3789ee2fb7eebb1d115097b944b439a18 (diff) | |
| parent | 9e57a07fb60fcd6c55bd51cf63d4c3cf4c6a3b26 (diff) | |
| download | godot-6d46f73ec3e3eadaf25927633bdc0aa1eaca93ab.tar.gz godot-6d46f73ec3e3eadaf25927633bdc0aa1eaca93ab.tar.zst godot-6d46f73ec3e3eadaf25927633bdc0aa1eaca93ab.zip | |
Merge pull request #11973 from AndreaCatania/ragdoll
Ragdoll - Physical bone node
Diffstat (limited to 'scene/animation/animation_tree_player.cpp')
| -rw-r--r-- | scene/animation/animation_tree_player.cpp | 8 |
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 |