浏览代码

Replace crash in assimp with assertion

rdb 10 年之前
父节点
当前提交
ad238ad995
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      pandatool/src/assimp/assimpLoader.cxx

+ 4 - 1
pandatool/src/assimp/assimpLoader.cxx

@@ -560,7 +560,10 @@ load_mesh(size_t index) {
   if (character) {
     for (size_t i = 0; i < mesh.mNumBones; ++i) {
       const aiBone &bone = *mesh.mBones[i];
-      CPT(JointVertexTransform) jvt = new JointVertexTransform(character->find_joint(bone.mName.C_Str()));
+      CharacterJoint *joint = character->find_joint(bone.mName.C_Str());
+      nassertd(joint != NULL) continue;
+
+      CPT(JointVertexTransform) jvt = new JointVertexTransform(joint);
 
       for (size_t j = 0; j < bone.mNumWeights; ++j) {
           const aiVertexWeight &weight = bone.mWeights[j];