From 19b8c51e1dfacd93d58fb3fdf227289cb832507e Mon Sep 17 00:00:00 2001 From: Michael Alexsander Silva Dias Date: Wed, 8 May 2019 03:12:39 -0300 Subject: Change empty scene closing on new inherented scene to a better approach --- editor/editor_node.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 8703076a57..23d1f25641 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -1271,6 +1271,11 @@ void EditorNode::_dialog_action(String p_file) { switch (current_option) { case FILE_NEW_INHERITED_SCENE: { + Node *scene = editor_data.get_edited_scene_root(); + // If the previous scene is rootless, just close it in favor of the new one. + if (!scene) + _menu_option_confirm(FILE_CLOSE, false); + load_scene(p_file, false, true); } break; case FILE_OPEN_SCENE: { -- cgit v1.2.3