From b80946ee0dbb7c28021c55d2623a35e89fc972f4 Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Thu, 21 Jun 2018 18:08:11 -0300
Subject: Fix crashes, ability to add blendpsace into blendtree, ability to
 delete with delete key

---
 editor/editor_node.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'editor/editor_node.cpp')

diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index fb5a2b84d..83f1cd40b 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();
 	}
 }
 
-- 
cgit v1.2.3-70-g09d2