diff options
author | Juan Linietsky <reduzio@gmail.com> | 2018-06-21 18:08:11 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2018-06-21 18:08:11 -0300 |
commit | b80946ee0dbb7c28021c55d2623a35e89fc972f4 (patch) | |
tree | aae498f78f1fc7df6f05869ac2b92cf8aea92478 /editor/editor_node.cpp | |
parent | a0719533bdc4e99a24bd02886fc77a29d5d30dfc (diff) |
Fix crashes, ability to add blendpsace into blendtree, ability to delete with delete key
Diffstat (limited to 'editor/editor_node.cpp')
-rw-r--r-- | editor/editor_node.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index fb5a2b84d3..83f1cd40ba 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -1309,7 +1309,11 @@ bool EditorNode::item_has_editor(Object *p_object) { void EditorNode::edit_item(Object *p_object) { - Vector<EditorPlugin *> sub_plugins = editor_data.get_subeditors(p_object); + Vector<EditorPlugin *> sub_plugins; + + if (p_object) { + sub_plugins = editor_data.get_subeditors(p_object); + } if (!sub_plugins.empty()) { _display_top_editors(false); @@ -1317,6 +1321,8 @@ void EditorNode::edit_item(Object *p_object) { _set_top_editors(sub_plugins); _set_editing_top_editors(p_object); _display_top_editors(true); + } else { + _hide_top_editors(); } } |