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/Common/SceneCombiner.cpp | |
| parent | 9d8a9ea826ac733e7076d567ef2a6b5200de68c4 (diff) | |
| download | redot-engine-78b22393a8dd182ee56d0448ed77ba4430de5e75.tar.gz | |
assimp: Sync with upstream 0201fc5
Diffstat (limited to 'thirdparty/assimp/code/Common/SceneCombiner.cpp')
| -rw-r--r-- | thirdparty/assimp/code/Common/SceneCombiner.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/thirdparty/assimp/code/Common/SceneCombiner.cpp b/thirdparty/assimp/code/Common/SceneCombiner.cpp index f7b13cc951..29b6082a87 100644 --- a/thirdparty/assimp/code/Common/SceneCombiner.cpp +++ b/thirdparty/assimp/code/Common/SceneCombiner.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. @@ -1312,7 +1312,6 @@ void SceneCombiner::Copy(aiMetadata** _dest, const aiMetadata* src) { aiMetadata* dest = *_dest = aiMetadata::Alloc( src->mNumProperties ); std::copy(src->mKeys, src->mKeys + src->mNumProperties, dest->mKeys); - dest->mValues = new aiMetadataEntry[src->mNumProperties]; for (unsigned int i = 0; i < src->mNumProperties; ++i) { aiMetadataEntry& in = src->mValues[i]; aiMetadataEntry& out = dest->mValues[i]; |