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

Fix OBJSerializer crash with empty groupMaterialName

Browse source
This commit is contained in:
sabrina-shanman 2019-10-25 09:14:12 -07:00
parent fa51ec3daf
commit 77dcad21db
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/fbx/src/OBJSerializer.cpp
View file

@ -741,8 +741,8 @@ HFMModel::Pointer OBJSerializer::read(const hifi::ByteArray& data, const hifi::V
needsMaterialLibrary = groupMaterialName != SMART_DEFAULT_MATERIAL_NAME; needsMaterialLibrary = groupMaterialName != SMART_DEFAULT_MATERIAL_NAME;
} }
materials[groupMaterialName] = material; materials[groupMaterialName] = material;
materialNamePerShape.push_back(groupMaterialName);
} }
materialNamePerShape.push_back(groupMaterialName);
hfm::Shape shape; hfm::Shape shape;
@ -1010,9 +1010,12 @@ HFMModel::Pointer OBJSerializer::read(const hifi::ByteArray& data, const hifi::V
// GO over the shapes once more to assign the material index correctly // GO over the shapes once more to assign the material index correctly
for (uint32_t i = 0; i < (uint32_t)hfmModel.shapes.size(); ++i) { for (uint32_t i = 0; i < (uint32_t)hfmModel.shapes.size(); ++i) {
auto foundMaterialIndex = materialNameToIndex.find(materialNamePerShape[i]); const auto& materialName = materialNamePerShape[i];
if (foundMaterialIndex != materialNameToIndex.end()) { if (!materialName.isEmpty()) {
hfmModel.shapes[i].material = foundMaterialIndex.value(); auto foundMaterialIndex = materialNameToIndex.find(materialName);
if (foundMaterialIndex != materialNameToIndex.end()) {
hfmModel.shapes[i].material = foundMaterialIndex.value();
}
} }
} }