Merge remote-tracking branch 'upstream/master'

1 files changed, 35 insertions, 0 deletions

diff --git a/tools/editor/inspector_dock.h b/tools/editor/inspector_dock.h
new file mode 100644
index 0000000000..90f043aba8
--- /dev/null
+++ b/tools/editor/inspector_dock.h
@@ -0,0 +1,35 @@
+#ifndef INSPECTOR_DOCK_H
+#define INSPECTOR_DOCK_H
+
+#include "scene/gui/box_container.h"
+#include "property_editor.h"
+
+
+//this is for now bundled in EditorNode, will be moved away here eventually
+
+#if 0
+class InspectorDock : public VBoxContainer
+{
+	OBJ_TYPE(InspectorDock,VBoxContainer);
+
+	PropertyEditor *property_editor;
+
+	EditorHistory editor_history;
+
+	void _go_next();
+	void _go_prev();
+
+protected:
+
+	static void _bind_methods();
+public:
+
+	EditorHistory &get_editor_history();
+
+	PropertyEditor *get_property_editor();
+
+	InspectorDock();
+};
+
+#endif
+#endif // INSPECTOR_DOCK_H