From ed3776c6a48943e9b01a4d60e28cab68f47300eb Mon Sep 17 00:00:00 2001 From: George Marques Date: Mon, 20 Aug 2018 21:55:01 -0300 Subject: [PATCH] Disable scripting and physics early in EditorNode This avoids issues with scripts being instanced before this is set, like autoloads. --- editor/editor_node.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 0be6ee87597..7ff48880fc0 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;