summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-05-06 11:08:01 +0200
committerGitHub <noreply@github.com>2019-05-06 11:08:01 +0200
commit0f8356d43994e3b7f054ac223a6681773aeb9330 (patch)
treed2d72ca554729d5df1af51c801baa816ae4d4c51
parent7b7a664a974e86acb6d55e31609d33cf84311b8f (diff)
parent648cc7c0f54ac8b81e4409e7405fa5cd8bf7834e (diff)
Merge pull request #28715 from YeldhamDev/inherent_scene_close_empty
Make editor close empty scene when creating an inherited one
-rw-r--r--editor/editor_node.h1
-rw-r--r--editor/scene_tree_dock.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/editor/editor_node.h b/editor/editor_node.h
index 0084d421f9..c054dd7103 100644
--- a/editor/editor_node.h
+++ b/editor/editor_node.h
@@ -671,6 +671,7 @@ 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 a41f10607b..ad4b99562c 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -334,6 +334,7 @@ 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;
}