summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-11-08 10:02:18 +0100
committerGitHub <noreply@github.com>2019-11-08 10:02:18 +0100
commit621dc7022f9b9e09790481d8915858fa4d007ba4 (patch)
tree29d880f2c81f6081df2dcd01a2d0f30a4819ec42 /main
parent31f327a4a9c2637a8d2ada01b293ed138c3e6f99 (diff)
parent8b0546d93b7487476e8ec290399d95fd172d9f50 (diff)
downloadredot-engine-621dc7022f9b9e09790481d8915858fa4d007ba4.tar.gz
Merge pull request #27742 from rxlecky/camera-replication
Game camera override
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 28ab80bec2..3911ae77dc 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -44,7 +44,6 @@
#include "core/project_settings.h"
#include "core/register_core_types.h"
#include "core/script_debugger_local.h"
-#include "core/script_debugger_remote.h"
#include "core/script_language.h"
#include "core/translation.h"
#include "core/version.h"
@@ -59,6 +58,7 @@
#include "main/tests/test_main.h"
#include "modules/register_module_types.h"
#include "platform/register_platform_apis.h"
+#include "scene/debugger/script_debugger_remote.h"
#include "scene/main/scene_tree.h"
#include "scene/main/viewport.h"
#include "scene/register_scene_types.h"
@@ -1581,6 +1581,12 @@ bool Main::start() {
if (!project_manager && !editor) { // game
if (game_path != "" || script != "") {
+ if (script_debugger && script_debugger->is_remote()) {
+ ScriptDebuggerRemote *remote_debugger = static_cast<ScriptDebuggerRemote *>(script_debugger);
+
+ remote_debugger->set_scene_tree(sml);
+ }
+
//autoload
List<PropertyInfo> props;
ProjectSettings::get_singleton()->get_property_list(&props);