2 files changed, 52 insertions, 21 deletions

diff --git a/tools/editor/editor_help.cpp b/tools/editor/editor_help.cpp
index 110e06f25b..47389559df 100644
--- a/tools/editor/editor_help.cpp
+++ b/tools/editor/editor_help.cpp
@@ -650,14 +650,64 @@ Error EditorHelp::_goto_desc(const String& p_class,int p_vscr) {
 		class_desc->add_text("Inherits: ");
 		class_desc->pop();
 		class_desc->pop();
+
+		String inherits = cd.inherits;
+
 		class_desc->push_font(doc_font);
-		_add_type(cd.inherits);
+
+		while (inherits != "") {
+			_add_type(inherits);
+
+			inherits = doc->class_list[inherits].inherits;
+
+			if (inherits != "") {
+				class_desc->add_text(" , ");
+			}
+		}
+
 		class_desc->pop();
 		class_desc->add_newline();
-		class_desc->add_newline();
+	}
+
+	if (ObjectTypeDB::type_exists(cd.name)) {
+
+		bool found = false;
+		bool prev = false;
+
+		for (Map<String,DocData::ClassDoc>::Element *E=doc->class_list.front();E;E=E->next()) {
+
+			if (E->get().inherits == cd.name) {
+
+				if (!found) {
+					class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/keyword_color"));
+					class_desc->push_font(doc_title_font);
+					class_desc->add_text("Inherited by: ");
+					class_desc->pop();
+					class_desc->pop();
+
+					found = true;
+					class_desc->push_font(doc_font);
+				}
 
+				if (prev) {
+
+					class_desc->add_text(" , ");
+					prev = false;
+				}
+
+				_add_type(E->get().name);
+				prev = true;
+			}
+		}
+
+		if (found)
+			class_desc->pop();
+
+		class_desc->add_newline();
 	}
 
+	class_desc->add_newline();
+
 	if (cd.brief_description!="") {
 
 		class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/keyword_color"));
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 61d6d74d1e..24df4544ec 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -981,11 +981,6 @@ void EditorNode::_save_scene(String p_file) {
 
 	editor_data.apply_changes_in_editors();
 
-	if (editor_plugin_screen) {
-		scene->set_meta("__editor_plugin_screen__",editor_plugin_screen->get_name());
-	}
-
-
 	_set_scene_metadata(p_file);
 
 
@@ -3692,26 +3687,12 @@ Error EditorNode::load_scene(const String& p_scene, bool p_ignore_broken_deps,bo
 */
 	editor_data.set_edited_scene_import_metadata( sdata->get_import_metadata() );
 
-
 //	editor_data.get_undo_redo().clear_history();
 	saved_version=editor_data.get_undo_redo().get_version();
 	_update_title();
 	_update_scene_tabs();
 	_add_to_recent_scenes(lpath);
 
-	if (new_scene->has_meta("__editor_plugin_screen__")) {
-
-		String editor = new_scene->get_meta("__editor_plugin_screen__");
-
-		for(int i=0;i<editor_table.size();i++) {
-
-			if (editor_table[i]->get_name()==editor) {
-				_editor_select(i);
-				break;
-			}
-		}
-	}
-
 	prev_scene->set_disabled(previous_scenes.size()==0);
 	opening_prev=false;