diff --git a/editor/doc/editor_help.cpp b/editor/doc/editor_help.cpp index ddc8a0f610e..3ed2c033d82 100644 --- a/editor/doc/editor_help.cpp +++ b/editor/doc/editor_help.cpp @@ -3104,6 +3104,10 @@ void EditorHelp::load_script_doc_cache() { return; } + if (EditorNode::is_cmdline_mode()) { + return; + } + _wait_for_thread(); if (!ResourceLoader::exists(get_script_doc_cache_full_path())) { diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index ae422c98cf7..975b607a434 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -6015,6 +6015,11 @@ bool EditorNode::immediate_confirmation_dialog(const String &p_text, const Strin return singleton->immediate_dialog_confirmed; } +bool EditorNode::is_cmdline_mode() { + ERR_FAIL_NULL_V(singleton, false); + return singleton->cmdline_mode; +} + void EditorNode::cleanup() { _init_callbacks.clear(); } diff --git a/editor/editor_node.h b/editor/editor_node.h index e5e6f3ef360..70f3d56fede 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -773,6 +773,7 @@ public: static bool immediate_confirmation_dialog(const String &p_text, const String &p_ok_text = TTR("Ok"), const String &p_cancel_text = TTR("Cancel"), uint32_t p_wrap_width = 0); + static bool is_cmdline_mode(); static void cleanup(); EditorPluginList *get_editor_plugins_force_input_forwarding() { return editor_plugins_force_input_forwarding; } diff --git a/editor/file_system/editor_file_system.cpp b/editor/file_system/editor_file_system.cpp index 18c3aba700b..a6e0be6cab4 100644 --- a/editor/file_system/editor_file_system.cpp +++ b/editor/file_system/editor_file_system.cpp @@ -2285,8 +2285,10 @@ void EditorFileSystem::_process_update_pending() { _update_script_classes(); // Parse documentation second, as it requires the class names to be loaded // because _update_script_documentation loads the scripts completely. - _update_script_documentation(); - _update_pending_scene_groups(); + if (!EditorNode::is_cmdline_mode()) { + _update_script_documentation(); + _update_pending_scene_groups(); + } } void EditorFileSystem::_queue_update_script_class(const String &p_path, const ScriptClassInfoUpdate &p_script_update) {