diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-05-08 15:48:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-08 15:48:23 +0200 |
| commit | b0d73d3099b5c4879224fd6b3786d62299e1a288 (patch) | |
| tree | 59d488b9e77f61dbe081cf08aad3c0dbfdd47453 | |
| parent | 869124e343e5036b45082bf514011c264b8c5171 (diff) | |
| parent | 19b8c51e1dfacd93d58fb3fdf227289cb832507e (diff) | |
Merge pull request #28754 from YeldhamDev/inherent_scene_close_empty_changes
Change empty scene closing on new inherented scene to a better approach
| -rw-r--r-- | editor/editor_node.cpp | 5 | ||||
| -rw-r--r-- | editor/editor_node.h | 1 | ||||
| -rw-r--r-- | editor/scene_tree_dock.cpp | 1 |
3 files changed, 5 insertions, 2 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: { diff --git a/editor/editor_node.h b/editor/editor_node.h index c054dd7103..0084d421f9 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -671,7 +671,6 @@ public: static void remove_editor_plugin(EditorPlugin *p_editor, bool p_config_changed = false); void new_inherited_scene() { _menu_option_confirm(FILE_NEW_INHERITED_SCENE, false); } - void close_current_scene() { _menu_option_confirm(FILE_CLOSE, false); } void set_docks_visible(bool p_show); bool get_docks_visible() const; diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index ad4b99562c..a41f10607b 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -334,7 +334,6 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { Node *scene = edited_scene; if (!scene) { - EditorNode::get_singleton()->close_current_scene(); EditorNode::get_singleton()->new_inherited_scene(); break; } |