From f81e28f3201289f51fbeb72ef5ea15e64ea33a53 Mon Sep 17 00:00:00 2001 From: Jared Mulconry Date: Sun, 20 Nov 2016 13:06:50 +1100 Subject: [PATCH] Fixed build warnings on MSVC14 x64 in the pre-transform vertices post-process. --- code/PretransformVertices.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/PretransformVertices.cpp b/code/PretransformVertices.cpp index 90a58e321..bcb3913c3 100644 --- a/code/PretransformVertices.cpp +++ b/code/PretransformVertices.cpp @@ -397,7 +397,7 @@ void PretransformVertices::BuildWCSMeshes(std::vector& out, aiMesh** in out.push_back(ntz); - node->mMeshes[i] = numIn + out.size() - 1; + node->mMeshes[i] = static_cast(numIn + out.size() - 1); } } } @@ -483,7 +483,7 @@ void PretransformVertices::Execute( aiScene* pScene) memcpy(npp,pScene->mMeshes,sizeof(aiMesh*)*pScene->mNumMeshes); memcpy(npp+pScene->mNumMeshes,&apcOutMeshes[0],sizeof(aiMesh*)*apcOutMeshes.size()); - pScene->mNumMeshes += apcOutMeshes.size(); + pScene->mNumMeshes += static_cast(apcOutMeshes.size()); delete[] pScene->mMeshes; pScene->mMeshes = npp; }