diff options
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/scene_tree.cpp | 4 | ||||
| -rw-r--r-- | scene/main/window.cpp | 5 | ||||
| -rw-r--r-- | scene/main/window.h | 1 |
3 files changed, 5 insertions, 5 deletions
diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index 6b3b2d6260..a29311af43 100644 --- a/scene/main/scene_tree.cpp +++ b/scene/main/scene_tree.cpp @@ -60,7 +60,9 @@ #include "servers/display_server.h" #include "servers/navigation_server_3d.h" #include "servers/physics_server_2d.h" +#ifndef _3D_DISABLED #include "servers/physics_server_3d.h" +#endif // _3D_DISABLED #include "window.h" #include <stdio.h> #include <stdlib.h> @@ -884,7 +886,9 @@ void SceneTree::set_pause(bool p_enabled) { return; } paused = p_enabled; +#ifndef _3D_DISABLED PhysicsServer3D::get_singleton()->set_active(!p_enabled); +#endif // _3D_DISABLED PhysicsServer2D::get_singleton()->set_active(!p_enabled); if (get_root()) { get_root()->_propagate_pause_notification(p_enabled); diff --git a/scene/main/window.cpp b/scene/main/window.cpp index 483c6e4c60..9c2509404c 100644 --- a/scene/main/window.cpp +++ b/scene/main/window.cpp @@ -1194,10 +1194,7 @@ void Window::_update_viewport_size() { } } - if (old_size != size) { - old_size = size; - notification(NOTIFICATION_WM_SIZE_CHANGED); - } + notification(NOTIFICATION_WM_SIZE_CHANGED); if (embedder) { embedder->_sub_window_update(this); diff --git a/scene/main/window.h b/scene/main/window.h index 70ee744344..e37a98bd2d 100644 --- a/scene/main/window.h +++ b/scene/main/window.h @@ -116,7 +116,6 @@ private: mutable Size2i size = Size2i(DEFAULT_WINDOW_SIZE, DEFAULT_WINDOW_SIZE); mutable Size2i min_size; mutable Size2i max_size; - mutable Size2i old_size = size; mutable Vector<Vector2> mpath; mutable Mode mode = MODE_WINDOWED; mutable bool flags[FLAG_MAX] = {}; |