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

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

Fix Build Without ArmaturePopulate Post Process Step
pull/4910/head
Kim Kulling 2023-01-31 10:23:44 +01:00 committed by GitHub
parent 77e34eedc0 df28e7830f
commit d2d8b84f83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/AssetLib/FBX/FBXConverter.cpp
View File

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

2
include/assimp/mesh.h
View File

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