Merge branch 'master' into PLYcomments#4866

2023-02-01 13:05:55 -05:00
parent 527d110917 b55e29b915
commit feb3e9ff7a
4 changed files with 11 additions and 11 deletions
@@ -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;
 }