godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change empty scene closing on new inherented scene to a better approach

Browse Source
This commit is contained in:
Michael Alexsander Silva Dias 2019-05-08 03:12:39 -03:00
parent 699140000c
commit 19b8c51e1d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editor/editor_node.cpp
View File

@ -1271,6 +1271,11 @@ void EditorNode::_dialog_action(String p_file) {
switch (current_option) { switch (current_option) {
case FILE_NEW_INHERITED_SCENE: { 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); load_scene(p_file, false, true);
} break; } break;
case FILE_OPEN_SCENE: { case FILE_OPEN_SCENE: {