v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fbx: set default material when no material layer is assigned to a mesh.

pull/14/head
Alexander Gessler 2012-07-05 16:37:13 +02:00
parent 61c6c37e30
commit 3179e949bb
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/FBXConverter.cpp
View File

@ -354,7 +354,13 @@ private:
} }
const std::vector<unsigned int>& mindices = mesh.GetMaterialIndices(); const std::vector<unsigned int>& mindices = mesh.GetMaterialIndices();
ConvertMaterialForMesh(out_mesh,model,mesh,mindices.size() ? mindices[0] : 0); if(mindices.empty()) {
FBXImporter::LogError("no material assigned to mesh, setting default material");
out_mesh->mMaterialIndex = GetDefaultMaterial();
}
else {
ConvertMaterialForMesh(out_mesh,model,mesh,mindices[0]);
}
return static_cast<unsigned int>(meshes.size()); return static_cast<unsigned int>(meshes.size());
} }
@ -542,7 +548,7 @@ private:
// locate source materials for this mesh // locate source materials for this mesh
const std::vector<const Material*>& mats = model.GetMaterials(); const std::vector<const Material*>& mats = model.GetMaterials();
if (materialIndex >= mats.size()) { if (materialIndex >= mats.size()) {
FBXImporter::LogError("material index out of bounds, ignoring"); FBXImporter::LogError("material index out of bounds, setting default material");
out->mMaterialIndex = GetDefaultMaterial(); out->mMaterialIndex = GetDefaultMaterial();
return; return;
} }