summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Alexsander Silva Dias <michaelalexsander@protonmail.com>2019-05-08 03:12:39 -0300
committerMichael Alexsander Silva Dias <michaelalexsander@protonmail.com>2019-05-08 04:47:39 -0300
commit19b8c51e1dfacd93d58fb3fdf227289cb832507e (patch)
tree9cce27b95b28740acdf741dddee32d013ae3a0ff
parent699140000cf88c114e4aaf8593726a8df8d5d4b4 (diff)
Change empty scene closing on new inherented scene to a better approach
-rw-r--r--editor/editor_node.cpp5
1 files changed, 5 insertions, 0 deletions
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: {