From 699140000cf88c114e4aaf8593726a8df8d5d4b4 Mon Sep 17 00:00:00 2001 From: Michael Alexsander Silva Dias Date: Wed, 8 May 2019 00:46:40 -0300 Subject: [PATCH] Revert "Merge pull request #28715 from YeldhamDev/inherent_scene_close_empty" This reverts commit 0f8356d43994e3b7f054ac223a6681773aeb9330, reversing changes made to 7b7a664a974e86acb6d55e31609d33cf84311b8f. --- editor/editor_node.h | 1 - editor/scene_tree_dock.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/editor/editor_node.h b/editor/editor_node.h index c054dd7103c..0084d421f9a 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 ad4b99562ca..a41f10607b8 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; }