size_t is not the same as unsigned int on some systems
parent
f92a34e0b7
commit
69fc809307
|
@ -559,7 +559,7 @@ void ColladaLoader::BuildMeshesForNode(const ColladaParser &pParser, const Colla
|
||||||
// assign the material index
|
// assign the material index
|
||||||
std::map<std::string, size_t>::const_iterator matIt = mMaterialIndexByName.find(submesh.mMaterial);
|
std::map<std::string, size_t>::const_iterator matIt = mMaterialIndexByName.find(submesh.mMaterial);
|
||||||
if (matIt != mMaterialIndexByName.end()) {
|
if (matIt != mMaterialIndexByName.end()) {
|
||||||
dstMesh->mMaterialIndex = matIt->second;
|
dstMesh->mMaterialIndex = static_cast<unsigned int>(matIt->second);
|
||||||
} else {
|
} else {
|
||||||
dstMesh->mMaterialIndex = matIdx;
|
dstMesh->mMaterialIndex = matIdx;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue