diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-08-16 14:35:12 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-08-16 14:35:12 +0200 |
| commit | 1d4303c1feda7fda9df16d0db4beb9d41ff205ee (patch) | |
| tree | bf8b7c582d353c41486ae3ea6c085bd4e95a977a | |
| parent | de44c2051488d4638246f31c11f8348c8b8978d3 (diff) | |
| parent | 69d52ed081ac636a0ac696984c304c5284c902a7 (diff) | |
| download | redot-engine-1d4303c1feda7fda9df16d0db4beb9d41ff205ee.tar.gz | |
Merge pull request #95502 from bruvzg/net_ext_detect
[.NET] Move search in files extension list definition to be after Scene level module init.
| -rw-r--r-- | core/config/project_settings.cpp | 9 | ||||
| -rw-r--r-- | doc/classes/ProjectSettings.xml | 2 | ||||
| -rw-r--r-- | main/main.cpp | 8 |
3 files changed, 9 insertions, 10 deletions
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp index 37a2608c10..f231e4010f 100644 --- a/core/config/project_settings.cpp +++ b/core/config/project_settings.cpp @@ -1489,15 +1489,6 @@ ProjectSettings::ProjectSettings() { GLOBAL_DEF(PropertyInfo(Variant::INT, "audio/general/ios/session_category", PROPERTY_HINT_ENUM, "Ambient,Multi Route,Play and Record,Playback,Record,Solo Ambient"), 0); GLOBAL_DEF("audio/general/ios/mix_with_others", false); - PackedStringArray extensions; - extensions.push_back("gd"); - if (ClassDB::class_exists("CSharpScript")) { - extensions.push_back("cs"); - } - extensions.push_back("gdshader"); - - GLOBAL_DEF(PropertyInfo(Variant::PACKED_STRING_ARRAY, "editor/script/search_in_file_extensions"), extensions); - _add_builtin_input_map(); // Keep the enum values in sync with the `DisplayServer::ScreenOrientation` enum. diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml index ff2c0bbfd9..8d567f347a 100644 --- a/doc/classes/ProjectSettings.xml +++ b/doc/classes/ProjectSettings.xml @@ -1004,7 +1004,7 @@ prime-run %command% [/codeblock] </member> - <member name="editor/script/search_in_file_extensions" type="PackedStringArray" setter="" getter="" default="PackedStringArray("gd", "gdshader")"> + <member name="editor/script/search_in_file_extensions" type="PackedStringArray" setter="" getter=""> Text-based file extensions to include in the script editor's "Find in Files" feature. You can add e.g. [code]tscn[/code] if you wish to also parse your scene files, especially if you use built-in scripts which are serialized in the scene files. </member> <member name="editor/script/templates_search_path" type="String" setter="" getter="" default=""res://script_templates""> diff --git a/main/main.cpp b/main/main.cpp index d0b58d9abd..599da2e97f 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -3134,6 +3134,14 @@ Error Main::setup2(bool p_show_boot_logo) { OS::get_singleton()->benchmark_end_measure("Scene", "Modules and Extensions"); } + PackedStringArray extensions; + extensions.push_back("gd"); + if (ClassDB::class_exists("CSharpScript")) { + extensions.push_back("cs"); + } + extensions.push_back("gdshader"); + GLOBAL_DEF_NOVAL(PropertyInfo(Variant::PACKED_STRING_ARRAY, "editor/script/search_in_file_extensions"), extensions); // Note: should be defined after Scene level modules init to see .NET. + OS::get_singleton()->benchmark_end_measure("Startup", "Scene"); #ifdef TOOLS_ENABLED |