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

Merge branch 'master' into explicitly-default-dtors

Browse Source
This commit is contained in:
Kim Kulling
2022-08-30 22:21:06 +02:00
committed by GitHub
parent e93fa6699a 2c3538fc46
commit f527e56f22
12 changed files with 795 additions and 581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/PostProcessing/JoinVerticesProcess.cpp
View File

@@ -341,8 +341,7 @@ int JoinVerticesProcess::ProcessMesh( aiMesh* pMesh, unsigned int meshIndex) {
uniqueVertices.push_back(v);
if (hasAnimMeshes) {
for (unsigned int animMeshIndex = 0; animMeshIndex < pMesh->mNumAnimMeshes; animMeshIndex++) {
Vertex aniMeshVertex(pMesh->mAnimMeshes[animMeshIndex], a);
uniqueAnimatedVertices[animMeshIndex].push_back(v);
uniqueAnimatedVertices[animMeshIndex].emplace_back(pMesh->mAnimMeshes[animMeshIndex], a);
}
}
} else{