From 4f06c41802ff2dfadbeef9890eebf54433499d94 Mon Sep 17 00:00:00 2001 From: Onur Berk Tore Date: Tue, 21 Jun 2022 00:09:20 +0300 Subject: [PATCH] Fix: Collada header updated --- code/AssetLib/Collada/ColladaLoader.cpp | 3 --- code/AssetLib/Collada/ColladaLoader.h | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/code/AssetLib/Collada/ColladaLoader.cpp b/code/AssetLib/Collada/ColladaLoader.cpp index 327319283..fdc9c1c8f 100644 --- a/code/AssetLib/Collada/ColladaLoader.cpp +++ b/code/AssetLib/Collada/ColladaLoader.cpp @@ -804,7 +804,6 @@ aiMesh *ColladaLoader::CreateMesh(const ColladaParser &pParser, const Mesh *pSrc continue; } ++numRemainingBones; - } // create bone array and copy bone weights one by one @@ -832,7 +831,6 @@ aiMesh *ColladaLoader::CreateMesh(const ColladaParser &pParser, const Mesh *pSrc bone->mOffsetMatrix.c2 = ReadFloat(jointMatrixAcc, jointMatrices, a, 9); bone->mOffsetMatrix.c3 = ReadFloat(jointMatrixAcc, jointMatrices, a, 10); bone->mOffsetMatrix.c4 = ReadFloat(jointMatrixAcc, jointMatrices, a, 11); - bone->mNumWeights = static_cast(dstBones[a].size()); bone->mWeights = new aiVertexWeight[bone->mNumWeights]; std::copy(dstBones[a].begin(), dstBones[a].end(), bone->mWeights); @@ -1831,4 +1829,3 @@ std::string ColladaLoader::FindNameForNode(const Node *pNode) { } // Namespace Assimp #endif // !! ASSIMP_BUILD_NO_DAE_IMPORTER - diff --git a/code/AssetLib/Collada/ColladaLoader.h b/code/AssetLib/Collada/ColladaLoader.h index 246abed22..870c12a5a 100644 --- a/code/AssetLib/Collada/ColladaLoader.h +++ b/code/AssetLib/Collada/ColladaLoader.h @@ -237,6 +237,7 @@ protected: std::vector mAnims; bool noSkeletonMesh; + bool removeEmptyBones; bool ignoreUpDirection; bool useColladaName;