Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for 64 bit builds

Browse Source 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@51 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2008-06-01 12:46:17 +00:00
parent 69ed883ae0
commit 66e69ef6b2
25 changed files with 1546 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/JoinVerticesProcess.cpp
View File

@@ -211,14 +211,14 @@ bool JoinVerticesProcess::ProcessMesh( aiMesh* pMesh)
} else
{
// no unique vertex matches it upto now -> so add it
replaceIndex[a] = uniqueVertices.size();
replaceIndex[a] = (unsigned int)uniqueVertices.size();
uniqueVertices.push_back( v);
isVertexUnique[a] = true;
}
}
// replace vertex data with the unique data sets
pMesh->mNumVertices = uniqueVertices.size();
pMesh->mNumVertices = (unsigned int)uniqueVertices.size();
// Position
delete [] pMesh->mVertices;
pMesh->mVertices = new aiVector3D[pMesh->mNumVertices];
@@ -307,7 +307,7 @@ bool JoinVerticesProcess::ProcessMesh( aiMesh* pMesh)
// kill the old and replace them with the translated weights
delete [] bone->mWeights;
bone->mNumWeights = newWeights.size();
bone->mNumWeights = (unsigned int)newWeights.size();
bone->mWeights = new aiVertexWeight[bone->mNumWeights];
memcpy( bone->mWeights, &newWeights[0], bone->mNumWeights * sizeof( aiVertexWeight));
}