diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-22 17:15:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-22 17:15:21 +0200 |
commit | 919573f7ce89d001bb207610a4c264a64276a4a3 (patch) | |
tree | 783e812b6bcf9a18d56df88125cd4f0cf1bc1638 /modules/gdnative/nativescript/nativescript.cpp | |
parent | 955a913a1fcc7551a3e03017eb2ac8edc4ee7043 (diff) | |
parent | cf09952b6bfd93901a38fe3bc398973fbeb9d4f9 (diff) | |
download | redot-engine-919573f7ce89d001bb207610a4c264a64276a4a3.tar.gz |
Merge pull request #23223 from BlackSkySoftware/bugfix/20141
Fixes crash when loading *.escn resources with gdnative #20141
Diffstat (limited to 'modules/gdnative/nativescript/nativescript.cpp')
-rw-r--r-- | modules/gdnative/nativescript/nativescript.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/gdnative/nativescript/nativescript.cpp b/modules/gdnative/nativescript/nativescript.cpp index 37e72bf9f8..3e56275396 100644 --- a/modules/gdnative/nativescript/nativescript.cpp +++ b/modules/gdnative/nativescript/nativescript.cpp @@ -1711,8 +1711,7 @@ void NativeReloadNode::_notification(int p_what) { } RES ResourceFormatLoaderNativeScript::load(const String &p_path, const String &p_original_path, Error *r_error) { - ResourceFormatLoaderText rsflt; - return rsflt.load(p_path, p_original_path, r_error); + return ResourceFormatLoaderText::singleton->load(p_path, p_original_path, r_error); } void ResourceFormatLoaderNativeScript::get_recognized_extensions(List<String> *p_extensions) const { |