diff options
| author | Kostadin Damyanov | 2015-09-05 12:03:17 +0300 |
|---|---|---|
| committer | Kostadin Damyanov | 2015-09-05 12:03:17 +0300 |
| commit | c5f574b914b3cb11d97ae616df4a0bced45bb17c (patch) | |
| tree | d7b70f0842c00c480ce10039b873a1dddd894a6c /modules/gdscript/gd_script.cpp | |
| parent | 2a757a6ad4ef4e7767b7d3ef7e177ec6613ef6d1 (diff) | |
| parent | b0aa49accbd7e45dae38f1bd43b0fbdd11714211 (diff) | |
| download | godot-c5f574b914b3cb11d97ae616df4a0bced45bb17c.tar.gz godot-c5f574b914b3cb11d97ae616df4a0bced45bb17c.tar.zst godot-c5f574b914b3cb11d97ae616df4a0bced45bb17c.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'modules/gdscript/gd_script.cpp')
| -rw-r--r-- | modules/gdscript/gd_script.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp index 53ae0c870..99ddc74bb 100644 --- a/modules/gdscript/gd_script.cpp +++ b/modules/gdscript/gd_script.cpp @@ -2710,7 +2710,10 @@ GDScriptLanguage::~GDScriptLanguage() { /*************** RESOURCE ***************/ -RES ResourceFormatLoaderGDScript::load(const String &p_path,const String& p_original_path) { +RES ResourceFormatLoaderGDScript::load(const String &p_path, const String& p_original_path, Error *r_error) { + + if (r_error) + *r_error=ERR_FILE_CANT_OPEN; GDScript *script = memnew( GDScript ); @@ -2742,6 +2745,8 @@ RES ResourceFormatLoaderGDScript::load(const String &p_path,const String& p_orig script->reload(); } + if (r_error) + *r_error=OK; return scriptres; } |