diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-06 16:01:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-06 16:01:33 +0100 |
| commit | 62afc3c12c2acfbd5f9bbaf93f86111e4d2f3ce0 (patch) | |
| tree | 501c31a479e01cdca37377404ca728f36a0232d2 /thirdparty/assimp/code/PostProcessing/EmbedTexturesProcess.cpp | |
| parent | 54fa07e7f01b21bc69309172b439bc05db571977 (diff) | |
| parent | 78b22393a8dd182ee56d0448ed77ba4430de5e75 (diff) | |
| download | redot-engine-62afc3c12c2acfbd5f9bbaf93f86111e4d2f3ce0.tar.gz | |
Merge pull request #36852 from akien-mga/assimp-unbundle
assimp: Clean and document buildsystem, update to 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 |