diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-11 15:01:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-11 15:01:38 +0100 |
| commit | 90de1d236c88a57bc6c8dd705117a41c56d2287a (patch) | |
| tree | 90bb373637733e0f74fd645fd6b392253a83c0fe | |
| parent | 2c17af050935bccf17deb6e6489ade64c0af2f73 (diff) | |
| parent | a6157245b169d0bf364e2c1d3868ff0f5dde9d59 (diff) | |
Merge pull request #15596 from endragor/cache-no-error
Dont print error when loading resource from cache
| -rw-r--r-- | core/io/resource_loader.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index 87add585eb..1351030d1e 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -202,7 +202,8 @@ RES ResourceLoader::load(const String &p_path, const String &p_type_hint, bool p if (OS::get_singleton()->is_stdout_verbose()) print_line("load resource: " + local_path + " (cached)"); - + if (r_error) + *r_error = OK; return RES(ResourceCache::get(local_path)); } |