fixed a reference error which cause an error when writing images to disk

This commit is contained in:
Johan Bowald 2018-11-06 14:28:20 +01:00
parent e26117e026
commit 77decfaff8

View File

@ -4130,7 +4130,7 @@ static void SerializeExtensionMap(ExtensionMap &extensions, json &o) {
extMap[extIt->first] = ret; extMap[extIt->first] = ret;
} }
if(ret.is_null()) { if(ret.is_null()) {
if (!(extIt->first.empty())) { // name should not be empty, but for sure if (!(extIt->first.empty())) { // name should not be empty, but for sure
// create empty object so that an extension name is still included in json. // create empty object so that an extension name is still included in json.
extMap[extIt->first] = json({}); extMap[extIt->first] = json({});
} }
@ -4597,7 +4597,7 @@ bool TinyGLTF::WriteGltfSceneToFile(Model *model, const std::string &filename,
} else { } else {
std::string binSavePath; std::string binSavePath;
std::string binUri; std::string binUri;
if (!model->buffers[i].uri.empty() if (!model->buffers[i].uri.empty()
&& !IsDataURI(model->buffers[i].uri)) { && !IsDataURI(model->buffers[i].uri)) {
binUri = model->buffers[i].uri; binUri = model->buffers[i].uri;
} }
@ -4654,7 +4654,7 @@ bool TinyGLTF::WriteGltfSceneToFile(Model *model, const std::string &filename,
json image; json image;
UpdateImageObject(model->images[i], baseDir, int(i), embedImages, UpdateImageObject(model->images[i], baseDir, int(i), embedImages,
&this->WriteImageData, &this->write_image_user_data_); &this->WriteImageData, this->write_image_user_data_);
SerializeGltfImage(model->images[i], image); SerializeGltfImage(model->images[i], image);
images.push_back(image); images.push_back(image);
} }