From 253e3554af8e5a483b44757a3a52e8ee4ac739f8 Mon Sep 17 00:00:00 2001 From: raveenajain Date: Tue, 5 Feb 2019 10:18:34 -0800 Subject: [PATCH] feedback --- libraries/fbx/src/GLTFSerializer.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/fbx/src/GLTFSerializer.cpp b/libraries/fbx/src/GLTFSerializer.cpp index 674b4b1cf1..e6b4652d6a 100755 --- a/libraries/fbx/src/GLTFSerializer.cpp +++ b/libraries/fbx/src/GLTFSerializer.cpp @@ -356,7 +356,8 @@ bool GLTFSerializer::addImage(const QJsonObject& object) { image.mimeType = getImageMimeType("image/png"); } else if (image.uri.contains("data:image/jpeg;base64,")) { image.mimeType = getImageMimeType("image/jpeg"); - } else if (getStringVal(object, "mimeType", mime, image.defined)) { + } + if (getStringVal(object, "mimeType", mime, image.defined)) { image.mimeType = getImageMimeType(mime); } 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,")) { outdata = requestEmbeddedData(url); - success = outdata.isEmpty() ? false : true; + success = !outdata.isEmpty(); } else { QUrl binaryUrl = _url.resolved(url); std::tie(success, outdata) = requestData(binaryUrl);