Skip to content

Commit

Permalink
Merge pull request godotengine#21252 from vnen/remove-autoload-init
Browse files Browse the repository at this point in the history
Disable scripting and physics early in EditorNode
  • Loading branch information
akien-mga committed Aug 21, 2018
2 parents 4bf15d8 + ed3776c commit a3fe19d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions editor/editor_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit a3fe19d

Please sign in to comment.