diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp
index 85965768cc1..02c0e2daaaa 100644
--- a/editor/connections_dialog.cpp
+++ b/editor/connections_dialog.cpp
@@ -341,8 +341,7 @@ ConnectDialog::ConnectDialog() {
 
 	vbc_right->add_margin_child(TTR("Add Extra Call Argument:"), add_bind_hb);
 
-	bind_editor = memnew(PropertyEditor);
-	bind_editor->hide_top_label();
+	bind_editor = memnew(EditorInspector);
 
 	vbc_right->add_margin_child(TTR("Extra Call Arguments:"), bind_editor, true);
 
diff --git a/editor/connections_dialog.h b/editor/connections_dialog.h
index 932ff693e46..1f7ff87e24f 100644
--- a/editor/connections_dialog.h
+++ b/editor/connections_dialog.h
@@ -35,7 +35,7 @@
 #ifndef CONNECTIONS_DIALOG_H
 #define CONNECTIONS_DIALOG_H
 
-#include "editor/property_editor.h"
+#include "editor/editor_inspector.h"
 #include "editor/scene_tree_editor.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_button.h"
@@ -62,7 +62,7 @@ class ConnectDialog : public ConfirmationDialog {
 
 	SceneTreeEditor *tree;
 	ConfirmationDialog *error;
-	PropertyEditor *bind_editor;
+	EditorInspector *bind_editor;
 	OptionButton *type_list;
 	CheckButton *deferred;
 	CheckButton *oneshot;
diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp
index 852e1930d29..929028c499c 100644
--- a/editor/editor_inspector.cpp
+++ b/editor/editor_inspector.cpp
@@ -38,7 +38,6 @@
 
 // TODO:
 // arrays and dictionary
-// replace property editor in sectionedpropertyeditor
 
 Size2 EditorProperty::get_minimum_size() const {
 
@@ -1138,7 +1137,6 @@ void EditorInspectorSection::_gui_input(const Ref<InputEvent> &p_event) {
 		return;
 
 #ifdef TOOLS_ENABLED
-
 	Ref<InputEventMouseButton> mb = p_event;
 	if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) {
 
@@ -1167,7 +1165,6 @@ void EditorInspectorSection::unfold() {
 	_test_unfold();
 
 #ifdef TOOLS_ENABLED
-
 	object->editor_set_section_unfold(section, true);
 	vbox->show();
 	update();
@@ -1180,8 +1177,8 @@ void EditorInspectorSection::fold() {
 
 	if (!vbox_added)
 		return; //kinda pointless
-#ifdef TOOLS_ENABLED
 
+#ifdef TOOLS_ENABLED
 	object->editor_set_section_unfold(section, false);
 	vbox->hide();
 	update();
@@ -1202,7 +1199,6 @@ EditorInspectorSection::EditorInspectorSection() {
 	foldable = false;
 	vbox = memnew(VBoxContainer);
 	vbox_added = false;
-	//add_child(vbox);
 }
 
 EditorInspectorSection::~EditorInspectorSection() {
@@ -1607,12 +1603,6 @@ void EditorInspector::update_tree() {
 			doc_hint = descr;
 		}
 
-#if 0
-		if (p.name == selected_property) {
-
-			item->select(1);
-		}
-#endif
 		for (List<Ref<EditorInspectorPlugin> >::Element *E = valid_plugins.front(); E; E = E->next()) {
 			Ref<EditorInspectorPlugin> ped = E->get();
 			bool exclusive = ped->parse_property(object, p.type, p.name, p.hint, p.hint_string, p.usage);
@@ -1812,12 +1802,6 @@ void EditorInspector::_filter_changed(const String &p_text) {
 	update_tree();
 }
 
-void EditorInspector::set_subsection_selectable(bool p_selectable) {
-}
-
-void EditorInspector::set_property_selectable(bool p_selectable) {
-}
-
 void EditorInspector::set_use_folding(bool p_enable) {
 	use_folding = p_enable;
 	update_tree();
diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h
index ebe2124a401..dccbdb9a732 100644
--- a/editor/editor_inspector.h
+++ b/editor/editor_inspector.h
@@ -349,9 +349,6 @@ public:
 	void set_use_filter(bool p_use);
 	void register_text_enter(Node *p_line_edit);
 
-	void set_subsection_selectable(bool p_selectable);
-	void set_property_selectable(bool p_selectable);
-
 	void set_use_folding(bool p_enable);
 	bool is_using_folding();
 
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 19173c6b44a..8268f81067b 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -5646,10 +5646,6 @@ EditorNode::EditorNode() {
 	add_editor_plugin(memnew(SkeletonIKEditorPlugin(this)));
 	add_editor_plugin(memnew(PhysicalBonePlugin(this)));
 
-	// FIXME: Disabled as (according to reduz) users were complaining that it gets in the way
-	// Waiting for PropertyEditor rewrite (planned for 3.1) to be refactored.
-	//add_editor_plugin(memnew(MaterialEditorPlugin(this)));
-
 	for (int i = 0; i < EditorPlugins::get_plugin_count(); i++)
 		add_editor_plugin(EditorPlugins::create(i, this));
 
diff --git a/editor/plugins/item_list_editor_plugin.cpp b/editor/plugins/item_list_editor_plugin.cpp
index 1f0b4e9e976..60e3d8292e3 100644
--- a/editor/plugins/item_list_editor_plugin.cpp
+++ b/editor/plugins/item_list_editor_plugin.cpp
@@ -278,19 +278,21 @@ void ItemListEditor::_add_pressed() {
 
 void ItemListEditor::_delete_pressed() {
 
-	TreeItem *ti = tree->get_selected();
-
-	if (!ti)
-		return;
-
-	if (ti->get_parent() != tree->get_root())
-		return;
-
-	int idx = ti->get_text(0).to_int();
-
 	if (selected_idx == -1)
 		return;
 
+	String current_selected = (String)property_editor->get_selected_path();
+
+	if (current_selected == "")
+		return;
+
+	// FIXME: Currently relying on selecting a *property* to derive what item to delete
+	// e.g. you select "1/enabled" to delete item 1.
+	// This should be fixed so that you can delete by selecting the item section header,
+	// or a delete button on that header.
+
+	int idx = current_selected.get_slice("/", 0).to_int();
+
 	item_plugins[selected_idx]->erase(idx);
 }
 
@@ -382,13 +384,9 @@ ItemListEditor::ItemListEditor() {
 	hbc->add_child(del_button);
 	del_button->connect("pressed", this, "_delete_button");
 
-	property_editor = memnew(PropertyEditor);
-	property_editor->hide_top_label();
-	property_editor->set_subsection_selectable(true);
+	property_editor = memnew(EditorInspector);
 	vbc->add_child(property_editor);
 	property_editor->set_v_size_flags(SIZE_EXPAND_FILL);
-
-	tree = property_editor->get_property_tree();
 }
 
 ItemListEditor::~ItemListEditor() {
diff --git a/editor/plugins/item_list_editor_plugin.h b/editor/plugins/item_list_editor_plugin.h
index d6a071b9b92..3dc3775f830 100644
--- a/editor/plugins/item_list_editor_plugin.h
+++ b/editor/plugins/item_list_editor_plugin.h
@@ -32,9 +32,9 @@
 #define ITEM_LIST_EDITOR_PLUGIN_H
 
 #include "canvas_item_editor_plugin.h"
+#include "editor/editor_inspector.h"
 #include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
-
 #include "scene/gui/menu_button.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/popup_menu.h"
@@ -210,7 +210,7 @@ class ItemListEditor : public HBoxContainer {
 	ToolButton *toolbar_button;
 
 	AcceptDialog *dialog;
-	PropertyEditor *property_editor;
+	EditorInspector *property_editor;
 	Tree *tree;
 	Button *add_button;
 	Button *del_button;
diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp
index a7c336eb16d..1baf606e7b1 100644
--- a/editor/project_settings_editor.cpp
+++ b/editor/project_settings_editor.cpp
@@ -1750,12 +1750,9 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
 	globals_editor = memnew(SectionedInspector);
 	props_base->add_child(globals_editor);
 	globals_editor->get_inspector()->set_undo_redo(EditorNode::get_singleton()->get_undo_redo());
-	globals_editor->get_inspector()->set_property_selectable(true);
-	//globals_editor->hide_top_label();
 	globals_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	globals_editor->register_search_box(search_box);
 	globals_editor->get_inspector()->connect("property_selected", this, "_item_selected");
-	//globals_editor->get_inspector()->connect("property_toggled", this, "_item_checked", varray(), CONNECT_DEFERRED);
 	globals_editor->get_inspector()->connect("property_edited", this, "_settings_prop_edited");
 	globals_editor->get_inspector()->connect("restart_requested", this, "_editor_restart_request");
 
diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp
index d9812f7425e..1c2eedfc9c5 100644
--- a/editor/property_editor.cpp
+++ b/editor/property_editor.cpp
@@ -1910,6 +1910,7 @@ void CustomPropertyEditor::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("variant_field_changed", PropertyInfo(Variant::STRING, "field")));
 	ADD_SIGNAL(MethodInfo("resource_edit_request"));
 }
+
 CustomPropertyEditor::CustomPropertyEditor() {
 
 	read_only = false;
@@ -2034,2691 +2035,8 @@ CustomPropertyEditor::CustomPropertyEditor() {
 	property_select = NULL;
 }
 
-bool PropertyEditor::_might_be_in_instance() {
-
-	if (!obj)
-		return false;
-
-	Node *node = Object::cast_to<Node>(obj);
-
-	Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
-
-	bool might_be = false;
-
-	while (node) {
-
-		if (node->get_scene_instance_state().is_valid()) {
-			might_be = true;
-			break;
-		}
-		if (node == edited_scene) {
-			if (node->get_scene_inherited_state().is_valid()) {
-				might_be = true;
-				break;
-			}
-			might_be = false;
-			break;
-		}
-		node = node->get_owner();
-	}
-
-	return might_be;
-}
-
-bool PropertyEditor::_get_instanced_node_original_property(const StringName &p_prop, Variant &value) {
-
-	Node *node = Object::cast_to<Node>(obj);
-
-	if (!node)
-		return false;
-
-	Node *orig = node;
-
-	Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
-
-	bool found = false;
-
-	while (node) {
-
-		Ref<SceneState> ss;
-
-		if (node == edited_scene) {
-			ss = node->get_scene_inherited_state();
-
-		} else {
-			ss = node->get_scene_instance_state();
-		}
-
-		if (ss.is_valid()) {
-
-			NodePath np = node->get_path_to(orig);
-			int node_idx = ss->find_node_by_path(np);
-			if (node_idx >= 0) {
-				bool lfound = false;
-				Variant lvar;
-				lvar = ss->get_property_value(node_idx, p_prop, lfound);
-				if (lfound) {
-
-					found = true;
-					value = lvar;
-				}
-			}
-		}
-		if (node == edited_scene) {
-			//just in case
-			break;
-		}
-		node = node->get_owner();
-	}
-
-	return found;
-}
-
-bool PropertyEditor::_is_property_different(const Variant &p_current, const Variant &p_orig, int p_usage) {
-
-	{
-		Node *node = Object::cast_to<Node>(obj);
-		if (!node)
-			return false;
-
-		Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
-		bool found_state = false;
-
-		while (node) {
-
-			Ref<SceneState> ss;
-
-			if (node == edited_scene) {
-				ss = node->get_scene_inherited_state();
-
-			} else {
-				ss = node->get_scene_instance_state();
-			}
-
-			if (ss.is_valid()) {
-				found_state = true;
-			}
-			if (node == edited_scene) {
-				//just in case
-				break;
-			}
-			node = node->get_owner();
-		}
-
-		if (!found_state)
-			return false; //pointless to check if we are not comparing against anything.
-	}
-
-	if (p_orig.get_type() == Variant::NIL) {
-
-		//special cases
-		if (p_current.is_zero() && p_usage & PROPERTY_USAGE_STORE_IF_NONZERO)
-			return false;
-		if (p_current.is_one() && p_usage & PROPERTY_USAGE_STORE_IF_NONONE)
-			return false;
-	}
-
-	if (p_current.get_type() == Variant::REAL && p_orig.get_type() == Variant::REAL) {
-		float a = p_current;
-		float b = p_orig;
-
-		return Math::abs(a - b) > CMP_EPSILON; //this must be done because, as some scenes save as text, there might be a tiny difference in floats due to numerical error
-	}
-
-	return bool(Variant::evaluate(Variant::OP_NOT_EQUAL, p_current, p_orig));
-}
-
-bool PropertyEditor::_is_instanced_node_with_original_property_different(const String &p_name, TreeItem *item) {
-	bool mbi = _might_be_in_instance();
-	if (mbi) {
-		Variant vorig;
-		Dictionary d = item->get_metadata(0);
-		int usage = d.has("usage") ? int(int(d["usage"]) & (PROPERTY_USAGE_STORE_IF_NONONE | PROPERTY_USAGE_STORE_IF_NONZERO)) : 0;
-		if (_get_instanced_node_original_property(p_name, vorig) || usage) {
-			Variant v = obj->get(p_name);
-
-			if (_is_property_different(v, vorig, usage)) {
-				return true;
-			}
-		}
-	}
-	return false;
-}
-
-TreeItem *PropertyEditor::find_item(TreeItem *p_item, const String &p_name) {
-
-	if (!p_item)
-		return NULL;
-
-	String name = p_item->get_metadata(1);
-
-	if (name == p_name) {
-
-		return p_item;
-	}
-
-	TreeItem *c = p_item->get_children();
-
-	while (c) {
-
-		TreeItem *found = find_item(c, p_name);
-		if (found)
-			return found;
-		c = c->get_next();
-	}
-
-	return NULL;
-}
-
-void PropertyEditor::_changed_callback(Object *p_changed, const char *p_prop) {
-
-	_changed_callbacks(p_changed, p_prop);
-}
-
-void PropertyEditor::_changed_callbacks(Object *p_changed, const String &p_prop) {
-
-	if (p_changed != obj)
-		return;
-
-	if (changing)
-		return;
-
-	if (p_prop == String())
-		update_tree_pending = true;
-	else {
-
-		pending[p_prop] = p_prop;
-	}
-}
-
-void PropertyEditor::update_property(const String &p_prop) {
-
-	if (obj)
-		_changed_callbacks(obj, p_prop);
-}
-
-void PropertyEditor::set_item_text(TreeItem *p_item, int p_type, const String &p_name, int p_hint, const String &p_hint_text) {
-
-	switch (p_type) {
-
-		case Variant::BOOL: {
-
-			p_item->set_checked(1, obj->get(p_name));
-		} break;
-		case Variant::REAL:
-		case Variant::INT: {
-
-			if (p_hint == PROPERTY_HINT_LAYERS_2D_PHYSICS || p_hint == PROPERTY_HINT_LAYERS_2D_RENDER || p_hint == PROPERTY_HINT_LAYERS_3D_PHYSICS || p_hint == PROPERTY_HINT_LAYERS_3D_RENDER) {
-				tree->update();
-				break;
-			}
-
-			if (p_hint == PROPERTY_HINT_FLAGS) {
-				Vector<String> values = p_hint_text.split(",");
-				String flags;
-				int val = obj->get(p_name);
-				for (int i = 0; i < values.size(); i++) {
-
-					String v = values[i];
-					if (v == "")
-						continue;
-					if (!(val & (1 << i)))
-						continue;
-
-					if (flags != "")
-						flags += ", ";
-					flags += v;
-				}
-				p_item->set_text(1, flags);
-				break;
-			}
-
-			if (p_hint == PROPERTY_HINT_EXP_EASING) {
-
-				p_item->set_text(1, String::num(obj->get(p_name), 2));
-				break;
-			}
-
-			if (p_type == Variant::REAL) {
-				p_item->set_range(1, obj->get(p_name));
-
-			} else {
-				/* FIXME: Why are both statements equal? */
-				p_item->set_range(1, obj->get(p_name));
-			}
-
-			p_item->set_editable(1, !read_only);
-
-		} break;
-		case Variant::STRING:
-
-			if (p_hint == PROPERTY_HINT_TYPE_STRING) {
-
-				p_item->set_text(1, obj->get(p_name));
-			}
-
-			if (p_hint == PROPERTY_HINT_METHOD_OF_VARIANT_TYPE ||
-					p_hint == PROPERTY_HINT_METHOD_OF_BASE_TYPE ||
-					p_hint == PROPERTY_HINT_METHOD_OF_INSTANCE ||
-					p_hint == PROPERTY_HINT_METHOD_OF_SCRIPT ||
-					p_hint == PROPERTY_HINT_PROPERTY_OF_VARIANT_TYPE ||
-					p_hint == PROPERTY_HINT_PROPERTY_OF_BASE_TYPE ||
-					p_hint == PROPERTY_HINT_PROPERTY_OF_INSTANCE ||
-					p_hint == PROPERTY_HINT_PROPERTY_OF_SCRIPT) {
-
-				p_item->set_text(1, obj->get(p_name));
-			}
-
-			if (p_hint == PROPERTY_HINT_ENUM) {
-
-				Vector<String> strings = p_hint_text.split(",");
-				String current = obj->get(p_name);
-				int idx = 0;
-				for (int x = 0; x < strings.size(); x++) {
-					if (strings[x] == current) {
-						idx = x;
-						break;
-					}
-				}
-				p_item->set_text(1, p_hint_text);
-				p_item->set_range(1, idx);
-				break;
-			}
-
-		case Variant::VECTOR3:
-		case Variant::QUAT:
-		case Variant::VECTOR2:
-		case Variant::AABB:
-		case Variant::RECT2:
-		case Variant::TRANSFORM2D:
-		case Variant::BASIS:
-		case Variant::TRANSFORM: {
-
-			p_item->set_text(1, obj->get(p_name));
-
-		} break;
-		case Variant::COLOR: {
-
-			tree->update();
-
-		} break;
-		case Variant::NODE_PATH: {
-
-			p_item->set_text(1, obj->get(p_name));
-		} break;
-		case Variant::OBJECT: {
-
-			Ref<EncodedObjectAsID> encoded = obj->get(p_name); //for debugger and remote tools
-
-			if (encoded.is_valid()) {
-
-				p_item->set_text(1, "Object: " + itos(encoded->get_object_id()));
-				p_item->set_icon(1, Ref<Texture>());
-				p_item->set_custom_as_button(1, true);
-
-			} else if (obj->get(p_name).get_type() == Variant::NIL || obj->get(p_name).operator RefPtr().is_null()) {
-				p_item->set_text(1, "<null>");
-				p_item->set_icon(1, Ref<Texture>());
-				p_item->set_custom_as_button(1, false);
-
-				Dictionary d = p_item->get_metadata(0);
-				int hint = d.has("hint") ? d["hint"].operator int() : -1;
-				String hint_text = d.has("hint_text") ? d["hint_text"] : "";
-				if (hint == PROPERTY_HINT_RESOURCE_TYPE && hint_text == "Texture") {
-					p_item->set_icon(1, NULL);
-				}
-
-			} else {
-				p_item->set_custom_as_button(1, true);
-				RES res = obj->get(p_name).operator RefPtr();
-				if (res->is_class("Texture")) {
-					int tw = EditorSettings::get_singleton()->get("docks/property_editor/texture_preview_width");
-					Vector2 size(res->call("get_width"), res->call("get_height"));
-					if (size.width < size.height) {
-						tw = MAX((size.width / size.height) * tw, 1);
-					}
-					p_item->set_icon_max_width(1, tw);
-					p_item->set_icon(1, res);
-					p_item->set_text(1, "");
-
-				} else if (res->get_name() != "") {
-
-					p_item->set_text(1, res->get_name());
-				} else if (res->get_path() != "" && !res->get_path().begins_with("local://")) {
-					p_item->set_text(1, res->get_path().get_file());
-				} else {
-					p_item->set_text(1, "<" + res->get_class() + ">");
-				};
-
-				if (res.is_valid() && res->get_path().is_resource_file()) {
-					p_item->set_tooltip(1, res->get_path());
-				} else if (res.is_valid()) {
-					p_item->set_tooltip(1, res->get_name() + " (" + res->get_class() + ")");
-				}
-
-				if (has_icon(res->get_class(), "EditorIcons")) {
-
-					p_item->set_icon(0, get_icon(res->get_class(), "EditorIcons"));
-				} else {
-
-					Dictionary d = p_item->get_metadata(0);
-					int hint = d.has("hint") ? d["hint"].operator int() : -1;
-					String hint_text = d.has("hint_text") ? d["hint_text"] : "";
-					if (hint == PROPERTY_HINT_RESOURCE_TYPE) {
-
-						if (has_icon(hint_text, "EditorIcons")) {
-
-							p_item->set_icon(0, get_icon(hint_text, "EditorIcons"));
-
-						} else {
-							p_item->set_icon(0, get_icon("Object", "EditorIcons"));
-						}
-					}
-				}
-
-				if (res->is_class("Script")) {
-					p_item->set_text(1, res->get_path().get_file());
-				} else if (!res->is_class("Texture")) {
-					//texture already previews via itself
-					EditorResourcePreview::get_singleton()->queue_edited_resource_preview(res, this, "_resource_preview_done", p_item->get_instance_id());
-				}
-			}
-
-		} break;
-		default: {};
-	}
-}
-
-void PropertyEditor::_check_reload_status(const String &p_name, TreeItem *item) {
-
-	bool has_reload = false;
-	int found = -1;
-	bool is_disabled = false;
-
-	for (int i = 0; i < item->get_button_count(1); i++) {
-
-		if (item->get_button_id(1, i) == 3) {
-			found = i;
-			is_disabled = item->is_button_disabled(1, i);
-			break;
-		}
-	}
-
-	if (_is_instanced_node_with_original_property_different(p_name, item)) {
-		has_reload = true;
-	}
-
-	if (obj->call("property_can_revert", p_name).operator bool()) {
-
-		has_reload = true;
-	}
-
-	if (!has_reload && !obj->get_script().is_null()) {
-		Ref<Script> scr = obj->get_script();
-		Variant orig_value;
-		if (scr->get_property_default_value(p_name, orig_value)) {
-			if (orig_value != obj->get(p_name)) {
-				has_reload = true;
-			}
-		}
-	}
-
-	if (found != -1 && !has_reload) {
-
-		if (!is_disabled) {
-			item->erase_button(1, found);
-			if (item->get_cell_mode(1) == TreeItem::CELL_MODE_RANGE && item->get_text(1) == String()) {
-				item->add_button(1, get_icon("ReloadEmpty", "EditorIcons"), 3, true);
-			}
-		}
-	} else if (found == -1 && has_reload) {
-		item->add_button(1, get_icon("ReloadSmall", "EditorIcons"), 3);
-	} else if (found != -1 && has_reload && is_disabled) {
-		item->erase_button(1, found);
-		item->add_button(1, get_icon("ReloadSmall", "EditorIcons"), 3);
-	}
-}
-
-bool PropertyEditor::_is_drop_valid(const Dictionary &p_drag_data, const Dictionary &p_item_data) const {
-
-	Dictionary d = p_item_data;
-
-	if (d.has("type")) {
-
-		int type = d["type"];
-		if (type == Variant::OBJECT && d.has("hint") && d.has("hint_text") && int(d["hint"]) == PROPERTY_HINT_RESOURCE_TYPE) {
-
-			String allowed_type = d["hint_text"];
-
-			Dictionary drag_data = p_drag_data;
-			if (drag_data.has("type") && String(drag_data["type"]) == "resource") {
-				Ref<Resource> res = drag_data["resource"];
-				for (int i = 0; i < allowed_type.get_slice_count(","); i++) {
-					String at = allowed_type.get_slice(",", i).strip_edges();
-					if (res.is_valid() && ClassDB::is_parent_class(res->get_class(), at)) {
-						return true;
-					}
-				}
-			}
-
-			if (drag_data.has("type") && String(drag_data["type"]) == "files") {
-
-				Vector<String> files = drag_data["files"];
-
-				if (files.size() == 1) {
-					String file = files[0];
-					String ftype = EditorFileSystem::get_singleton()->get_file_type(file);
-
-					if (ftype != "") {
-
-						for (int i = 0; i < allowed_type.get_slice_count(","); i++) {
-							String at = allowed_type.get_slice(",", i).strip_edges();
-							if (ClassDB::is_parent_class(ftype, at)) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	return false;
-}
-void PropertyEditor::_mark_drop_fields(TreeItem *p_at) {
-
-	if (_is_drop_valid(get_viewport()->gui_get_drag_data(), p_at->get_metadata(0)))
-		p_at->set_custom_bg_color(1, get_color("accent_color", "Editor"), true);
-
-	if (p_at->get_children()) {
-		_mark_drop_fields(p_at->get_children());
-	}
-
-	if (p_at->get_next()) {
-		_mark_drop_fields(p_at->get_next());
-	}
-}
-
-Variant PropertyEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from) {
-
-	TreeItem *item = tree->get_item_at_position(p_point);
-	if (!item)
-		return Variant();
-
-	Dictionary d = item->get_metadata(0);
-	if (!d.has("name"))
-		return Variant();
-
-	int col = tree->get_column_at_position(p_point);
-	if (col == 0) {
-
-		Dictionary dp;
-		dp["type"] = "obj_property";
-		dp["object"] = obj;
-		dp["property"] = d["name"];
-		dp["value"] = obj->get(d["name"]);
-
-		Label *label = memnew(Label);
-		label->set_text(d["name"]);
-		set_drag_preview(label);
-		return dp;
-	}
-
-	Variant val = obj->get(d["name"]);
-
-	if (val.get_type() == Variant::OBJECT) {
-		RES res = val;
-		if (res.is_valid()) {
-
-			custom_editor->hide_menu();
-			return EditorNode::get_singleton()->drag_resource(res, p_from);
-		}
-	}
-
-	return Variant();
-}
-
-bool PropertyEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const {
-
-	TreeItem *item = tree->get_item_at_position(p_point);
-	if (!item)
-		return false;
-
-	int col = tree->get_column_at_position(p_point);
-	if (col != 1)
-		return false;
-
-	return _is_drop_valid(p_data, item->get_metadata(0));
-}
-void PropertyEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) {
-
-	TreeItem *item = tree->get_item_at_position(p_point);
-	if (!item)
-		return;
-
-	int col = tree->get_column_at_position(p_point);
-	if (col != 1)
-		return;
-
-	if (!_is_drop_valid(p_data, item->get_metadata(0)))
-		return;
-
-	Dictionary d = item->get_metadata(0);
-
-	if (!d.has("name"))
-		return;
-
-	String name = d["name"];
-
-	Dictionary drag_data = p_data;
-	if (drag_data.has("type") && String(drag_data["type"]) == "resource") {
-		Ref<Resource> res = drag_data["resource"];
-		if (res.is_valid()) {
-			_edit_set(name, res);
-			return;
-		}
-	}
-
-	if (drag_data.has("type") && String(drag_data["type"]) == "files") {
-
-		Vector<String> files = drag_data["files"];
-
-		if (files.size() == 1) {
-			String file = files[0];
-			RES res = ResourceLoader::load(file);
-			if (res.is_valid()) {
-				_edit_set(name, res);
-				return;
-			}
-		}
-	}
-}
-
-void PropertyEditor::_clear_drop_fields(TreeItem *p_at) {
-
-	Dictionary d = p_at->get_metadata(0);
-
-	if (d.has("type")) {
-
-		int type = d["type"];
-		if (type == Variant::OBJECT) {
-			p_at->clear_custom_bg_color(1);
-		}
-	}
-
-	if (p_at->get_children()) {
-		_clear_drop_fields(p_at->get_children());
-	}
-
-	if (p_at->get_next()) {
-		_clear_drop_fields(p_at->get_next());
-	}
-}
-
-void PropertyEditor::_notification(int p_what) {
-
-	if (p_what == NOTIFICATION_ENTER_TREE) {
-
-		get_tree()->connect("node_removed", this, "_node_removed");
-	}
-	if (p_what == NOTIFICATION_EXIT_TREE) {
-
-		get_tree()->disconnect("node_removed", this, "_node_removed");
-		edit(NULL);
-	}
-
-	if (p_what == NOTIFICATION_DRAG_BEGIN) {
-
-		if (is_visible_in_tree() && tree->get_root()) {
-			_mark_drop_fields(tree->get_root());
-		}
-	}
-
-	if (p_what == NOTIFICATION_DRAG_END) {
-		if (is_visible_in_tree() && tree->get_root()) {
-			_clear_drop_fields(tree->get_root());
-		}
-	}
-
-	if (p_what == NOTIFICATION_PHYSICS_PROCESS) {
-
-		if (refresh_countdown > 0) {
-			refresh_countdown -= get_physics_process_delta_time();
-			if (refresh_countdown <= 0) {
-				TreeItem *root = tree->get_root();
-				_refresh_item(root);
-			}
-		}
-
-		changing = true;
-
-		if (update_tree_pending) {
-
-			update_tree();
-			update_tree_pending = false;
-
-		} else {
-
-			const String *k = NULL;
-			while ((k = pending.next(k))) {
-
-				TreeItem *item = find_item(tree->get_root(), *k);
-				if (!item)
-					continue;
-
-				_check_reload_status(*k, item);
-
-				Dictionary d = item->get_metadata(0);
-				set_item_text(item, d["type"], d["name"], d["hint"], d["hint_text"]);
-			}
-		}
-
-		pending.clear();
-
-		changing = false;
-	}
-
-	if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) {
-		update_tree();
-	}
-}
-
-TreeItem *PropertyEditor::get_parent_node(String p_path, HashMap<String, TreeItem *> &item_paths, TreeItem *root, TreeItem *category) {
-
-	TreeItem *item = NULL;
-
-	if (p_path == "") {
-
-		item = category ? category : root;
-	} else if (item_paths.has(p_path)) {
-
-		item = item_paths.get(p_path);
-	} else {
-
-		TreeItem *parent = get_parent_node(p_path.left(p_path.find_last("/")), item_paths, root, NULL);
-		item = tree->create_item(parent);
-
-		String name = (p_path.find("/") != -1) ? p_path.right(p_path.find_last("/") + 1) : p_path;
-		item->set_text(0, capitalize_paths ? name.capitalize() : name);
-		item->set_tooltip(0, p_path);
-		if (item->get_parent() != root) {
-			item->set_icon(0, get_icon("Folder", "EditorIcons"));
-		}
-
-		item->set_editable(0, false);
-		if (!subsection_selectable) {
-			item->set_expand_right(0, true);
-		}
-		item->set_selectable(0, subsection_selectable);
-		item->set_editable(1, false);
-		item->set_selectable(1, subsection_selectable);
-
-		if (use_folding) {
-			if (!obj->editor_is_section_unfolded(p_path)) {
-				updating_folding = true;
-				item->set_collapsed(true);
-				updating_folding = false;
-			}
-			item->set_metadata(0, p_path);
-			foldable_property_cache.push_back(p_path);
-		}
-
-		if (item->get_parent() == root) {
-
-			item->set_custom_bg_color(0, get_color("prop_subsection", "Editor"));
-			item->set_custom_bg_color(1, get_color("prop_subsection", "Editor"));
-		}
-
-		item_paths[p_path] = item;
-	}
-
-	return item;
-}
-
-void PropertyEditor::_refresh_item(TreeItem *p_item) {
-
-	if (!p_item)
-		return;
-
-	String name = p_item->get_metadata(1);
-
-	if (name != String()) {
-
-		_check_reload_status(name, p_item);
-		Dictionary d = p_item->get_metadata(0);
-		set_item_text(p_item, d["type"], d["name"], d["hint"], d["hint_text"]);
-	}
-
-	TreeItem *c = p_item->get_children();
-
-	while (c) {
-
-		_refresh_item(c);
-
-		c = c->get_next();
-	}
-}
-
-void PropertyEditor::refresh() {
-
-	if (refresh_countdown > 0)
-		return;
-	refresh_countdown = EditorSettings::get_singleton()->get("docks/property_editor/auto_refresh_interval");
-}
-
-void PropertyEditor::update_tree() {
-
-	tree->clear();
-	foldable_property_cache.clear();
-
-	if (!obj)
-		return;
-
-	HashMap<String, TreeItem *> item_path;
-
-	TreeItem *root = tree->create_item(NULL);
-	tree->set_hide_root(true);
-
-	List<PropertyInfo> plist;
-	obj->get_property_list(&plist, true);
-
-	bool draw_red = false;
-
-	{
-		Node *nod = Object::cast_to<Node>(obj);
-		Node *es = EditorNode::get_singleton()->get_edited_scene();
-		if (nod && es != nod && nod->get_owner() != es) {
-			draw_red = true;
-		}
-	}
-
-	Color sscolor = get_color("prop_subsection", "Editor");
-
-	TreeItem *current_category = NULL;
-
-	String filter = search_box ? search_box->get_text() : "";
-	String group;
-	String group_base;
-
-	for (List<PropertyInfo>::Element *I = plist.front(); I; I = I->next()) {
-
-		PropertyInfo &p = I->get();
-
-		//make sure the property can be edited
-
-		if (p.usage & PROPERTY_USAGE_GROUP) {
-
-			group = p.name;
-			group_base = p.hint_string;
-
-			continue;
-
-		} else if (p.usage & PROPERTY_USAGE_CATEGORY) {
-
-			group = "";
-			group_base = "";
-
-			if (!show_categories)
-				continue;
-
-			List<PropertyInfo>::Element *N = I->next();
-			bool valid = true;
-			//if no properties in category, skip
-			while (N) {
-				if (N->get().usage & PROPERTY_USAGE_EDITOR)
-					break;
-				if (N->get().usage & PROPERTY_USAGE_CATEGORY) {
-					valid = false;
-					break;
-				}
-				N = N->next();
-			}
-			if (!valid)
-				continue; //empty, ignore
-			TreeItem *sep = tree->create_item(root);
-			current_category = sep;
-			String type = p.name;
-
-			if (has_icon(type, "EditorIcons"))
-				sep->set_icon(0, get_icon(type, "EditorIcons"));
-			else
-				sep->set_icon(0, get_icon("Object", "EditorIcons"));
-
-			sep->set_text(0, type);
-			sep->set_expand_right(0, true);
-			sep->set_selectable(0, false);
-			sep->set_selectable(1, false);
-			sep->set_custom_bg_color(0, get_color("prop_category", "Editor"));
-			sep->set_custom_bg_color(1, get_color("prop_category", "Editor"));
-			sep->set_text_align(0, TreeItem::ALIGN_CENTER);
-			sep->set_disable_folding(true);
-
-			if (use_doc_hints) {
-				StringName type = p.name;
-				if (!class_descr_cache.has(type)) {
-
-					String descr;
-					DocData *dd = EditorHelp::get_doc_data();
-					Map<String, DocData::ClassDoc>::Element *E = dd->class_list.find(type);
-					if (E) {
-						descr = E->get().brief_description;
-					}
-					class_descr_cache[type] = descr.word_wrap(80);
-				}
-
-				sep->set_tooltip(0, TTR("Class:") + " " + p.name + (class_descr_cache[type] == "" ? "" : "\n\n" + class_descr_cache[type]));
-			}
-			continue;
-
-		} else if (!(p.usage & PROPERTY_USAGE_EDITOR))
-			continue;
-
-		if (hide_script && p.name == "script")
-			continue;
-
-		String basename = p.name;
-		if (group != "") {
-			if (group_base != "") {
-				if (basename.begins_with(group_base)) {
-					basename = basename.replace_first(group_base, "");
-				} else if (group_base.begins_with(basename)) {
-					//keep it, this is used pretty often
-				} else {
-					group = ""; //no longer using group base, clear
-				}
-			}
-		}
-
-		if (group != "") {
-			basename = group + "/" + basename;
-		}
-
-		String name = (basename.find("/") != -1) ? basename.right(basename.find_last("/") + 1) : basename;
-
-		if (capitalize_paths) {
-			int dot = name.find(".");
-			if (dot != -1) {
-				String ov = name.right(dot);
-				name = name.substr(0, dot);
-				name = name.camelcase_to_underscore().capitalize();
-				name += ov;
-
-			} else {
-				name = name.camelcase_to_underscore().capitalize();
-			}
-		}
-
-		String path = basename.left(basename.find_last("/"));
-
-		if (use_filter && filter != "") {
-
-			String cat = path;
-
-			if (capitalize_paths)
-				cat = cat.capitalize();
-
-			if (!filter.is_subsequence_ofi(cat) && !filter.is_subsequence_ofi(name))
-				continue;
-		}
-
-		TreeItem *parent = get_parent_node(path, item_path, root, current_category);
-		int level = 0;
-		if (parent != root) {
-			level++;
-			TreeItem *parent_lev = parent;
-			while (parent_lev->get_parent() != root) {
-				parent_lev = parent_lev->get_parent();
-				level++;
-			}
-		}
-		if (level > 4)
-			level = 4;
-
-		Color col = sscolor;
-		col.a = (level / 4.0) * 0.7;
-
-		TreeItem *item = tree->create_item(parent);
-
-		if (level > 0) {
-			item->set_custom_bg_color(0, col);
-		}
-		item->set_editable(0, false);
-		item->set_selectable(0, property_selectable);
-
-		if (p.usage & PROPERTY_USAGE_CHECKABLE) {
-
-			item->set_cell_mode(0, TreeItem::CELL_MODE_CHECK);
-			item->set_selectable(0, true);
-			item->set_editable(0, true);
-			item->set_checked(0, p.usage & PROPERTY_USAGE_CHECKED);
-		}
-
-		item->set_text(0, name);
-		item->set_tooltip(0, p.name);
-
-		if (name.find(".") != -1) {
-			Color textcol = get_color("font_color", "Tree");
-			textcol.a *= 0.5;
-			//override :D
-			item->set_custom_color(0, textcol);
-			item->set_custom_color(1, textcol);
-
-			Color iconcol(1, 1, 1, 0.6);
-			item->set_icon_color(0, iconcol);
-			item->set_icon_color(1, iconcol);
-		}
-
-		if (use_doc_hints) {
-
-			StringName classname = obj->get_class_name();
-			StringName propname = p.name;
-			String descr;
-			bool found = false;
-
-			Map<StringName, Map<StringName, String> >::Element *E = descr_cache.find(classname);
-			if (E) {
-				Map<StringName, String>::Element *F = E->get().find(propname);
-				if (F) {
-					found = true;
-					descr = F->get();
-				}
-			}
-
-			if (!found) {
-				DocData *dd = EditorHelp::get_doc_data();
-				Map<String, DocData::ClassDoc>::Element *E = dd->class_list.find(classname);
-				while (E && descr == String()) {
-					for (int i = 0; i < E->get().properties.size(); i++) {
-						if (E->get().properties[i].name == propname.operator String()) {
-							descr = E->get().properties[i].description.strip_edges().word_wrap(80);
-							break;
-						}
-					}
-					if (!E->get().inherits.empty()) {
-						E = dd->class_list.find(E->get().inherits);
-					} else {
-						break;
-					}
-				}
-				descr_cache[classname][propname] = descr;
-			}
-
-			item->set_tooltip(0, TTR("Property:") + " " + p.name + (descr == "" ? "" : "\n\n" + descr));
-		}
-
-		Dictionary d;
-		d["name"] = p.name;
-		d["type"] = (int)p.type;
-		d["hint"] = (int)p.hint;
-		d["hint_text"] = p.hint_string;
-		d["usage"] = (int)p.usage;
-
-		item->set_metadata(0, d);
-		item->set_metadata(1, p.name);
-
-		if (draw_red)
-			item->set_custom_color(0, get_color("error_color", "Editor"));
-
-		if (p.name == selected_property) {
-
-			item->select(1);
-		}
-
-		switch (p.type) {
-
-			case Variant::BOOL: {
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_CHECK);
-				item->set_text(1, TTR("On"));
-				item->set_tooltip(1, obj->get(p.name) ? "True" : "False");
-				item->set_checked(1, obj->get(p.name));
-				if (show_type_icons)
-					item->set_icon(0, get_icon("bool", "EditorIcons"));
-				item->set_editable(1, !read_only);
-
-			} break;
-			case Variant::REAL:
-			case Variant::INT: {
-
-				if (p.hint == PROPERTY_HINT_EXP_EASING) {
-
-					item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-					item->set_text(1, String::num(obj->get(p.name), 2));
-					item->set_editable(1, !read_only);
-					if (show_type_icons)
-						item->set_icon(0, get_icon("Curve", "EditorIcons"));
-
-					break;
-				}
-
-				if (p.hint == PROPERTY_HINT_LAYERS_2D_PHYSICS || p.hint == PROPERTY_HINT_LAYERS_2D_RENDER || p.hint == PROPERTY_HINT_LAYERS_3D_PHYSICS || p.hint == PROPERTY_HINT_LAYERS_3D_RENDER) {
-
-					item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-					item->set_editable(1, !read_only);
-					item->set_custom_draw(1, this, "_draw_flags");
-					break;
-				}
-
-				if (p.hint == PROPERTY_HINT_FLAGS) {
-
-					item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-					item->set_editable(1, !read_only);
-
-					Vector<String> values = p.hint_string.split(",");
-					String flags;
-					int val = obj->get(p.name);
-					for (int i = 0; i < values.size(); i++) {
-
-						String v = values[i];
-						if (v == "")
-							continue;
-						if (!(val & (1 << i)))
-							continue;
-
-						if (flags != "")
-							flags += ", ";
-						flags += v;
-					}
-					item->set_text(1, flags);
-					break;
-				}
-
-				if (p.hint == PROPERTY_HINT_ENUM)
-					item->set_cell_mode(1, TreeItem::CELL_MODE_RANGE);
-				else
-					item->set_cell_mode(1, TreeItem::CELL_MODE_RANGE_EXPRESSION);
-
-				if (p.hint == PROPERTY_HINT_SPRITE_FRAME || p.hint == PROPERTY_HINT_RANGE || p.hint == PROPERTY_HINT_EXP_RANGE) {
-
-					int c = p.hint_string.get_slice_count(",");
-					float min = 0, max = 100, step = p.type == Variant::REAL ? .01 : 1;
-					if (c >= 1) {
-
-						min = p.hint_string.get_slice(",", 0).to_double();
-					}
-					if (c >= 2) {
-
-						max = p.hint_string.get_slice(",", 1).to_double();
-					}
-
-					if (p.hint != PROPERTY_HINT_SPRITE_FRAME && c >= 3) {
-
-						step = p.hint_string.get_slice(",", 2).to_double();
-					}
-
-					item->set_range_config(1, min, max, step, p.hint == PROPERTY_HINT_EXP_RANGE);
-				} else if (p.hint == PROPERTY_HINT_ENUM) {
-
-					item->set_text(1, p.hint_string);
-					if (show_type_icons)
-						item->set_icon(0, get_icon("Enum", "EditorIcons"));
-					item->set_range(1, obj->get(p.name));
-					item->set_editable(1, !read_only);
-					break;
-				} else if (p.hint == PROPERTY_HINT_OBJECT_ID) {
-
-					item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-
-					String type = p.hint_string;
-					if (type == "")
-						type = "Object";
-
-					ObjectID id = obj->get(p.name);
-					if (id != 0) {
-						item->set_text(1, type + " ID: " + itos(id));
-						item->add_button(1, get_icon("EditResource", "EditorIcons"));
-					} else {
-						item->set_text(1, TTR("[Empty]"));
-					}
-
-					if (has_icon(p.hint_string, "EditorIcons")) {
-						type = p.hint_string;
-					} else {
-						type = "Object";
-					}
-
-					item->set_icon(0, get_icon(type, "EditorIcons"));
-
-					break;
-
-				} else {
-					if (p.type == Variant::REAL) {
-
-						item->set_range_config(1, -16777216, 16777216, 0.001);
-					} else {
-
-						item->set_range_config(1, -2147483647, 2147483647, 1);
-					}
-				};
-
-				if (p.type == Variant::REAL) {
-					if (show_type_icons)
-						item->set_icon(0, get_icon("float", "EditorIcons"));
-					item->set_range(1, obj->get(p.name));
-
-				} else {
-					if (show_type_icons)
-						item->set_icon(0, get_icon("int", "EditorIcons"));
-					item->set_range(1, obj->get(p.name));
-				}
-
-				item->set_editable(1, !read_only);
-
-			} break;
-			case Variant::STRING: {
-
-				switch (p.hint) {
-
-					case PROPERTY_HINT_DIR:
-					case PROPERTY_HINT_FILE:
-					case PROPERTY_HINT_GLOBAL_DIR:
-					case PROPERTY_HINT_GLOBAL_FILE: {
-
-						item->set_cell_mode(1, TreeItem::CELL_MODE_STRING);
-						item->set_editable(1, !read_only);
-						if (show_type_icons)
-							item->set_icon(0, get_icon("File", "EditorIcons"));
-						item->set_text(1, obj->get(p.name));
-						item->add_button(1, get_icon("Folder", "EditorIcons"));
-
-					} break;
-					case PROPERTY_HINT_ENUM: {
-
-						item->set_cell_mode(1, TreeItem::CELL_MODE_RANGE);
-						Vector<String> strings = p.hint_string.split(",");
-						String current = obj->get(p.name);
-						int idx = 0;
-						for (int x = 0; x < strings.size(); x++) {
-							if (strings[x] == current) {
-								idx = x;
-								break;
-							}
-						}
-						item->set_text(1, p.hint_string);
-						item->set_range(1, idx);
-						item->set_editable(1, !read_only);
-						if (show_type_icons)
-							item->set_icon(0, get_icon("Enum", "EditorIcons"));
-
-					} break;
-					case PROPERTY_HINT_METHOD_OF_VARIANT_TYPE: ///< a property of a type
-					case PROPERTY_HINT_METHOD_OF_BASE_TYPE: ///< a method of a base type
-					case PROPERTY_HINT_METHOD_OF_INSTANCE: ///< a method of an instance
-					case PROPERTY_HINT_METHOD_OF_SCRIPT: ///< a method of a script & base
-					case PROPERTY_HINT_PROPERTY_OF_VARIANT_TYPE: ///< a property of a type
-					case PROPERTY_HINT_PROPERTY_OF_BASE_TYPE: ///< a property of a base type
-					case PROPERTY_HINT_PROPERTY_OF_INSTANCE: ///< a property of an instance
-					case PROPERTY_HINT_PROPERTY_OF_SCRIPT: ///< a property of a script & base
-					case PROPERTY_HINT_TYPE_STRING: {
-
-						item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-						item->set_editable(1, !read_only);
-						if (show_type_icons)
-							item->set_icon(0, get_icon("String", "EditorIcons"));
-						item->set_text(1, obj->get(p.name));
-
-					} break;
-
-					default: {
-
-						item->set_cell_mode(1, TreeItem::CELL_MODE_STRING);
-						item->set_editable(1, !read_only);
-						if (show_type_icons)
-							item->set_icon(0, get_icon("String", "EditorIcons"));
-						item->set_text(1, obj->get(p.name));
-						if (p.hint == PROPERTY_HINT_MULTILINE_TEXT)
-							item->add_button(1, get_icon("MultiLine", "EditorIcons"));
-
-					} break;
-				}
-
-			} break;
-			case Variant::ARRAY: {
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-				item->add_button(1, get_icon("EditResource", "EditorIcons"));
-
-				Variant v = obj->get(p.name);
-				String type_name = "Array";
-				String type_name_suffix = "";
-
-				String hint = p.hint_string;
-				while (hint.begins_with(itos(Variant::ARRAY) + ":")) {
-					type_name += "<Array";
-					type_name_suffix += ">";
-					hint = hint.right(2);
-				}
-				if (hint.find(":") >= 0) {
-					int colon_pos = hint.find(":");
-					String hint_string = hint.right(colon_pos + 1);
-					hint = hint.left(colon_pos);
-
-					PropertyHint property_hint = PROPERTY_HINT_NONE;
-
-					if (hint.find("/") >= 0) {
-						int slash_pos = hint.find("/");
-						property_hint = PropertyHint(hint.right(slash_pos + 1).to_int());
-						hint = hint.left(slash_pos);
-					}
-
-					if (property_hint == PROPERTY_HINT_RESOURCE_TYPE) {
-						type_name += "<" + hint_string;
-					} else {
-						type_name += "<" + Variant::get_type_name(Variant::Type(hint.to_int()));
-					}
-					type_name_suffix += ">";
-				}
-				type_name += type_name_suffix;
-
-				if (v.is_array())
-					item->set_text(1, type_name + "(" + itos(v.call("size")) + ")");
-				else
-					item->set_text(1, type_name + "()");
-
-				if (show_type_icons)
-					item->set_icon(0, get_icon("PoolByteArray", "EditorIcons"));
-
-			} break;
-			case Variant::DICTIONARY: {
-
-				Variant v = obj->get(p.name);
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_STRING);
-				item->set_text(1, String("Dictionary{") + itos(v.call("size")) + "}");
-				item->add_button(1, get_icon("EditResource", "EditorIcons"));
-
-				if (show_type_icons)
-					item->set_icon(0, get_icon("Dictionary", "EditorIcons"));
-
-			} break;
-
-			case Variant::POOL_INT_ARRAY: {
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-				item->add_button(1, get_icon("EditResource", "EditorIcons"));
-
-				Variant v = obj->get(p.name);
-				if (v.is_array())
-					item->set_text(1, "IntArray[" + itos(v.call("size")) + "]");
-				else
-					item->set_text(1, "IntArray[]");
-				if (show_type_icons)
-					item->set_icon(0, get_icon("PoolIntArray", "EditorIcons"));
-
-			} break;
-			case Variant::POOL_REAL_ARRAY: {
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-				item->add_button(1, get_icon("EditResource", "EditorIcons"));
-
-				Variant v = obj->get(p.name);
-				if (v.is_array())
-					item->set_text(1, "FloatArray[" + itos(v.call("size")) + "]");
-				else
-					item->set_text(1, "FloatArray[]");
-				if (show_type_icons)
-					item->set_icon(0, get_icon("PoolRealArray", "EditorIcons"));
-
-			} break;
-			case Variant::POOL_STRING_ARRAY: {
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-				item->add_button(1, get_icon("EditResource", "EditorIcons"));
-
-				Variant v = obj->get(p.name);
-				if (v.is_array())
-					item->set_text(1, "String[" + itos(v.call("size")) + "]");
-				else
-					item->set_text(1, "String[]");
-				if (show_type_icons)
-					item->set_icon(0, get_icon("PoolStringArray", "EditorIcons"));
-
-			} break;
-			case Variant::POOL_BYTE_ARRAY: {
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-				item->add_button(1, get_icon("EditResource", "EditorIcons"));
-
-				Variant v = obj->get(p.name);
-				if (v.is_array())
-					item->set_text(1, "Byte[" + itos(v.call("size")) + "]");
-				else
-					item->set_text(1, "Byte[]");
-				if (show_type_icons)
-					item->set_icon(0, get_icon("PoolByteArray", "EditorIcons"));
-
-			} break;
-			case Variant::POOL_VECTOR2_ARRAY: {
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-				item->add_button(1, get_icon("EditResource", "EditorIcons"));
-
-				Variant v = obj->get(p.name);
-				if (v.is_array())
-					item->set_text(1, "Vector2[" + itos(v.call("size")) + "]");
-				else
-					item->set_text(1, "Vector2[]");
-				if (show_type_icons)
-					item->set_icon(0, get_icon("Vector2", "EditorIcons"));
-
-			} break;
-			case Variant::POOL_VECTOR3_ARRAY: {
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-				item->add_button(1, get_icon("EditResource", "EditorIcons"));
-
-				Variant v = obj->get(p.name);
-				if (v.is_array())
-					item->set_text(1, "Vector3[" + itos(v.call("size")) + "]");
-				else
-					item->set_text(1, "Vector3[]");
-				if (show_type_icons)
-					item->set_icon(0, get_icon("Vector3", "EditorIcons"));
-
-			} break;
-			case Variant::POOL_COLOR_ARRAY: {
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-				item->add_button(1, get_icon("EditResource", "EditorIcons"));
-
-				Variant v = obj->get(p.name);
-				if (v.is_array())
-					item->set_text(1, "Color[" + itos(v.call("size")) + "]");
-				else
-					item->set_text(1, "Color[]");
-				if (show_type_icons)
-					item->set_icon(0, get_icon("Color", "EditorIcons"));
-
-			} break;
-			case Variant::VECTOR2: {
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-				item->set_editable(1, true);
-				item->set_text(1, obj->get(p.name));
-				if (show_type_icons)
-					item->set_icon(0, get_icon("Vector2", "EditorIcons"));
-
-			} break;
-			case Variant::RECT2: {
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-				item->set_editable(1, true);
-				item->set_text(1, obj->get(p.name));
-				if (show_type_icons)
-					item->set_icon(0, get_icon("Rect2", "EditorIcons"));
-
-			} break;
-			case Variant::VECTOR3: {
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-				item->set_editable(1, true);
-				item->set_text(1, obj->get(p.name));
-				if (show_type_icons)
-					item->set_icon(0, get_icon("Vector3", "EditorIcons"));
-
-			} break;
-			case Variant::TRANSFORM2D:
-			case Variant::BASIS: {
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-				item->set_editable(1, true);
-				item->set_text(1, obj->get(p.name));
-
-			} break;
-			case Variant::TRANSFORM: {
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-				item->set_editable(1, true);
-				item->set_text(1, obj->get(p.name));
-				if (show_type_icons)
-					item->set_icon(0, get_icon("Transform", "EditorIcons"));
-
-			} break;
-			case Variant::PLANE: {
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-				item->set_editable(1, true);
-				item->set_text(1, obj->get(p.name));
-				if (show_type_icons)
-					item->set_icon(0, get_icon("Plane", "EditorIcons"));
-
-			} break;
-			case Variant::AABB: {
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-				item->set_editable(1, true);
-				item->set_text(1, "AABB");
-				if (show_type_icons)
-					item->set_icon(0, get_icon("AABB", "EditorIcons"));
-
-			} break;
-
-			case Variant::QUAT: {
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-				item->set_editable(1, true);
-				item->set_text(1, obj->get(p.name));
-				if (show_type_icons)
-					item->set_icon(0, get_icon("Quat", "EditorIcons"));
-
-			} break;
-			case Variant::COLOR: {
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-				item->set_editable(1, !read_only);
-				item->set_custom_draw(1, this, "_draw_transparency");
-				if (show_type_icons)
-					item->set_icon(0, get_icon("Color", "EditorIcons"));
-
-			} break;
-
-			case Variant::NODE_PATH: {
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_STRING);
-				item->set_editable(1, !read_only);
-				item->set_text(1, obj->get(p.name));
-				item->add_button(1, get_icon("CopyNodePath", "EditorIcons"));
-				if (show_type_icons)
-					item->set_icon(0, get_icon("NodePath", "EditorIcons"));
-
-			} break;
-			case Variant::OBJECT: {
-
-				item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
-				item->set_editable(1, !read_only);
-				String type;
-				if (p.hint == PROPERTY_HINT_RESOURCE_TYPE)
-					type = p.hint_string;
-
-				RES res = obj->get(p.name).operator RefPtr();
-				if (type.begins_with("RES:") && type != "RES:") { // Remote resources
-					res = ResourceLoader::load(type.substr(4, type.length()));
-				}
-				Ref<EncodedObjectAsID> encoded = obj->get(p.name); //for debugger and remote tools
-
-				if (encoded.is_valid()) {
-
-					item->set_text(1, "Object: " + itos(encoded->get_object_id()));
-					item->set_icon(1, Ref<Texture>());
-					item->set_custom_as_button(1, true);
-					item->set_editable(1, true);
-
-				} else if (obj->get(p.name).get_type() == Variant::NIL || res.is_null()) {
-
-					item->set_text(1, "<null>");
-					item->set_icon(1, Ref<Texture>());
-					item->set_custom_as_button(1, false);
-
-				} else if (res.is_valid()) {
-
-					item->set_custom_as_button(1, true);
-
-					if (res->is_class("Texture")) {
-						int tw = EditorSettings::get_singleton()->get("docks/property_editor/texture_preview_width");
-						Vector2 size(res->call("get_width"), res->call("get_height"));
-						if (size.width < size.height) {
-							tw = MAX((size.width / size.height) * tw, 1);
-						}
-						item->set_icon_max_width(1, tw);
-						item->set_icon(1, res);
-						item->set_text(1, "");
-
-					} else if (res->get_name() != "") {
-
-						item->set_text(1, res->get_name());
-					} else if (res->get_path() != "" && !res->get_path().begins_with("local://")) {
-						item->set_text(1, res->get_path().get_file());
-
-					} else {
-						item->set_text(1, "<" + res->get_class() + ">");
-					}
-
-					if (has_icon(res->get_class(), "EditorIcons")) {
-						type = res->get_class();
-					}
-
-					if (res.is_valid() && res->get_path().is_resource_file()) {
-						item->set_tooltip(1, res->get_path());
-					} else if (res.is_valid()) {
-						item->set_tooltip(1, res->get_name() + " (" + res->get_class() + ")");
-					}
-					if (res->is_class("Script")) {
-						item->set_text(1, res->get_path().get_file());
-					} else if (!res->is_class("Texture")) {
-						//texture already previews via itself
-						EditorResourcePreview::get_singleton()->queue_edited_resource_preview(res, this, "_resource_preview_done", item->get_instance_id());
-					}
-				}
-
-				if (type != String()) {
-					if (type.find(",") != -1)
-						type = type.get_slice(",", 0);
-					if (has_icon(type, "EditorIcons"))
-						item->set_icon(0, get_icon(type, "EditorIcons"));
-					else
-						item->set_icon(0, get_icon("Object", "EditorIcons"));
-				}
-
-			} break;
-			default: {};
-		}
-
-		if (keying) {
-
-			if (p.hint == PROPERTY_HINT_SPRITE_FRAME) {
-
-				item->add_button(1, get_icon("KeyNext", "EditorIcons"), 5);
-			} else {
-				item->add_button(1, get_icon("Key", "EditorIcons"), 2);
-			}
-		}
-
-		bool has_reload = false;
-
-		if (_is_instanced_node_with_original_property_different(p.name, item)) {
-			item->add_button(1, get_icon("ReloadSmall", "EditorIcons"), 3);
-			has_reload = true;
-		}
-
-		if (obj->call("property_can_revert", p.name).operator bool()) {
-
-			item->add_button(1, get_icon("ReloadSmall", "EditorIcons"), 3);
-			has_reload = true;
-		}
-
-		if (!has_reload && !obj->get_script().is_null()) {
-			Ref<Script> scr = obj->get_script();
-			Variant orig_value;
-			if (scr->get_property_default_value(p.name, orig_value)) {
-				if (orig_value != obj->get(p.name)) {
-					item->add_button(1, get_icon("ReloadSmall", "EditorIcons"), 3);
-					has_reload = true;
-				}
-			}
-		}
-
-		if (_might_be_in_instance() && !has_reload && item->get_cell_mode(1) == TreeItem::CELL_MODE_RANGE && item->get_text(1) == String()) {
-			item->add_button(1, get_icon("ReloadEmpty", "EditorIcons"), 3, true);
-		}
-	}
-}
-
-void PropertyEditor::_draw_transparency(Object *t, const Rect2 &p_rect) {
-
-	TreeItem *ti = Object::cast_to<TreeItem>(t);
-	if (!ti)
-		return;
-
-	Color color = obj->get(ti->get_metadata(1));
-	Ref<Texture> arrow = tree->get_icon("select_option");
-
-	// make a little space between consecutive color fields
-	Rect2 area = p_rect;
-	area.position.y += 1;
-	area.size.height -= 2;
-	area.size.width -= arrow->get_size().width + 5;
-	tree->draw_texture_rect(get_icon("GuiMiniCheckerboard", "EditorIcons"), area, true);
-	tree->draw_rect(area, color);
-}
-
-void PropertyEditor::_item_folded(Object *item_obj) {
-
-	if (updating_folding)
-		return;
-
-	TreeItem *item = Object::cast_to<TreeItem>(item_obj);
-
-	obj->editor_set_section_unfold(item->get_metadata(0), !item->is_collapsed());
-}
-
-void PropertyEditor::_item_selected() {
-
-	TreeItem *item = tree->get_selected();
-	ERR_FAIL_COND(!item);
-	selected_property = item->get_metadata(1);
-}
-
-void PropertyEditor::_item_rmb_edited() {
-	_custom_editor_request(true);
-}
-
-void PropertyEditor::_edit_set(const String &p_name, const Variant &p_value, bool p_refresh_all, const String &p_changed_field) {
-
-	if (autoclear) {
-		TreeItem *item = tree->get_selected();
-		if (item && item->get_cell_mode(0) == TreeItem::CELL_MODE_CHECK) {
-
-			item->set_checked(0, true);
-		}
-	}
-
-	if (!undo_redo || Object::cast_to<ArrayPropertyEdit>(obj) || Object::cast_to<DictionaryPropertyEdit>(obj)) { //kind of hacky
-
-		obj->set(p_name, p_value);
-		if (p_refresh_all)
-			_changed_callbacks(obj, "");
-		else
-			_changed_callbacks(obj, p_name);
-
-		emit_signal(_prop_edited, p_name);
-
-	} else if (Object::cast_to<MultiNodeEdit>(obj)) {
-
-		Object::cast_to<MultiNodeEdit>(obj)->set_property_field(p_name, p_value, p_changed_field);
-		_changed_callbacks(obj, p_name);
-		emit_signal(_prop_edited, p_name);
-	} else {
-
-		undo_redo->create_action(TTR("Set") + " " + p_name, UndoRedo::MERGE_ENDS);
-		undo_redo->add_do_property(obj, p_name, p_value);
-		undo_redo->add_undo_property(obj, p_name, obj->get(p_name));
-
-		if (p_refresh_all) {
-			undo_redo->add_do_method(this, "_changed_callback", obj, "");
-			undo_redo->add_undo_method(this, "_changed_callback", obj, "");
-		} else {
-
-			undo_redo->add_do_method(this, "_changed_callback", obj, p_name);
-			undo_redo->add_undo_method(this, "_changed_callback", obj, p_name);
-		}
-
-		Resource *r = Object::cast_to<Resource>(obj);
-		if (r) {
-			if (!r->is_edited() && String(p_name) != "resource/edited") {
-				undo_redo->add_do_method(r, "set_edited", true);
-				undo_redo->add_undo_method(r, "set_edited", false);
-			}
-
-			if (String(p_name) == "resource_local_to_scene") {
-				bool prev = obj->get(p_name);
-				bool next = p_value;
-				if (next) {
-					undo_redo->add_do_method(this, "setup_local_to_scene");
-				}
-				if (prev) {
-					undo_redo->add_undo_method(this, "setup_local_to_scene");
-				}
-			}
-		}
-		undo_redo->add_do_method(this, "emit_signal", _prop_edited, p_name);
-		undo_redo->add_undo_method(this, "emit_signal", _prop_edited, p_name);
-		undo_redo->commit_action();
-	}
-}
-
-void PropertyEditor::_item_edited() {
-
-	TreeItem *item = tree->get_edited();
-	if (!item)
-		return; //it all happened too fast..
-
-	Dictionary d = item->get_metadata(0);
-
-	String name = d["name"];
-
-	if (tree->get_edited_column() == 0) {
-		//property checked
-		if (autoclear) {
-			if (!item->is_checked(0)) {
-				obj->set(name, Variant());
-				update_property(name);
-			} else {
-				Variant::CallError ce;
-				obj->set(name, Variant::construct(Variant::Type(int(d["type"])), NULL, 0, ce));
-			}
-		} else {
-			emit_signal("property_toggled", name, item->is_checked(0));
-		}
-		return;
-	}
-
-	if (autoclear && item->get_cell_mode(0) == TreeItem::CELL_MODE_CHECK && item->get_cell_mode(1) != TreeItem::CELL_MODE_CUSTOM) {
-		item->set_checked(0, true);
-	}
-
-	int type = d["type"];
-	int hint = d["hint"];
-	int usage = d["usage"];
-	bool refresh_all = usage & PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED;
-
-	String hint_text = d["hint_text"];
-	switch (type) {
-
-		case Variant::NIL: {
-
-		} break;
-		case Variant::BOOL: {
-
-			item->set_tooltip(1, item->is_checked(1) ? "True" : "False");
-			_edit_set(name, item->is_checked(1), refresh_all);
-		} break;
-		case Variant::INT:
-		case Variant::REAL: {
-
-			if (hint == PROPERTY_HINT_LAYERS_2D_PHYSICS || hint == PROPERTY_HINT_LAYERS_2D_RENDER || hint == PROPERTY_HINT_LAYERS_3D_PHYSICS || hint == PROPERTY_HINT_LAYERS_3D_RENDER)
-				break;
-			if (hint == PROPERTY_HINT_EXP_EASING)
-				break;
-			if (hint == PROPERTY_HINT_FLAGS)
-				break;
-
-			if (type == Variant::INT)
-				_edit_set(name, int64_t(round(item->get_range(1))), refresh_all);
-			else
-				_edit_set(name, item->get_range(1), refresh_all);
-		} break;
-		case Variant::STRING: {
-
-			if (hint == PROPERTY_HINT_ENUM) {
-
-				int idx = item->get_range(1);
-
-				Vector<String> strings = hint_text.split(",");
-				String txt;
-				if (idx >= 0 && idx < strings.size()) {
-
-					txt = strings[idx];
-				}
-
-				_edit_set(name, txt, refresh_all);
-			} else {
-				_edit_set(name, item->get_text(1), refresh_all);
-			}
-		} break;
-
-		// math types
-		case Variant::VECTOR3: {
-
-		} break;
-		case Variant::PLANE: {
-
-		} break;
-		case Variant::QUAT: {
-
-		} break;
-		case Variant::AABB: {
-
-		} break;
-		case Variant::BASIS: {
-
-		} break;
-		case Variant::TRANSFORM: {
-
-		} break;
-		case Variant::COLOR: {
-
-		} break;
-
-		case Variant::NODE_PATH: {
-			_edit_set(name, NodePath(item->get_text(1)), refresh_all);
-
-		} break;
-		case Variant::OBJECT: {
-			if (!item->is_custom_set_as_button(1))
-				break;
-
-			Ref<EncodedObjectAsID> encoded = obj->get(name); //for debugger and remote tools
-
-			if (encoded.is_valid()) {
-
-				emit_signal("object_id_selected", encoded->get_object_id());
-			}
-
-			RES res = obj->get(name);
-			if (res.is_valid()) {
-				emit_signal("resource_selected", res.get_ref_ptr(), name);
-			}
-
-		} break;
-
-		case Variant::DICTIONARY: {
-
-		} break;
-
-		// arrays
-		case Variant::POOL_BYTE_ARRAY: {
-
-		} break;
-		case Variant::POOL_INT_ARRAY: {
-
-		} break;
-		case Variant::POOL_REAL_ARRAY: {
-
-		} break;
-		case Variant::POOL_STRING_ARRAY: {
-
-		} break;
-		case Variant::POOL_VECTOR3_ARRAY: {
-
-		} break;
-		case Variant::POOL_COLOR_ARRAY: {
-
-		} break;
-	};
-}
-
-void PropertyEditor::_resource_edit_request() {
-
-	RES res = custom_editor->get_variant();
-	if (res.is_null())
-		return;
-
-	String name = custom_editor->get_name();
-
-	emit_signal("resource_selected", res.get_ref_ptr(), name);
-}
-
-void PropertyEditor::_custom_editor_edited() {
-
-	if (!obj)
-		return;
-
-	_edit_set(custom_editor->get_name(), custom_editor->get_variant());
-}
-
-void PropertyEditor::_custom_editor_edited_field(const String &p_field_name) {
-
-	ERR_FAIL_COND(p_field_name == "");
-
-	if (!obj)
-		return;
-
-	_edit_set(custom_editor->get_name(), custom_editor->get_variant(), false, p_field_name);
-}
-
-void PropertyEditor::_custom_editor_request(bool p_arrow) {
-
-	TreeItem *item = tree->get_edited();
-	ERR_FAIL_COND(!item);
-	Dictionary d = item->get_metadata(0);
-
-	String name = d["name"];
-	Variant::Type type = Variant::NIL;
-	if (d.has("type"))
-		type = (Variant::Type)((int)(d["type"]));
-
-	Variant v = obj->get(name);
-	int hint = d.has("hint") ? d["hint"].operator int() : -1;
-	String hint_text = d.has("hint_text") ? d["hint_text"] : "";
-	Rect2 where = tree->get_custom_popup_rect();
-	custom_editor->set_position(where.position);
-
-	if (custom_editor->edit(obj, name, type, v, hint, hint_text)) {
-		custom_editor->popup();
-	}
-}
-
-void PropertyEditor::edit(Object *p_object) {
-
-	if (obj == p_object)
-		return;
-	if (obj) {
-
-		obj->remove_change_receptor(this);
-	}
-
-	obj = p_object;
-
-	evaluator->edit(p_object);
-
-	update_tree();
-
-	if (obj) {
-
-		obj->add_change_receptor(this);
-	}
-}
-
-void PropertyEditor::_set_range_def(Object *p_item, String prop, float p_frame) {
-
-	TreeItem *ti = Object::cast_to<TreeItem>(p_item);
-	ERR_FAIL_COND(!ti);
-
-	ti->call_deferred("set_range", 1, p_frame);
-	obj->call_deferred("set", prop, p_frame);
-}
-
-void PropertyEditor::_edit_button(Object *p_item, int p_column, int p_button) {
-
-	TreeItem *ti = Object::cast_to<TreeItem>(p_item);
-	ERR_FAIL_COND(!ti);
-
-	Dictionary d = ti->get_metadata(0);
-
-	if (p_button == 2) {
-
-		if (!d.has("name"))
-			return;
-		String prop = d["name"];
-		emit_signal("property_keyed", prop, obj->get(prop), false);
-	} else if (p_button == 5) {
-		if (!d.has("name"))
-			return;
-		String prop = d["name"];
-		emit_signal("property_keyed", prop, obj->get(prop), true);
-		call_deferred("_set_range_def", ti, prop, ti->get_range(p_column) + 1.0);
-	} else if (p_button == 3) {
-
-		if (!d.has("name"))
-			return;
-
-		String prop = d["name"];
-
-		Variant vorig;
-
-		if (_might_be_in_instance() && _get_instanced_node_original_property(prop, vorig)) {
-
-			_edit_set(prop, vorig.duplicate(true)); // Set, making sure to duplicate arrays properly
-			return;
-		}
-
-		if (obj->call("property_can_revert", prop).operator bool()) {
-			Variant rev = obj->call("property_get_revert", prop);
-			_edit_set(prop, rev);
-		}
-
-		if (!obj->get_script().is_null()) {
-			Ref<Script> scr = obj->get_script();
-			Variant orig_value;
-			if (scr->get_property_default_value(prop, orig_value)) {
-				_edit_set(prop, orig_value);
-			}
-		}
-
-	} else {
-
-		Dictionary d = ti->get_metadata(0);
-		if (!d.has("type"))
-			return;
-		if (!d.has("hint"))
-			return;
-		if (!d.has("name"))
-			return;
-		if (!d.has("hint_text"))
-			return;
-
-		int t = d["type"];
-		int h = d["hint"];
-		String n = d["name"];
-		String ht = d["hint_text"];
-
-		if (t == Variant::NODE_PATH) {
-
-			Variant v = obj->get(n);
-			Rect2 where = tree->get_item_rect(ti, 1);
-			where.position -= tree->get_scroll();
-			where.position += tree->get_global_position() + Point2(where.size.width, 0);
-			for (int i = ti->get_button_count(p_column) - 1; i >= p_button; i--)
-				where.position.x -= ti->get_button(p_column, i)->get_width();
-			custom_editor->set_position(where.position);
-			custom_editor->edit(obj, n, (Variant::Type)t, v, h, ht);
-			custom_editor->popup();
-
-		} else if (t == Variant::STRING) {
-
-			Variant v = obj->get(n);
-			custom_editor->edit(obj, n, (Variant::Type)t, v, h, ht);
-			if (h == PROPERTY_HINT_FILE || h == PROPERTY_HINT_DIR || h == PROPERTY_HINT_GLOBAL_DIR || h == PROPERTY_HINT_GLOBAL_FILE) {
-
-				Rect2 where = tree->get_item_rect(ti, 1);
-				where.position -= tree->get_scroll();
-				where.position += tree->get_global_position() + Point2(where.size.width, 0);
-				for (int i = ti->get_button_count(p_column) - 1; i >= p_button; i--)
-					where.position.x -= ti->get_button(p_column, i)->get_width();
-				custom_editor->set_position(where.position);
-				custom_editor->popup();
-			} else {
-				custom_editor->popup_centered_ratio();
-			}
-
-		} else if (t == Variant::OBJECT) {
-
-			RES r = obj->get(n);
-			if (r.is_valid()) {
-
-				emit_signal("resource_selected", r, n);
-			}
-		} else if (t == Variant::INT && h == PROPERTY_HINT_OBJECT_ID) {
-
-			emit_signal("object_id_selected", obj->get(n));
-
-		} else if (t == Variant::ARRAY || t == Variant::POOL_INT_ARRAY || t == Variant::POOL_REAL_ARRAY || t == Variant::POOL_STRING_ARRAY || t == Variant::POOL_VECTOR2_ARRAY || t == Variant::POOL_VECTOR3_ARRAY || t == Variant::POOL_COLOR_ARRAY || t == Variant::POOL_BYTE_ARRAY) {
-
-			Variant v = obj->get(n);
-
-			if (v.get_type() != t) {
-				Variant::CallError ce;
-				v = Variant::construct(Variant::Type(t), NULL, 0, ce);
-			}
-
-			Ref<ArrayPropertyEdit> ape = memnew(ArrayPropertyEdit);
-			ape->edit(obj, n, ht, Variant::Type(t));
-			EditorNode::get_singleton()->push_item(ape.ptr());
-
-		} else if (t == Variant::DICTIONARY) {
-
-			Variant v = obj->get(n);
-
-			if (v.get_type() != t) {
-				Variant::CallError ce;
-				v = Variant::construct(Variant::Type(t), NULL, 0, ce);
-			}
-
-			Ref<DictionaryPropertyEdit> dpe = memnew(DictionaryPropertyEdit);
-			dpe->edit(obj, n);
-			EditorNode::get_singleton()->push_item(dpe.ptr());
-		}
-	}
-}
-
-void PropertyEditor::_node_removed(Node *p_node) {
-
-	if (p_node == obj) {
-		edit(NULL);
-	}
-}
-
-void PropertyEditor::set_keying(bool p_active) {
-
-	if (keying == p_active)
-		return;
-
-	keying = p_active;
-	update_tree();
-}
-
-void PropertyEditor::_draw_flags(Object *p_object, const Rect2 &p_rect) {
-
-	TreeItem *ti = Object::cast_to<TreeItem>(p_object);
-	if (!ti)
-		return;
-
-	Dictionary d = ti->get_metadata(0);
-
-	if (!d.has("name"))
-		return;
-
-	uint32_t f = obj->get(d["name"]);
-
-	int bsize = (p_rect.size.height * 80 / 100) / 2;
-
-	int h = bsize * 2 + 1;
-	int vofs = (p_rect.size.height - h) / 2;
-
-	for (int i = 0; i < 2; i++) {
-
-		Point2 ofs(4, vofs);
-		if (i == 1)
-			ofs.y += bsize + 1;
-
-		ofs += p_rect.position;
-		for (int j = 0; j < 10; j++) {
-
-			Point2 o = ofs + Point2(j * (bsize + 1), 0);
-			if (j >= 5)
-				o.x += 1;
-
-			uint32_t idx = i * 10 + j;
-			bool on = f & (1 << idx);
-			tree->draw_rect(Rect2(o, Size2(bsize, bsize)), Color(0, 0, 0, on ? 0.8 : 0.3));
-		}
-	}
-}
-
-void PropertyEditor::_filter_changed(const String &p_text) {
-
-	update_tree();
-}
-
-void PropertyEditor::_resource_preview_done(const String &p_path, const Ref<Texture> &p_preview, Variant p_ud) {
-
-	if (p_preview.is_null())
-		return; //don't bother with empty preview
-
-	ObjectID id = p_ud;
-	Object *obj = ObjectDB::get_instance(id);
-
-	if (!obj)
-		return;
-
-	TreeItem *ti = Object::cast_to<TreeItem>(obj);
-
-	ERR_FAIL_COND(!ti);
-
-	int tw = EditorSettings::get_singleton()->get("docks/property_editor/texture_preview_width");
-
-	ti->set_icon(1, p_preview); //should be scaled I think?
-	ti->set_icon_max_width(1, tw);
-	ti->set_text(1, "");
-}
-void PropertyEditor::_bind_methods() {
-
-	ClassDB::bind_method("_item_edited", &PropertyEditor::_item_edited);
-	ClassDB::bind_method("_item_selected", &PropertyEditor::_item_selected);
-	ClassDB::bind_method("_item_rmb_edited", &PropertyEditor::_item_rmb_edited);
-	ClassDB::bind_method("_item_folded", &PropertyEditor::_item_folded);
-	ClassDB::bind_method("_custom_editor_request", &PropertyEditor::_custom_editor_request);
-	ClassDB::bind_method("_custom_editor_edited", &PropertyEditor::_custom_editor_edited);
-	ClassDB::bind_method("_custom_editor_edited_field", &PropertyEditor::_custom_editor_edited_field, DEFVAL(""));
-	ClassDB::bind_method("_resource_edit_request", &PropertyEditor::_resource_edit_request);
-	ClassDB::bind_method("_node_removed", &PropertyEditor::_node_removed);
-	ClassDB::bind_method("_edit_button", &PropertyEditor::_edit_button);
-	ClassDB::bind_method("_changed_callback", &PropertyEditor::_changed_callbacks);
-	ClassDB::bind_method("_draw_flags", &PropertyEditor::_draw_flags);
-	ClassDB::bind_method("_set_range_def", &PropertyEditor::_set_range_def);
-	ClassDB::bind_method("_filter_changed", &PropertyEditor::_filter_changed);
-	ClassDB::bind_method("update_tree", &PropertyEditor::update_tree);
-	ClassDB::bind_method("_resource_preview_done", &PropertyEditor::_resource_preview_done);
-	ClassDB::bind_method("refresh", &PropertyEditor::refresh);
-	ClassDB::bind_method("_draw_transparency", &PropertyEditor::_draw_transparency);
-	ClassDB::bind_method("edit", &PropertyEditor::edit);
-
-	ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &PropertyEditor::get_drag_data_fw);
-	ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &PropertyEditor::can_drop_data_fw);
-	ClassDB::bind_method(D_METHOD("drop_data_fw"), &PropertyEditor::drop_data_fw);
-
-	ADD_SIGNAL(MethodInfo("property_toggled", PropertyInfo(Variant::STRING, "property"), PropertyInfo(Variant::BOOL, "value")));
-	ADD_SIGNAL(MethodInfo("resource_selected", PropertyInfo(Variant::OBJECT, "res"), PropertyInfo(Variant::STRING, "prop")));
-	ADD_SIGNAL(MethodInfo("object_id_selected", PropertyInfo(Variant::INT, "id")));
-	ADD_SIGNAL(MethodInfo("property_keyed", PropertyInfo(Variant::STRING, "property")));
-	ADD_SIGNAL(MethodInfo("property_edited", PropertyInfo(Variant::STRING, "property")));
-}
-
-Tree *PropertyEditor::get_property_tree() {
-
-	return tree;
-}
-
-Label *PropertyEditor::get_top_label() {
-
-	return top_label;
-}
-
-void PropertyEditor::hide_top_label() {
-
-	top_label->hide();
-	tree->set_begin(Point2(0, 0));
-}
-
-String PropertyEditor::get_selected_path() const {
-
-	TreeItem *ti = tree->get_selected();
-	if (!ti)
-		return "";
-
-	Dictionary d = ti->get_metadata(0);
-
-	if (d.has("name"))
-		return d["name"];
-	else
-		return "";
-}
-
-bool PropertyEditor::is_capitalize_paths_enabled() const {
-
-	return capitalize_paths;
-}
-
-void PropertyEditor::set_enable_capitalize_paths(bool p_capitalize) {
-
-	capitalize_paths = p_capitalize;
-	update_tree_pending = true;
-}
-
-void PropertyEditor::set_autoclear(bool p_enable) {
-
-	autoclear = p_enable;
-}
-
-void PropertyEditor::set_show_categories(bool p_show) {
-
-	show_categories = p_show;
-	update_tree();
-}
-
-void PropertyEditor::set_use_filter(bool p_use) {
-
-	if (p_use == use_filter)
-		return;
-
-	use_filter = p_use;
-	update_tree();
-}
-
-void PropertyEditor::register_text_enter(Node *p_line_edit) {
-
-	ERR_FAIL_NULL(p_line_edit);
-	search_box = Object::cast_to<LineEdit>(p_line_edit);
-
-	if (search_box)
-		search_box->connect("text_changed", this, "_filter_changed");
-}
-
-void PropertyEditor::set_property_selectable(bool p_selectable) {
-	property_selectable = p_selectable;
-	update_tree();
-}
-
-void PropertyEditor::set_subsection_selectable(bool p_selectable) {
-
-	if (p_selectable == subsection_selectable)
-		return;
-
-	subsection_selectable = p_selectable;
-	update_tree();
-}
-
-void PropertyEditor::set_use_folding(bool p_enable) {
-
-	use_folding = p_enable;
-	tree->set_hide_folding(false);
-}
-
-void PropertyEditor::collapse_all_folding() {
-	if (!obj)
-		return;
-	for (List<String>::Element *E = foldable_property_cache.front(); E; E = E->next()) {
-		obj->editor_set_section_unfold(E->get(), false);
-	}
-	update_tree();
-}
-
-void PropertyEditor::expand_all_folding() {
-
-	if (!obj)
-		return;
-	for (List<String>::Element *E = foldable_property_cache.front(); E; E = E->next()) {
-		obj->editor_set_section_unfold(E->get(), true);
-	}
-	update_tree();
-}
-
-PropertyEditor::PropertyEditor() {
-
-	_prop_edited = "property_edited";
-
-	hide_script = true;
-	use_folding = false;
-
-	undo_redo = NULL;
-	obj = NULL;
-	search_box = NULL;
-	changing = false;
-	update_tree_pending = false;
-
-	top_label = memnew(Label);
-	top_label->set_text(TTR("Properties:"));
-	top_label->set_anchor(MARGIN_RIGHT, ANCHOR_END);
-	top_label->set_begin(Point2(10, 0));
-	top_label->set_end(Point2(0, 12));
-
-	add_child(top_label);
-
-	tree = memnew(Tree);
-	tree->set_anchor(MARGIN_RIGHT, ANCHOR_END);
-	tree->set_anchor(MARGIN_BOTTOM, ANCHOR_END);
-	tree->set_begin(Point2(0, 19));
-	tree->set_end(Point2(0, 0));
-
-	tree->set_columns(2);
-	tree->set_column_expand(0, true);
-	tree->set_column_min_width(0, 30);
-	tree->set_column_expand(1, true);
-	tree->set_column_min_width(1, 18);
-	add_child(tree);
-
-	tree->connect("item_edited", this, "_item_edited", varray(), CONNECT_DEFERRED);
-	tree->connect("item_rmb_edited", this, "_item_rmb_edited");
-	tree->connect("cell_selected", this, "_item_selected");
-	tree->connect("item_collapsed", this, "_item_folded");
-
-	tree->set_drag_forwarding(this);
-
-	set_physics_process(true);
-
-	custom_editor = memnew(CustomPropertyEditor);
-	custom_editor->set_pass_on_modal_close_click(false);
-	add_child(custom_editor);
-
-	tree->connect("custom_popup_edited", this, "_custom_editor_request");
-	tree->connect("button_pressed", this, "_edit_button");
-	custom_editor->connect("variant_changed", this, "_custom_editor_edited");
-	custom_editor->connect("variant_field_changed", this, "_custom_editor_edited_field");
-	custom_editor->connect("resource_edit_request", this, "_resource_edit_request", make_binds(), CONNECT_DEFERRED);
-	tree->set_hide_folding(true);
-
-	evaluator = memnew(PropertyValueEvaluator);
-	tree->set_value_evaluator(evaluator);
-	custom_editor->set_value_evaluator(evaluator);
-
-	capitalize_paths = true;
-	autoclear = false;
-	tree->set_column_titles_visible(false);
-	tree->add_constant_override("button_margin", 0);
-
-	keying = false;
-	read_only = false;
-	show_categories = false;
-	refresh_countdown = 0;
-	use_doc_hints = false;
-	updating_folding = true;
-	use_filter = false;
-	subsection_selectable = false;
-	property_selectable = false;
-	show_type_icons = false; // TODO: need to reimplement it to work with the new inspector
-}
-
-PropertyEditor::~PropertyEditor() {
-	memdelete(evaluator);
-}
-
 /////////////////////////////
 
-class SectionedPropertyEditorFilter : public Object {
-
-	GDCLASS(SectionedPropertyEditorFilter, Object);
-
-	Object *edited;
-	String section;
-	bool allow_sub;
-
-	bool _set(const StringName &p_name, const Variant &p_value) {
-
-		if (!edited)
-			return false;
-
-		String name = p_name;
-		if (section != "") {
-			name = section + "/" + name;
-		}
-
-		bool valid;
-		edited->set(name, p_value, &valid);
-		return valid;
-	}
-
-	bool _get(const StringName &p_name, Variant &r_ret) const {
-
-		if (!edited)
-			return false;
-
-		String name = p_name;
-		if (section != "") {
-			name = section + "/" + name;
-		}
-
-		bool valid = false;
-
-		r_ret = edited->get(name, &valid);
-		return valid;
-	}
-	void _get_property_list(List<PropertyInfo> *p_list) const {
-
-		if (!edited)
-			return;
-
-		List<PropertyInfo> pinfo;
-		edited->get_property_list(&pinfo);
-		for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) {
-
-			PropertyInfo pi = E->get();
-			int sp = pi.name.find("/");
-
-			if (pi.name == "resource_path" || pi.name == "resource_name" || pi.name == "resource_local_to_scene" || pi.name.begins_with("script/")) //skip resource stuff
-				continue;
-
-			if (sp == -1) {
-				pi.name = "global/" + pi.name;
-			}
-
-			if (pi.name.begins_with(section + "/")) {
-				pi.name = pi.name.replace_first(section + "/", "");
-				if (!allow_sub && pi.name.find("/") != -1)
-					continue;
-				p_list->push_back(pi);
-			}
-		}
-	}
-
-	bool property_can_revert(const String &p_name) {
-
-		return edited->call("property_can_revert", section + "/" + p_name);
-	}
-
-	Variant property_get_revert(const String &p_name) {
-
-		return edited->call("property_get_revert", section + "/" + p_name);
-	}
-
-protected:
-	static void _bind_methods() {
-
-		ClassDB::bind_method("property_can_revert", &SectionedPropertyEditorFilter::property_can_revert);
-		ClassDB::bind_method("property_get_revert", &SectionedPropertyEditorFilter::property_get_revert);
-	}
-
-public:
-	void set_section(const String &p_section, bool p_allow_sub) {
-
-		section = p_section;
-		allow_sub = p_allow_sub;
-		_change_notify();
-	}
-
-	void set_edited(Object *p_edited) {
-		edited = p_edited;
-		_change_notify();
-	}
-
-	SectionedPropertyEditorFilter() {
-		edited = NULL;
-	}
-};
-
-void SectionedPropertyEditor::_bind_methods() {
-
-	ClassDB::bind_method("_section_selected", &SectionedPropertyEditor::_section_selected);
-	ClassDB::bind_method("_search_changed", &SectionedPropertyEditor::_search_changed);
-
-	ClassDB::bind_method("update_category_list", &SectionedPropertyEditor::update_category_list);
-}
-
-void SectionedPropertyEditor::_section_selected() {
-
-	if (!sections->get_selected())
-		return;
-
-	filter->set_section(sections->get_selected()->get_metadata(0), sections->get_selected()->get_children() == NULL);
-}
-
-void SectionedPropertyEditor::set_current_section(const String &p_section) {
-
-	if (section_map.has(p_section)) {
-		section_map[p_section]->select(0);
-	}
-}
-
-String SectionedPropertyEditor::get_current_section() const {
-
-	if (sections->get_selected())
-		return sections->get_selected()->get_metadata(0);
-	else
-		return "";
-}
-
-String SectionedPropertyEditor::get_full_item_path(const String &p_item) {
-
-	String base = get_current_section();
-
-	if (base != "")
-		return base + "/" + p_item;
-	else
-		return p_item;
-}
-
-void SectionedPropertyEditor::edit(Object *p_object) {
-
-	if (!p_object) {
-		obj = -1;
-		sections->clear();
-
-		filter->set_edited(NULL);
-		editor->edit(NULL);
-
-		return;
-	}
-
-	ObjectID id = p_object->get_instance_id();
-
-	if (obj != id) {
-
-		obj = id;
-		update_category_list();
-
-		filter->set_edited(p_object);
-		editor->edit(filter);
-
-		if (sections->get_root()->get_children()) {
-			sections->get_root()->get_children()->select(0);
-		}
-	} else {
-
-		update_category_list();
-	}
-}
-
-void SectionedPropertyEditor::update_category_list() {
-
-	String selected_category = get_current_section();
-	sections->clear();
-
-	Object *o = ObjectDB::get_instance(obj);
-
-	if (!o)
-		return;
-
-	List<PropertyInfo> pinfo;
-	o->get_property_list(&pinfo);
-
-	section_map.clear();
-
-	TreeItem *root = sections->create_item();
-	section_map[""] = root;
-
-	for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) {
-
-		PropertyInfo pi = E->get();
-
-		if (pi.usage & PROPERTY_USAGE_CATEGORY)
-			continue;
-		else if (!(pi.usage & PROPERTY_USAGE_EDITOR))
-			continue;
-
-		if (pi.name.find(":") != -1 || pi.name == "script" || pi.name == "resource_name" || pi.name == "resource_path" || pi.name == "resource_local_to_scene")
-			continue;
-
-		if (search_box && search_box->get_text() != String() && pi.name.findn(search_box->get_text()) == -1)
-			continue;
-
-		int sp = pi.name.find("/");
-		if (sp == -1)
-			pi.name = "Global/" + pi.name;
-
-		Vector<String> sectionarr = pi.name.split("/");
-		String metasection;
-
-		int sc = MIN(2, sectionarr.size() - 1);
-
-		for (int i = 0; i < sc; i++) {
-
-			TreeItem *parent = section_map[metasection];
-			parent->set_custom_bg_color(0, get_color("prop_subsection", "Editor"));
-
-			if (i > 0) {
-				metasection += "/" + sectionarr[i];
-			} else {
-				metasection = sectionarr[i];
-			}
-
-			if (!section_map.has(metasection)) {
-				TreeItem *ms = sections->create_item(parent);
-				section_map[metasection] = ms;
-				ms->set_text(0, sectionarr[i].capitalize());
-				ms->set_metadata(0, metasection);
-				ms->set_selectable(0, false);
-			}
-
-			if (i == sc - 1) {
-				//if it has children, make selectable
-				section_map[metasection]->set_selectable(0, true);
-			}
-		}
-	}
-
-	if (section_map.has(selected_category)) {
-		section_map[selected_category]->select(0);
-	}
-
-	editor->update_tree();
-}
-
-void SectionedPropertyEditor::register_search_box(LineEdit *p_box) {
-
-	search_box = p_box;
-	editor->register_text_enter(p_box);
-	search_box->connect("text_changed", this, "_search_changed");
-}
-
-void SectionedPropertyEditor::_search_changed(const String &p_what) {
-
-	update_category_list();
-}
-
-PropertyEditor *SectionedPropertyEditor::get_property_editor() {
-
-	return editor;
-}
-
-SectionedPropertyEditor::SectionedPropertyEditor() {
-
-	obj = -1;
-
-	search_box = NULL;
-
-	add_constant_override("autohide", 1); // Fixes the dragger always showing up
-
-	VBoxContainer *left_vb = memnew(VBoxContainer);
-	left_vb->set_custom_minimum_size(Size2(170, 0) * EDSCALE);
-	add_child(left_vb);
-
-	sections = memnew(Tree);
-	sections->set_v_size_flags(SIZE_EXPAND_FILL);
-	sections->set_hide_root(true);
-
-	left_vb->add_child(sections, true);
-
-	VBoxContainer *right_vb = memnew(VBoxContainer);
-	right_vb->set_custom_minimum_size(Size2(300, 0) * EDSCALE);
-	right_vb->set_h_size_flags(SIZE_EXPAND_FILL);
-	add_child(right_vb);
-
-	filter = memnew(SectionedPropertyEditorFilter);
-	editor = memnew(PropertyEditor);
-	editor->set_v_size_flags(SIZE_EXPAND_FILL);
-	right_vb->add_child(editor, true);
-
-	editor->get_property_tree()->set_column_titles_visible(false);
-
-	editor->hide_top_label();
-
-	sections->connect("cell_selected", this, "_section_selected");
-}
-
-SectionedPropertyEditor::~SectionedPropertyEditor() {
-
-	memdelete(filter);
-}
-
 double PropertyValueEvaluator::eval(const String &p_text) {
 
 	// If range value contains a comma replace it with dot (issue #6028)
diff --git a/editor/property_editor.h b/editor/property_editor.h
index 7d8fa22f3fe..7d7ab912eab 100644
--- a/editor/property_editor.h
+++ b/editor/property_editor.h
@@ -175,180 +175,6 @@ public:
 	CustomPropertyEditor();
 };
 
-class PropertyEditor : public Control {
-
-	GDCLASS(PropertyEditor, Control);
-
-	Tree *tree;
-	Label *top_label;
-	LineEdit *search_box;
-
-	PropertyValueEvaluator *evaluator;
-
-	Object *obj;
-
-	StringName _prop_edited;
-
-	bool capitalize_paths;
-	bool changing;
-	bool update_tree_pending;
-	bool autoclear;
-	bool keying;
-	bool read_only;
-	bool show_categories;
-	bool show_type_icons;
-	float refresh_countdown;
-	bool use_doc_hints;
-	bool use_filter;
-	bool subsection_selectable;
-	bool hide_script;
-	bool use_folding;
-	bool property_selectable;
-	bool updating_folding;
-
-	List<String> foldable_property_cache;
-	HashMap<String, String> pending;
-	String selected_property;
-
-	Map<StringName, Map<StringName, String> > descr_cache;
-	Map<StringName, String> class_descr_cache;
-
-	CustomPropertyEditor *custom_editor;
-
-	void _resource_edit_request();
-	void _custom_editor_edited();
-	void _custom_editor_edited_field(const String &p_field_name);
-	void _custom_editor_request(bool p_arrow);
-
-	void _item_selected();
-	void _item_rmb_edited();
-	void _item_edited();
-	TreeItem *get_parent_node(String p_path, HashMap<String, TreeItem *> &item_paths, TreeItem *root, TreeItem *category);
-
-	void set_item_text(TreeItem *p_item, int p_type, const String &p_name, int p_hint = PROPERTY_HINT_NONE, const String &p_hint_text = "");
-
-	TreeItem *find_item(TreeItem *p_item, const String &p_name);
-
-	virtual void _changed_callback(Object *p_changed, const char *p_prop);
-	virtual void _changed_callbacks(Object *p_changed, const String &p_prop);
-
-	void _check_reload_status(const String &p_name, TreeItem *item);
-
-	void _edit_button(Object *p_item, int p_column, int p_button);
-
-	void _node_removed(Node *p_node);
-
-	friend class ProjectExportDialog;
-	void _edit_set(const String &p_name, const Variant &p_value, bool p_refresh_all = false, const String &p_changed_field = "");
-	void _draw_flags(Object *p_object, const Rect2 &p_rect);
-
-	bool _might_be_in_instance();
-	bool _get_instanced_node_original_property(const StringName &p_prop, Variant &value);
-	bool _is_property_different(const Variant &p_current, const Variant &p_orig, int p_usage = 0);
-	bool _is_instanced_node_with_original_property_different(const String &p_name, TreeItem *item);
-
-	void _refresh_item(TreeItem *p_item);
-	void _set_range_def(Object *p_item, String prop, float p_frame);
-
-	void _filter_changed(const String &p_text);
-
-	void _mark_drop_fields(TreeItem *p_at);
-	void _clear_drop_fields(TreeItem *p_at);
-
-	bool _is_drop_valid(const Dictionary &p_drag_data, const Dictionary &p_item_data) const;
-	Variant get_drag_data_fw(const Point2 &p_point, Control *p_from);
-	bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;
-	void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from);
-
-	void _resource_preview_done(const String &p_path, const Ref<Texture> &p_preview, Variant p_ud);
-	void _draw_transparency(Object *t, const Rect2 &p_rect);
-	void _item_folded(Object *item_obj);
-
-	UndoRedo *undo_redo;
-
-protected:
-	void _notification(int p_what);
-	static void _bind_methods();
-
-public:
-	void set_undo_redo(UndoRedo *p_undo_redo) { undo_redo = p_undo_redo; }
-
-	String get_selected_path() const;
-
-	Tree *get_property_tree();
-	Label *get_top_label();
-	void hide_top_label();
-	void update_tree();
-	void update_property(const String &p_prop);
-
-	void refresh();
-
-	void edit(Object *p_object);
-
-	void set_keying(bool p_active);
-	void set_read_only(bool p_read_only) {
-		read_only = p_read_only;
-		custom_editor->set_read_only(p_read_only);
-	}
-
-	bool is_capitalize_paths_enabled() const;
-	void set_enable_capitalize_paths(bool p_capitalize);
-	void set_autoclear(bool p_enable);
-
-	void set_show_categories(bool p_show);
-	void set_use_doc_hints(bool p_enable) { use_doc_hints = p_enable; }
-	void set_hide_script(bool p_hide) { hide_script = p_hide; }
-
-	void set_use_filter(bool p_use);
-	void register_text_enter(Node *p_line_edit);
-
-	void set_subsection_selectable(bool p_selectable);
-	void set_property_selectable(bool p_selectable);
-
-	void set_use_folding(bool p_enable);
-
-	void collapse_all_folding();
-	void expand_all_folding();
-
-	PropertyEditor();
-	~PropertyEditor();
-};
-
-class SectionedPropertyEditorFilter;
-
-class SectionedPropertyEditor : public HSplitContainer {
-
-	GDCLASS(SectionedPropertyEditor, HSplitContainer);
-
-	ObjectID obj;
-
-	Tree *sections;
-	SectionedPropertyEditorFilter *filter;
-
-	Map<String, TreeItem *> section_map;
-	PropertyEditor *editor;
-	LineEdit *search_box;
-
-	static void _bind_methods();
-	void _section_selected();
-
-	void _search_changed(const String &p_what);
-
-public:
-	void register_search_box(LineEdit *p_box);
-	PropertyEditor *get_property_editor();
-	void edit(Object *p_object);
-	String get_full_item_path(const String &p_item);
-
-	void set_current_section(const String &p_section);
-	String get_current_section() const;
-
-	void update_category_list();
-
-	SectionedPropertyEditor();
-	~SectionedPropertyEditor();
-};
-
 class PropertyValueEvaluator : public ValueEvaluator {
 	GDCLASS(PropertyValueEvaluator, ValueEvaluator);
 
diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp
index 9db53fe5f5d..32893cc45e5 100644
--- a/editor/script_editor_debugger.cpp
+++ b/editor/script_editor_debugger.cpp
@@ -396,7 +396,6 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
 		dobreak->set_disabled(false);
 		docontinue->set_disabled(true);
 		emit_signal("breaked", false, false, Variant());
-		//tabs->set_current_tab(0);
 		profiler->set_enabled(true);
 		profiler->disable_seeking();
 		inspector->edit(NULL);
@@ -1946,10 +1945,8 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) {
 		stack_dump->connect("cell_selected", this, "_stack_dump_frame_selected");
 		sc->add_child(stack_dump);
 
-		inspector = memnew(PropertyEditor);
+		inspector = memnew(EditorInspector);
 		inspector->set_h_size_flags(SIZE_EXPAND_FILL);
-		inspector->hide_top_label();
-		inspector->get_property_tree()->set_column_title(0, TTR("Variable"));
 		inspector->set_enable_capitalize_paths(false);
 		inspector->set_read_only(true);
 		inspector->connect("object_id_selected", this, "_scene_tree_property_select_object");
@@ -2180,7 +2177,6 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) {
 
 ScriptEditorDebugger::~ScriptEditorDebugger() {
 
-	//inspector->edit(NULL);
 	memdelete(variables);
 
 	ppeer->set_stream_peer(Ref<StreamPeer>());
diff --git a/editor/script_editor_debugger.h b/editor/script_editor_debugger.h
index ce705aa35b9..9a5680e4b69 100644
--- a/editor/script_editor_debugger.h
+++ b/editor/script_editor_debugger.h
@@ -33,12 +33,12 @@
 
 #include "core/io/packet_peer.h"
 #include "core/io/tcp_server.h"
-#include "property_editor.h"
+#include "editor/editor_inspector.h"
+#include "editor/property_editor.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 
 class Tree;
-class PropertyEditor;
 class EditorNode;
 class ScriptEditorDebuggerVariables;
 class LineEdit;
@@ -130,7 +130,7 @@ class ScriptEditorDebugger : public Control {
 	LineEdit *vmem_total;
 
 	Tree *stack_dump;
-	PropertyEditor *inspector;
+	EditorInspector *inspector;
 
 	Ref<TCP_Server> server;
 	Ref<StreamPeerTCP> connection;