summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/assimp/code/MakeVerboseFormat.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/assimp/code/MakeVerboseFormat.cpp')
-rw-r--r--src/3rdparty/assimp/code/MakeVerboseFormat.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/3rdparty/assimp/code/MakeVerboseFormat.cpp b/src/3rdparty/assimp/code/MakeVerboseFormat.cpp
index d51642cf6..720d44519 100644
--- a/src/3rdparty/assimp/code/MakeVerboseFormat.cpp
+++ b/src/3rdparty/assimp/code/MakeVerboseFormat.cpp
@@ -3,7 +3,8 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
@@ -168,20 +169,22 @@ bool MakeVerboseFormatProcess::MakeVerboseFormat(aiMesh* pcMesh)
}
}
+
+
// build output vertex weights
for (unsigned int i = 0;i < pcMesh->mNumBones;++i)
{
- delete pcMesh->mBones[i]->mWeights;
+ delete [] pcMesh->mBones[i]->mWeights;
if (!newWeights[i].empty()) {
pcMesh->mBones[i]->mWeights = new aiVertexWeight[newWeights[i].size()];
aiVertexWeight *weightToCopy = &( newWeights[i][0] );
memcpy(pcMesh->mBones[i]->mWeights, weightToCopy,
sizeof(aiVertexWeight) * newWeights[i].size());
- delete[] newWeights;
} else {
pcMesh->mBones[i]->mWeights = NULL;
}
}
+ delete[] newWeights;
// delete the old members
delete[] pcMesh->mVertices;
@@ -190,14 +193,14 @@ bool MakeVerboseFormatProcess::MakeVerboseFormat(aiMesh* pcMesh)
p = 0;
while (pcMesh->HasTextureCoords(p))
{
- delete pcMesh->mTextureCoords[p];
+ delete[] pcMesh->mTextureCoords[p];
pcMesh->mTextureCoords[p] = apvTextureCoords[p];
++p;
}
p = 0;
while (pcMesh->HasVertexColors(p))
{
- delete pcMesh->mColors[p];
+ delete[] pcMesh->mColors[p];
pcMesh->mColors[p] = apvColorSets[p];
++p;
}