2
0
Эх сурвалжийг харах

Merge pull request #4880 from krishty/fix-build-without-armaturepopulate-post-process

Fix Build Without ArmaturePopulate Post Process Step
Kim Kulling 2 жил өмнө
parent
commit
d2d8b84f83

+ 2 - 0
code/AssetLib/FBX/FBXConverter.cpp

@@ -1455,7 +1455,9 @@ static void copyBoneToSkeletonBone(aiMesh *mesh, aiBone *bone, aiSkeletonBone *s
     skeletonBone->mWeights = bone->mWeights;
     skeletonBone->mOffsetMatrix = bone->mOffsetMatrix;
     skeletonBone->mMeshId = mesh;
+#ifndef ASSIMP_BUILD_NO_ARMATUREPOPULATE_PROCESS
     skeletonBone->mNode = bone->mNode;
+#endif
     skeletonBone->mParent = -1;
 }
 

+ 2 - 0
include/assimp/mesh.h

@@ -995,8 +995,10 @@ struct aiSkeletonBone {
 #ifdef __cplusplus
     aiSkeletonBone() :
             mParent(-1),
+#ifndef ASSIMP_BUILD_NO_ARMATUREPOPULATE_PROCESS
             mArmature(nullptr),
             mNode(nullptr),
+#endif
             mNumnWeights(0),
             mMeshId(nullptr),
             mWeights(nullptr),