Skip to content

Commit

Permalink
Fixed build warnings on MSVC14 x64 in the MS3D format sources.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jared Mulconry committed Nov 19, 2016
1 parent 923b014 commit 2946a73
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/MS3DLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ void MS3DImporter::InternReadFile( const std::string& pFile,
for (unsigned int i = 0; i < groups.size(); ++i) {
TempGroup& g = groups[i];
if (g.mat == UINT_MAX) {
g.mat = materials.size()-1;
g.mat = static_cast<unsigned int>(materials.size()-1);
}
}
}
Expand Down Expand Up @@ -483,7 +483,7 @@ void MS3DImporter::InternReadFile( const std::string& pFile,
m->mMaterialIndex = g.mat;
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;

// storage for vertices - verbose format, as requested by the postprocessing pipeline
Expand Down

0 comments on commit 2946a73

Please sign in to comment.