Browse Source

Fixes a crash from importing shapes with unnamed bones.

OTHGMars 6 years ago
parent
commit
d8bfe6073f
1 changed files with 4 additions and 1 deletions
  1. 4 1
      Engine/source/ts/assimp/assimpAppMesh.cpp

+ 4 - 1
Engine/source/ts/assimp/assimpAppMesh.cpp

@@ -201,7 +201,10 @@ void AssimpAppMesh::lockMesh(F32 t, const MatrixF& objOffset)
    {
       String name = mMeshData->mBones[b]->mName.C_Str();
       aiNode* nodePtr = AssimpAppNode::findChildNodeByName(mMeshData->mBones[b]->mName.C_Str(), appNode->mScene->mRootNode);
-      bones[b] = new AssimpAppNode(appNode->mScene, nodePtr);
+      if (!nodePtr)
+         bones[b] = new AssimpAppNode(appNode->mScene, appNode->mNode);
+      else
+         bones[b] = new AssimpAppNode(appNode->mScene, nodePtr);
 
       MatrixF boneTransform;
       AssimpAppNode::assimpToTorqueMat(mMeshData->mBones[b]->mOffsetMatrix, boneTransform);