From b4425d8e365651c49c17b062b92fb0b533da9e90 Mon Sep 17 00:00:00 2001 From: Matthias Moulin Date: Sat, 6 Oct 2018 16:30:38 +0200 Subject: [PATCH 1/2] Fix: C4267 --- code/ObjFileImporter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ObjFileImporter.cpp b/code/ObjFileImporter.cpp index 93d48ba16..0cb1b6544 100644 --- a/code/ObjFileImporter.cpp +++ b/code/ObjFileImporter.cpp @@ -251,7 +251,7 @@ void ObjFileImporter::CreateDataFromImport(const ObjFile::Model* pModel, aiScene std::unique_ptr mesh( new aiMesh ); mesh->mPrimitiveTypes = aiPrimitiveType_POINT; - unsigned int n = pModel->m_Vertices.size(); + unsigned int n = (unsigned int)pModel->m_Vertices.size(); mesh->mNumVertices = n; mesh->mVertices = new aiVector3D[n]; From c90eda983db4393fa39cc400f2148b8264c2e1fa Mon Sep 17 00:00:00 2001 From: Matthias Moulin Date: Sat, 6 Oct 2018 16:31:58 +0200 Subject: [PATCH 2/2] Fix: C4267 --- code/glTF2Importer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/glTF2Importer.cpp b/code/glTF2Importer.cpp index 740935601..8b13ab20f 100755 --- a/code/glTF2Importer.cpp +++ b/code/glTF2Importer.cpp @@ -454,7 +454,7 @@ void glTF2Importer::ImportMeshes(glTF2::Asset& r) std::vector& targets = prim.targets; if (targets.size() > 0) { - aim->mNumAnimMeshes = targets.size(); + aim->mNumAnimMeshes = (unsigned int)targets.size(); aim->mAnimMeshes = new aiAnimMesh*[aim->mNumAnimMeshes]; for (size_t i = 0; i < targets.size(); i++) { aim->mAnimMeshes[i] = aiCreateAnimMesh(aim);