diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-01-21 22:27:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-21 22:27:50 +0100 |
commit | 5127afa812f80c02e6f9fada854d46482daafca4 (patch) | |
tree | 8e4bf30bde2e456fe430f97dd0139febf6a332a0 /scene/animation/animation_blend_tree.cpp | |
parent | 6190690757ca322393f13e44bc2ceed79b362b45 (diff) | |
parent | 4faaf6089a3880d673c5fc51a260128bfe59b351 (diff) |
Merge pull request #35413 from akien-mga/if-0-means-couperet
Remove unused #if 0'ed code
Diffstat (limited to 'scene/animation/animation_blend_tree.cpp')
-rw-r--r-- | scene/animation/animation_blend_tree.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/scene/animation/animation_blend_tree.cpp b/scene/animation/animation_blend_tree.cpp index a604fb9604..5f606ff4c5 100644 --- a/scene/animation/animation_blend_tree.cpp +++ b/scene/animation/animation_blend_tree.cpp @@ -29,6 +29,7 @@ /*************************************************************************/ #include "animation_blend_tree.h" + #include "scene/scene_string_names.h" void AnimationNodeAnimation::set_animation(const StringName &p_name) { @@ -718,21 +719,6 @@ String AnimationNodeTransition::get_input_caption(int p_input) const { return inputs[p_input].name; } -#if 0 - Ref<AnimationNodeBlendTree> tree = get_parent(); - - if (tree.is_valid() && current >= 0) { - prev = current; - prev_xfading = xfade; - time = 0; - current = p_current; - switched = true; - _change_notify("current"); - } else { - current = p_current; - } -#endif - void AnimationNodeTransition::set_cross_fade_time(float p_fade) { xfade = p_fade; } |