summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-06-26 22:58:03 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-06-26 22:58:46 -0300
commit3ce046ee0c49b23bb1e5d59a5a0fe8c70bc64c7d (patch)
treeb07579f992f505f78c4b68225ff7cfa031ec7d22 /main
parent90592ccf03521cda14ee3a9576b671136da2021d (diff)
-Fixed SCREEN_TEXTURE and other related 2D shader parameters.
-Fixded BackBuffercopy object
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp2
-rw-r--r--main/performance.cpp2
-rw-r--r--main/tests/test_gui.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/main/main.cpp b/main/main.cpp
index cd464de1aa..2d6b151e14 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -43,7 +43,7 @@
#include "input_map.h"
#include "io/resource_loader.h"
-#include "scene/main/scene_main_loop.h"
+#include "scene/main/scene_tree.h"
#include "servers/audio_server.h"
#include "io/resource_loader.h"
diff --git a/main/performance.cpp b/main/performance.cpp
index 5788f64239..c819e15f71 100644
--- a/main/performance.cpp
+++ b/main/performance.cpp
@@ -30,7 +30,7 @@
#include "performance.h"
#include "message_queue.h"
#include "os/os.h"
-#include "scene/main/scene_main_loop.h"
+#include "scene/main/scene_tree.h"
#include "servers/physics_2d_server.h"
#include "servers/physics_server.h"
#include "servers/visual_server.h"
diff --git a/main/tests/test_gui.cpp b/main/tests/test_gui.cpp
index 291a557d04..3c6a708cd8 100644
--- a/main/tests/test_gui.cpp
+++ b/main/tests/test_gui.cpp
@@ -50,7 +50,7 @@
#include "scene/gui/tab_container.h"
#include "scene/gui/texture_rect.h"
#include "scene/gui/tree.h"
-#include "scene/main/scene_main_loop.h"
+#include "scene/main/scene_tree.h"
#include "scene/3d/camera.h"
#include "scene/main/viewport.h"