diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-06 14:42:31 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-06 14:43:31 +0100 |
commit | 78b22393a8dd182ee56d0448ed77ba4430de5e75 (patch) | |
tree | b117ded652a479692041ba5cafba15cfc2a754b5 /thirdparty/assimp/code/PostProcessing/EmbedTexturesProcess.cpp | |
parent | 9d8a9ea826ac733e7076d567ef2a6b5200de68c4 (diff) | |
download | redot-engine-78b22393a8dd182ee56d0448ed77ba4430de5e75.tar.gz |
assimp: Sync with upstream 0201fc5
Diffstat (limited to 'thirdparty/assimp/code/PostProcessing/EmbedTexturesProcess.cpp')
-rw-r--r-- | thirdparty/assimp/code/PostProcessing/EmbedTexturesProcess.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/thirdparty/assimp/code/PostProcessing/EmbedTexturesProcess.cpp b/thirdparty/assimp/code/PostProcessing/EmbedTexturesProcess.cpp index 739382a057..b187acf53c 100644 --- a/thirdparty/assimp/code/PostProcessing/EmbedTexturesProcess.cpp +++ b/thirdparty/assimp/code/PostProcessing/EmbedTexturesProcess.cpp @@ -2,7 +2,7 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2019, assimp team +Copyright (c) 2006-2020, assimp team All rights reserved. @@ -128,7 +128,8 @@ bool EmbedTexturesProcess::addTexture(aiScene* pScene, std::string path) const { auto oldTextures = pScene->mTextures; pScene->mTextures = new aiTexture*[pScene->mNumTextures]; ::memmove(pScene->mTextures, oldTextures, sizeof(aiTexture*) * (pScene->mNumTextures - 1u)); - + delete [] oldTextures; + // Add the new texture auto pTexture = new aiTexture; pTexture->mHeight = 0; // Means that this is still compressed |