Merge pull request #21252 from vnen/remove-autoload-init

Disable scripting and physics early in EditorNode

1 files changed, 4 insertions, 4 deletions

diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 975c7f8345..98206f9443 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -4592,6 +4592,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
@@ -5681,10 +5685,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;