From 6d92750cf75f35bfcea60d95505b5f6d2bead76b Mon Sep 17 00:00:00 2001 From: Bojidar Marinov Date: Thu, 11 Jul 2019 21:18:53 +0300 Subject: Fix AnimationTree editor messing up parameters when nested Fixes #29436 --- editor/plugins/animation_blend_tree_editor_plugin.cpp | 4 +--- editor/plugins/animation_tree_editor_plugin.cpp | 5 +++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp index 65282ccfc2..574f906cfa 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.cpp +++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp @@ -878,9 +878,7 @@ void AnimationNodeBlendTreeEditor::edit(const Ref &p_node) { blend_tree->disconnect("removed_from_graph", this, "_removed_from_graph"); } - if (p_node.is_valid()) { - blend_tree = p_node; - } + blend_tree = p_node; if (blend_tree.is_null()) { hide(); diff --git a/editor/plugins/animation_tree_editor_plugin.cpp b/editor/plugins/animation_tree_editor_plugin.cpp index 2c1da3c10b..28dc5bf5c8 100644 --- a/editor/plugins/animation_tree_editor_plugin.cpp +++ b/editor/plugins/animation_tree_editor_plugin.cpp @@ -115,6 +115,8 @@ void AnimationTreeEditor::edit_path(const Vector &p_path) { button_path.push_back(p_path[i]); } + edited_path = button_path; + for (int i = 0; i < editors.size(); i++) { if (editors[i]->can_edit(node)) { editors[i]->edit(node); @@ -126,10 +128,9 @@ void AnimationTreeEditor::edit_path(const Vector &p_path) { } } else { current_root = 0; + edited_path = button_path; } - edited_path = button_path; - _update_path(); } -- cgit v1.2.3