1 files changed, 24 insertions, 29 deletions

diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 3f0520379a..d7cce71b90 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -2780,14 +2780,6 @@ Dictionary EditorNode::_get_main_scene_state() {
 	state["property_edit_offset"] = get_property_editor()->get_scene_tree()->get_vscroll_bar()->get_value();
 	state["saved_version"] = saved_version;
 	state["node_filter"] = scene_tree_dock->get_filter();
-	int current = -1;
-	for (int i = 0; i < editor_table.size(); i++) {
-		if (editor_plugin_screen == editor_table[i]) {
-			current = i;
-			break;
-		}
-	}
-	state["editor_index"] = current;
 	return state;
 }
 
@@ -2798,29 +2790,32 @@ void EditorNode::_set_main_scene_state(Dictionary p_state, Node *p_for_scene) {
 
 	changing_scene = false;
 
-	if (p_state.has("editor_index")) {
-
-		int index = p_state["editor_index"];
-		int current = -1;
-		for (int i = 0; i < editor_table.size(); i++) {
-			if (editor_plugin_screen == editor_table[i]) {
-				current = i;
-				break;
-			}
+	int current = -1;
+	for (int i = 0; i < editor_table.size(); i++) {
+		if (editor_plugin_screen == editor_table[i]) {
+			current = i;
+			break;
 		}
+	}
 
+	if (p_state.has("editor_index")) {
+		int index = p_state["editor_index"];
 		if (current < 2) { //if currently in spatial/2d, only switch to spatial/2d. if curently in script, stay there
 			if (index < 2 || !get_edited_scene()) {
 				_editor_select(index);
-			} else {
-				//use heuristic instead
-				int n2d = 0, n3d = 0;
-				_find_node_types(get_edited_scene(), n2d, n3d);
-				if (n2d > n3d) {
-					_editor_select(EDITOR_2D);
-				} else if (n3d > n2d) {
-					_editor_select(EDITOR_3D);
-				}
+			}
+		}
+	}
+
+	if (get_edited_scene()) {
+		if (current < 2) {
+			//use heuristic instead
+			int n2d = 0, n3d = 0;
+			_find_node_types(get_edited_scene(), n2d, n3d);
+			if (n2d > n3d) {
+				_editor_select(EDITOR_2D);
+			} else if (n3d > n2d) {
+				_editor_select(EDITOR_3D);
 			}
 		}
 	}
@@ -3343,9 +3338,9 @@ void EditorNode::_editor_file_dialog_unregister(EditorFileDialog *p_dialog) {
 
 Vector<EditorNodeInitCallback> EditorNode::_init_callbacks;
 
-Error EditorNode::export_preset(const String &preset, const String &p_path, bool p_debug, const String &p_password, bool p_quit_after) {
+Error EditorNode::export_preset(const String &p_preset, const String &p_path, bool p_debug, const String &p_password, bool p_quit_after) {
 
-	export_defer.preset = preset;
+	export_defer.preset = p_preset;
 	export_defer.path = p_path;
 	export_defer.debug = p_debug;
 	export_defer.password = p_password;
@@ -4854,7 +4849,7 @@ EditorNode::EditorNode() {
 	scene_root_parent = memnew(PanelContainer);
 	scene_root_parent->set_custom_minimum_size(Size2(0, 80) * EDSCALE);
 	scene_root_parent->add_style_override("panel", gui_base->get_stylebox("Content", "EditorStyles"));
-
+	scene_root_parent->set_draw_behind_parent(true);
 	srt->add_child(scene_root_parent);
 	scene_root_parent->set_v_size_flags(Control::SIZE_EXPAND_FILL);