diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-06-15 08:14:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-15 08:14:35 +0200 |
| commit | 0f1ae03626941590f6d884e8ceafc9d2264483d4 (patch) | |
| tree | 0f34b8ae78713f269d6670f435827c7ddc2c7396 /scene | |
| parent | 9cf8b235707ef2290e4df049e7954ffb81bc57f5 (diff) | |
| parent | 048f5a6b75b2a2022c591dc68ca5e440c9e4e9f9 (diff) | |
Merge pull request #5149 from m4nu3lf/master
TimeSeek node in AnimationTreePlayer now propagates filters
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/animation/animation_tree_player.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/animation/animation_tree_player.cpp b/scene/animation/animation_tree_player.cpp index 211c5961b0..0f7ed1cb29 100644 --- a/scene/animation/animation_tree_player.cpp +++ b/scene/animation/animation_tree_player.cpp @@ -669,7 +669,7 @@ float AnimationTreePlayer::_process_node(const StringName& p_node,AnimationNode } tsn->seek_pos=-1; - return _process_node(tsn->inputs[0].node,r_prev_anim,p_weight,p_time,p_seek); + return _process_node(tsn->inputs[0].node,r_prev_anim,p_weight,p_time,p_seek, p_filter, p_reverse_weight); } break; case NODE_TRANSITION: { |