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

Fixed build warnings on MSVC14 x64 in the MS3D format sources.

pull/1083/head
Jared Mulconry 2016-11-20 02:40:36 +11:00
parent 923b014472
commit 2946a7349b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/MS3DLoader.cpp
View File

@ -423,7 +423,7 @@ void MS3DImporter::InternReadFile( const std::string& pFile,
for (unsigned int i = 0; i < groups.size(); ++i) { for (unsigned int i = 0; i < groups.size(); ++i) {
TempGroup& g = groups[i]; TempGroup& g = groups[i];
if (g.mat == UINT_MAX) { if (g.mat == UINT_MAX) {
g.mat = materials.size()-1; g.mat = static_cast<unsigned int>(materials.size()-1);
} }
} }
} }
@ -483,7 +483,7 @@ void MS3DImporter::InternReadFile( const std::string& pFile,
m->mMaterialIndex = g.mat; m->mMaterialIndex = g.mat;
m->mPrimitiveTypes = aiPrimitiveType_TRIANGLE; m->mPrimitiveTypes = aiPrimitiveType_TRIANGLE;
m->mFaces = new aiFace[m->mNumFaces = g.triangles.size()]; m->mFaces = new aiFace[m->mNumFaces = static_cast<unsigned int>(g.triangles.size())];
m->mNumVertices = m->mNumFaces*3; m->mNumVertices = m->mNumFaces*3;
// storage for vertices - verbose format, as requested by the postprocessing pipeline // storage for vertices - verbose format, as requested by the postprocessing pipeline