Merge branch 'master' into step-import

2018-10-09 17:35:44 +02:00
parent f26019aa8a c3e6a01397
commit b340c5f2e8
6 changed files with 139 additions and 192 deletions
--- a/code/ObjFileImporter.cpp
+++ b/code/ObjFileImporter.cpp
@@ -251,7 +251,7 @@ void ObjFileImporter::CreateDataFromImport(const ObjFile::Model* pModel, aiScene

 		std::unique_ptr<aiMesh> 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];