Merge pull request #4707 from Gargaj/patch-1
fix vertices being joined duplicating weightspull/4702/head
commit
fd6c534efc
|
@ -390,6 +390,16 @@ int JoinVerticesProcess::ProcessMesh( aiMesh* pMesh, unsigned int meshIndex) {
|
||||||
const aiVertexWeight& ow = bone->mWeights[ b ];
|
const aiVertexWeight& ow = bone->mWeights[ b ];
|
||||||
// if the vertex is a unique one, translate it
|
// if the vertex is a unique one, translate it
|
||||||
if ( !( replaceIndex[ ow.mVertexId ] & 0x80000000 ) ) {
|
if ( !( replaceIndex[ ow.mVertexId ] & 0x80000000 ) ) {
|
||||||
|
bool weightAlreadyExists = false;
|
||||||
|
for (std::vector<aiVertexWeight>::iterator vit = newWeights.begin(); vit != newWeights.end(); ++vit) {
|
||||||
|
if (vit->mVertexId == replaceIndex[ow.mVertexId]) {
|
||||||
|
weightAlreadyExists = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (weightAlreadyExists) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
aiVertexWeight nw;
|
aiVertexWeight nw;
|
||||||
nw.mVertexId = replaceIndex[ ow.mVertexId ];
|
nw.mVertexId = replaceIndex[ ow.mVertexId ];
|
||||||
nw.mWeight = ow.mWeight;
|
nw.mWeight = ow.mWeight;
|
||||||
|
|
Loading…
Reference in New Issue