From 2946a7349bf471450b51c29cc2acc383e4df1e5c Mon Sep 17 00:00:00 2001 From: Jared Mulconry Date: Sun, 20 Nov 2016 02:40:36 +1100 Subject: [PATCH] Fixed build warnings on MSVC14 x64 in the MS3D format sources. --- code/MS3DLoader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/MS3DLoader.cpp b/code/MS3DLoader.cpp index ef16a756a..c50ccc46e 100644 --- a/code/MS3DLoader.cpp +++ b/code/MS3DLoader.cpp @@ -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(materials.size()-1); } } } @@ -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(g.triangles.size())]; m->mNumVertices = m->mNumFaces*3; // storage for vertices - verbose format, as requested by the postprocessing pipeline