From c6131ce38ada7dd1d74b693e3979cb04a83d0df2 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kim.kulling@googlemail.com>
Date: Wed, 29 Apr 2020 20:43:23 +0200
Subject: [PATCH] scenecombiner: fix leak.

---
 code/Common/SceneCombiner.cpp | 5 +----
 include/assimp/mesh.h         | 5 ++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/Common/SceneCombiner.cpp b/code/Common/SceneCombiner.cpp
index 62efe2ece..4d2a411f2 100644
--- a/code/Common/SceneCombiner.cpp
+++ b/code/Common/SceneCombiner.cpp
@@ -979,7 +979,7 @@ void GetArrayCopy(Type*& dest, ai_uint num ) {
 
     dest = new Type[num];
     ::memcpy(dest, old, sizeof(Type) * num);
-    }
+}
 
 // ------------------------------------------------------------------------------------------------
 void SceneCombiner::CopySceneFlat(aiScene** _dest,const aiScene* src) {
@@ -1269,9 +1269,6 @@ void SceneCombiner::Copy(aiBone** _dest, const aiBone* src) {
 
     // get a flat copy
     *dest = *src;
-
-    // and reallocate all arrays
-    GetArrayCopy( dest->mWeights, dest->mNumWeights );
 }
 
 // ------------------------------------------------------------------------------------------------
diff --git a/include/assimp/mesh.h b/include/assimp/mesh.h
index bd987bc88..4b5af97ce 100644
--- a/include/assimp/mesh.h
+++ b/include/assimp/mesh.h
@@ -308,7 +308,10 @@ struct aiBone {
 
     //! Copy constructor
     aiBone(const aiBone &other) :
-            mName(other.mName), mNumWeights(other.mNumWeights), mWeights(nullptr), mOffsetMatrix(other.mOffsetMatrix) {
+            mName(other.mName),
+            mNumWeights(other.mNumWeights),
+            mWeights(nullptr),
+            mOffsetMatrix(other.mOffsetMatrix) {
         if (other.mWeights && other.mNumWeights) {
             mWeights = new aiVertexWeight[mNumWeights];
             ::memcpy(mWeights, other.mWeights, mNumWeights * sizeof(aiVertexWeight));