Merge branch 'release' of github.com:syoyo/tinygltf into release
diff --git a/tiny_gltf.h b/tiny_gltf.h
index 7612804..3e63385 100644
--- a/tiny_gltf.h
+++ b/tiny_gltf.h
@@ -4352,7 +4352,7 @@
// Just only save some information here. Loading actual image data from
// bufferView is done after this `ParseImage` function.
image->bufferView = bufferView;
- image->mimeType = mime_type;
+ image->mimeType = std::move( mime_type );
image->width = width;
image->height = height;
@@ -5251,7 +5251,7 @@
if (node->extensions.count("MSFT_lod") != 0) {
auto const &msft_lod_ext = node->extensions["MSFT_lod"];
if (msft_lod_ext.Has("ids")) {
- auto idsArr = msft_lod_ext.Get("ids");
+ const auto &idsArr = msft_lod_ext.Get("ids");
for (size_t i = 0; i < idsArr.ArrayLen(); ++i) {
node->lods.emplace_back(idsArr.Get(i).GetNumberAsInt());
}
@@ -5280,7 +5280,7 @@
if (scene->extensions.count("KHR_audio") != 0) {
auto const &audio_ext = scene->extensions["KHR_audio"];
if (audio_ext.Has("emitters")) {
- auto emittersArr = audio_ext.Get("emitters");
+ const auto &emittersArr = audio_ext.Get("emitters");
for (size_t i = 0; i < emittersArr.ArrayLen(); ++i) {
scene->audioEmitters.emplace_back(emittersArr.Get(i).GetNumberAsInt());
}
@@ -5316,7 +5316,7 @@
}
return false;
}
- pbr->baseColorFactor = baseColorFactor;
+ pbr->baseColorFactor = std::move( baseColorFactor );
}
{
@@ -5468,7 +5468,7 @@
if (material->extensions.count("MSFT_lod") != 0) {
auto const &msft_lod_ext = material->extensions["MSFT_lod"];
if (msft_lod_ext.Has("ids")) {
- auto idsArr = msft_lod_ext.Get("ids");
+ const auto &idsArr = msft_lod_ext.Get("ids");
for (size_t i = 0; i < idsArr.ArrayLen(); ++i) {
material->lods.emplace_back(idsArr.Get(i).GetNumberAsInt());
}