summaryrefslogtreecommitdiff
path: root/editor/editor_node.cpp
diff options
context:
space:
mode:
authorGeorge Marques <george@gmarqu.es>2018-08-20 21:55:01 -0300
committerGeorge Marques <george@gmarqu.es>2018-08-20 21:55:01 -0300
commited3776c6a48943e9b01a4d60e28cab68f47300eb (patch)
treed893208ed2f0947013ce48c819626f30af2aba0c /editor/editor_node.cpp
parentc93888ae71bcc2b633f335b407c75412a493012d (diff)
Disable scripting and physics early in EditorNode
This avoids issues with scripts being instanced before this is set, like autoloads.
Diffstat (limited to 'editor/editor_node.cpp')
-rw-r--r--editor/editor_node.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 0be6ee8759..7ff48880fc 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -4591,6 +4591,10 @@ EditorNode::EditorNode() {
VisualServer::get_singleton()->textures_keep_original(true);
VisualServer::get_singleton()->set_debug_generate_wireframes(true);
+ PhysicsServer::get_singleton()->set_active(false); // no physics by default if editor
+ Physics2DServer::get_singleton()->set_active(false); // no physics by default if editor
+ ScriptServer::set_scripting_enabled(false); // no scripting by default if editor
+
EditorHelp::generate_doc(); //before any editor classes are crated
SceneState::set_disable_placeholders(true);
ResourceLoader::clear_translation_remaps(); //no remaps using during editor
@@ -5683,10 +5687,6 @@ EditorNode::EditorNode() {
_edit_current();
current = NULL;
- PhysicsServer::get_singleton()->set_active(false); // no physics by default if editor
- Physics2DServer::get_singleton()->set_active(false); // no physics by default if editor
- ScriptServer::set_scripting_enabled(false); // no scripting by default if editor
-
reference_resource_mem = true;
save_external_resources_mem = true;