Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

feedback

Browse source
This commit is contained in:
raveenajain 2019-02-05 10:18:34 -08:00
parent 21fa1878cb
commit 253e3554af
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/fbx/src/GLTFSerializer.cpp
View file

@ -356,7 +356,8 @@ bool GLTFSerializer::addImage(const QJsonObject& object) {
image.mimeType = getImageMimeType("image/png"); image.mimeType = getImageMimeType("image/png");
} else if (image.uri.contains("data:image/jpeg;base64,")) { } else if (image.uri.contains("data:image/jpeg;base64,")) {
image.mimeType = getImageMimeType("image/jpeg"); image.mimeType = getImageMimeType("image/jpeg");
} else if (getStringVal(object, "mimeType", mime, image.defined)) { }
if (getStringVal(object, "mimeType", mime, image.defined)) {
image.mimeType = getImageMimeType(mime); image.mimeType = getImageMimeType(mime);
} }
getIntVal(object, "bufferView", image.bufferView, image.defined); getIntVal(object, "bufferView", image.bufferView, image.defined);
@ -947,7 +948,7 @@ bool GLTFSerializer::readBinary(const QString& url, QByteArray& outdata) {
if (url.contains("data:application/octet-stream;base64,")) { if (url.contains("data:application/octet-stream;base64,")) {
outdata = requestEmbeddedData(url); outdata = requestEmbeddedData(url);
success = outdata.isEmpty() ? false : true; success = !outdata.isEmpty();
} else { } else {
QUrl binaryUrl = _url.resolved(url); QUrl binaryUrl = _url.resolved(url);
std::tie<bool, QByteArray>(success, outdata) = requestData(binaryUrl); std::tie<bool, QByteArray>(success, outdata) = requestData(binaryUrl);