GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-08-15 08:16:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into generic_extension_support

Browse Source
This commit is contained in:
Selmar Kok 2018-03-19 16:15:22 +01:00
commit 85b3cbc44d
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tiny_gltf.h
View File

@ -1759,7 +1759,12 @@ static bool ParseImage(Image *image, std::string *err, const json &o,
if (IsDataURI(uri)) { if (IsDataURI(uri)) {
loaded = DecodeDataURI(&img, uri, 0, false); loaded = DecodeDataURI(&img, uri, 0, false);
} else { } else {
// Assume external .bin file. // Assume external file
// Keep texture path (for textures that cannot be decoded)
image->uri = uri;
#ifdef TINYGLTF_NO_EXTERNAL_IMAGE
return true;
#endif
loaded = LoadExternalFile(&img, err, uri, basedir, 0, false); loaded = LoadExternalFile(&img, err, uri, basedir, 0, false);
} }
@ -1807,10 +1812,11 @@ static bool ParseImage(Image *image, std::string *err, const json &o,
} }
} else { } else {
// Assume external file // Assume external file
// Keep texture path (for textures that cannot be decoded) // Keep texture path (for textures that cannot be decoded)
image->uri = uri; image->uri = uri;
#ifdef TINYGLTF_NO_EXTERNAL_IMAGE
return true;
#endif
if (!LoadExternalFile(&img, err, uri, basedir, 0, false)) { if (!LoadExternalFile(&img, err, uri, basedir, 0, false)) {
if (err) { if (err) {
(*err) += "Failed to load external 'uri' for image parameter\n"; (*err) += "Failed to load external 'uri' for image parameter\n";