diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-09-23 15:02:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-23 15:02:15 +0200 |
| commit | 159470df08c0283a2330af94d26ccbe3d009d8fd (patch) | |
| tree | cea94427a7a53188858fc9d83dca55fc0511880d /scene/animation/animation_tree_player.cpp | |
| parent | 30e16fff57cfdeb79f8e9ee6a7516e7d7cd6d376 (diff) | |
| parent | 36b5795f47c9a706e1d8c12a932de1fe2bb9893f (diff) | |
Merge pull request #32275 from godotengine/skin_support
Added skin support and simplified APIs to override bone position + glTF 2.0 import fixes
Diffstat (limited to 'scene/animation/animation_tree_player.cpp')
| -rw-r--r-- | scene/animation/animation_tree_player.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/scene/animation/animation_tree_player.cpp b/scene/animation/animation_tree_player.cpp index 8f6d53c21c..ba5936562a 100644 --- a/scene/animation/animation_tree_player.cpp +++ b/scene/animation/animation_tree_player.cpp @@ -820,11 +820,7 @@ 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; - } + t.skip = false; } /* STEP 2 PROCESS ANIMATIONS */ |