summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-08-16 14:35:12 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-08-16 14:35:12 +0200
commit1d4303c1feda7fda9df16d0db4beb9d41ff205ee (patch)
treebf8b7c582d353c41486ae3ea6c085bd4e95a977a /main
parentde44c2051488d4638246f31c11f8348c8b8978d3 (diff)
parent69d52ed081ac636a0ac696984c304c5284c902a7 (diff)
downloadredot-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.
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp8
1 files changed, 8 insertions, 0 deletions
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