diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-12 09:25:05 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-12 09:25:05 +0200 |
| commit | 23e51c3cb563862fe9946e1838043a1f943067a5 (patch) | |
| tree | 371bc591bb3855617b4e6e8f2d857632cc69dcdd /core/core_bind.h | |
| parent | 18cdfb81011969efcab0dd0725a2fc6b6fdc00fd (diff) | |
| parent | 27d1fb63e11b092be812e9f1fbd8730598ae9999 (diff) | |
| download | redot-engine-23e51c3cb563862fe9946e1838043a1f943067a5.tar.gz | |
Merge pull request #92888 from Hilderin/fix-unable-to-use-resourceLoader-in-c#-after-threaded-load
Fix inability to use ResourceLoader in C# after threaded load in GDScript
Diffstat (limited to 'core/core_bind.h')
| -rw-r--r-- | core/core_bind.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/core_bind.h b/core/core_bind.h index e4ba0e8f56..7e2686c848 100644 --- a/core/core_bind.h +++ b/core/core_bind.h @@ -73,7 +73,7 @@ public: static ResourceLoader *get_singleton() { return singleton; } Error load_threaded_request(const String &p_path, const String &p_type_hint = "", bool p_use_sub_threads = false, CacheMode p_cache_mode = CACHE_MODE_REUSE); - ThreadLoadStatus load_threaded_get_status(const String &p_path, Array r_progress = Array()); + ThreadLoadStatus load_threaded_get_status(const String &p_path, Array r_progress = ClassDB::default_array_arg); Ref<Resource> load_threaded_get(const String &p_path); Ref<Resource> load(const String &p_path, const String &p_type_hint = "", CacheMode p_cache_mode = CACHE_MODE_REUSE); @@ -166,7 +166,7 @@ public: Vector<String> get_system_font_path_for_text(const String &p_font_name, const String &p_text, const String &p_locale = String(), const String &p_script = String(), int p_weight = 400, int p_stretch = 100, bool p_italic = false) const; String get_executable_path() const; String read_string_from_stdin(); - int execute(const String &p_path, const Vector<String> &p_arguments, Array r_output = Array(), bool p_read_stderr = false, bool p_open_console = false); + int execute(const String &p_path, const Vector<String> &p_arguments, Array r_output = ClassDB::default_array_arg, bool p_read_stderr = false, bool p_open_console = false); Dictionary execute_with_pipe(const String &p_path, const Vector<String> &p_arguments, bool p_blocking = true); int create_process(const String &p_path, const Vector<String> &p_arguments, bool p_open_console = false); int create_instance(const Vector<String> &p_arguments); |