From 186a44fab3b41d22b8297bc67951178e624fc657 Mon Sep 17 00:00:00 2001 From: OTHGMars Date: Fri, 29 Mar 2019 04:02:41 -0400 Subject: [PATCH] Fixes a crash from importing shapes with unnamed bones. --- Engine/source/ts/assimp/assimpAppMesh.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Engine/source/ts/assimp/assimpAppMesh.cpp b/Engine/source/ts/assimp/assimpAppMesh.cpp index 82306eeb2..8246dad42 100644 --- a/Engine/source/ts/assimp/assimpAppMesh.cpp +++ b/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);