v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2172 from matt77hias/C4267 

Fix: C4267 conversion warning
pull/2148/head
Kim Kulling 2018-10-08 20:33:17 +02:00 committed by GitHub
parent 65c07613ea 2e443dc669
commit f8d8a43a35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/ObjFileImporter.cpp
View File

@ -251,7 +251,7 @@ void ObjFileImporter::CreateDataFromImport(const ObjFile::Model* pModel, aiScene
std::unique_ptr<aiMesh> mesh( new aiMesh ); std::unique_ptr<aiMesh> mesh( new aiMesh );
mesh->mPrimitiveTypes = aiPrimitiveType_POINT; mesh->mPrimitiveTypes = aiPrimitiveType_POINT;
unsigned int n = pModel->m_Vertices.size(); unsigned int n = (unsigned int)pModel->m_Vertices.size();
mesh->mNumVertices = n; mesh->mNumVertices = n;
mesh->mVertices = new aiVector3D[n]; mesh->mVertices = new aiVector3D[n];

2
code/glTF2Importer.cpp
View File

@ -454,7 +454,7 @@ void glTF2Importer::ImportMeshes(glTF2::Asset& r)
std::vector<Mesh::Primitive::Target>& targets = prim.targets; std::vector<Mesh::Primitive::Target>& targets = prim.targets;
if (targets.size() > 0) { if (targets.size() > 0) {
aim->mNumAnimMeshes = targets.size(); aim->mNumAnimMeshes = (unsigned int)targets.size();
aim->mAnimMeshes = new aiAnimMesh*[aim->mNumAnimMeshes]; aim->mAnimMeshes = new aiAnimMesh*[aim->mNumAnimMeshes];
for (size_t i = 0; i < targets.size(); i++) { for (size_t i = 0; i < targets.size(); i++) {
aim->mAnimMeshes[i] = aiCreateAnimMesh(aim); aim->mAnimMeshes[i] = aiCreateAnimMesh(aim);