v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3788 from BaldricS/SceneCombiner_Memory_Leaks 

Fix: Removing double delete of texture items after MergeScene.
pull/3826/head^2
Kim Kulling 2021-05-01 11:07:34 +02:00 committed by GitHub
parent d28e2e0a39 7843b24e03
commit f538b96e82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/Common/SceneCombiner.cpp
View File

@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// possible as new fields are added to assimp structures. // possible as new fields are added to assimp structures.
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
/** /**
* @file Implements Assimp::SceneCombiner. This is a smart utility * @file Implements Assimp::SceneCombiner. This is a smart utility
* class that combines multiple scenes, meshes, ... into one. Currently * class that combines multiple scenes, meshes, ... into one. Currently
* these utilities are used by the IRR and LWS loaders and the * these utilities are used by the IRR and LWS loaders and the
@ -359,7 +359,7 @@ void SceneCombiner::MergeScenes(aiScene **_dest, aiScene *master, std::vector<At
// generate the output texture list + an offset table for all texture indices // generate the output texture list + an offset table for all texture indices
if (dest->mNumTextures) { if (dest->mNumTextures) {
aiTexture **pip = dest->mTextures = new aiTexture *[dest->mNumMaterials]; aiTexture **pip = dest->mTextures = new aiTexture *[dest->mNumTextures];
cnt = 0; cnt = 0;
for (unsigned int n = 0; n < src.size(); ++n) { for (unsigned int n = 0; n < src.size(); ++n) {
SceneHelper *cur = &src[n]; SceneHelper *cur = &src[n];
@ -638,6 +638,8 @@ void SceneCombiner::MergeScenes(aiScene **_dest, aiScene *master, std::vector<At
deleteMe->mMaterials = nullptr; deleteMe->mMaterials = nullptr;
delete[] deleteMe->mAnimations; delete[] deleteMe->mAnimations;
deleteMe->mAnimations = nullptr; deleteMe->mAnimations = nullptr;
delete[] deleteMe->mTextures;
deleteMe->mTextures = nullptr;
deleteMe->mRootNode = nullptr; deleteMe->mRootNode = nullptr;