summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Alexsander Silva Dias <michaelalexsander@protonmail.com>2019-05-08 00:46:40 -0300
committerMichael Alexsander Silva Dias <michaelalexsander@protonmail.com>2019-05-08 00:46:40 -0300
commit699140000cf88c114e4aaf8593726a8df8d5d4b4 (patch)
tree6e9f5564c3938acbedc0aaed208e5bd26892c4c5
parent0239d8bd9fa03965439aac2482d18746f807bd00 (diff)
Revert "Merge pull request #28715 from YeldhamDev/inherent_scene_close_empty"
This reverts commit 0f8356d43994e3b7f054ac223a6681773aeb9330, reversing changes made to 7b7a664a974e86acb6d55e31609d33cf84311b8f.
-rw-r--r--editor/editor_node.h1
-rw-r--r--editor/scene_tree_dock.cpp1
2 files changed, 0 insertions, 2 deletions
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;
}