diff options
| author | Kostadin Damyanov <maxmight@gmail.com> | 2015-09-05 12:03:17 +0300 |
|---|---|---|
| committer | Kostadin Damyanov <maxmight@gmail.com> | 2015-09-05 12:03:17 +0300 |
| commit | c5f574b914b3cb11d97ae616df4a0bced45bb17c (patch) | |
| tree | d7b70f0842c00c480ce10039b873a1dddd894a6c /drivers/dds/texture_loader_dds.cpp | |
| parent | 2a757a6ad4ef4e7767b7d3ef7e177ec6613ef6d1 (diff) | |
| parent | b0aa49accbd7e45dae38f1bd43b0fbdd11714211 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'drivers/dds/texture_loader_dds.cpp')
| -rw-r--r-- | drivers/dds/texture_loader_dds.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/dds/texture_loader_dds.cpp b/drivers/dds/texture_loader_dds.cpp index 8e6c3b62e6..9b2e401fd9 100644 --- a/drivers/dds/texture_loader_dds.cpp +++ b/drivers/dds/texture_loader_dds.cpp @@ -64,8 +64,10 @@ static const DDSFormatInfo dds_format_info[DDS_MAX]={ }; -RES ResourceFormatDDS::load(const String &p_path,const String& p_original_path) { +RES ResourceFormatDDS::load(const String &p_path, const String& p_original_path, Error *r_error) { + if (r_error) + *r_error=ERR_CANT_OPEN; Error err; FileAccess *f = FileAccess::open(p_path,FileAccess::READ,&err); @@ -73,6 +75,8 @@ RES ResourceFormatDDS::load(const String &p_path,const String& p_original_path) return RES(); FileAccessRef fref(f); + if (r_error) + *r_error=ERR_FILE_CORRUPT; ERR_EXPLAIN("Unable to open DDS texture file: "+p_path); ERR_FAIL_COND_V(err!=OK,RES()); @@ -427,6 +431,10 @@ RES ResourceFormatDDS::load(const String &p_path,const String& p_original_path) Ref<ImageTexture> texture = memnew( ImageTexture ); texture->create_from_image(img); + if (r_error) + *r_error=OK; + + return texture; } |