Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-06 10:11:06 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #30527 from bojidar-bg/29436-timescale-node-uneditable

Browse Source 
Fix AnimationTree editor messing up parameters when nested
This commit is contained in:
Rémi Verschelde 2019-07-11 22:04:29 +02:00 committed by GitHub
commit 3045697e4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/plugins/animation_blend_tree_editor_plugin.cpp
View File

@ -878,9 +878,7 @@ void AnimationNodeBlendTreeEditor::edit(const Ref<AnimationNode> &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();

5
editor/plugins/animation_tree_editor_plugin.cpp
View File

@ -115,6 +115,8 @@ void AnimationTreeEditor::edit_path(const Vector<String> &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<String> &p_path) {
}
} else {
current_root = 0;
edited_path = button_path;
}
edited_path = button_path;
_update_path();
}