diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-05 22:01:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-05 22:01:57 +0200 |
| commit | e490c16a3d0562271a310140f09a59f29c256d54 (patch) | |
| tree | 433a98d2c96d334eea4190a253e91d74833c1c2e /scene/main/scene_tree.cpp | |
| parent | 7464074cb8e4b38fe9eb73952477f9ebf197cd82 (diff) | |
| parent | dcd551bf782c8f07e676c96717cf97c254adf0cd (diff) | |
Merge pull request #31114 from merumelu/editornode-begone
Remove Editor dependency from SceneTree
Diffstat (limited to 'scene/main/scene_tree.cpp')
| -rw-r--r-- | scene/main/scene_tree.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index dbf3150ae0..2668acd3d5 100644 --- a/scene/main/scene_tree.cpp +++ b/scene/main/scene_tree.cpp @@ -37,7 +37,6 @@ #include "core/os/os.h" #include "core/print_string.h" #include "core/project_settings.h" -#include "editor/editor_node.h" #include "main/input_default.h" #include "node.h" #include "scene/resources/dynamic_font.h" @@ -647,7 +646,8 @@ void SceneTree::_notification(int p_notification) { case NOTIFICATION_WM_MOUSE_ENTER: case NOTIFICATION_WM_MOUSE_EXIT: case NOTIFICATION_WM_FOCUS_IN: - case NOTIFICATION_WM_FOCUS_OUT: { + case NOTIFICATION_WM_FOCUS_OUT: + case NOTIFICATION_WM_ABOUT: { if (p_notification == NOTIFICATION_WM_FOCUS_IN) { InputDefault *id = Object::cast_to<InputDefault>(Input::get_singleton()); @@ -671,19 +671,6 @@ void SceneTree::_notification(int p_notification) { } break; - case NOTIFICATION_WM_ABOUT: { - -#ifdef TOOLS_ENABLED - if (EditorNode::get_singleton()) { - EditorNode::get_singleton()->show_about(); - } else { -#endif - get_root()->propagate_notification(p_notification); -#ifdef TOOLS_ENABLED - } -#endif - } break; - case NOTIFICATION_CRASH: { get_root()->propagate_notification(p_notification); |