瀏覽代碼

Merge branch 'master' into kimkulling-patch-3

Kim Kulling 6 年之前
父節點
當前提交
6fc42cb898
共有 1 個文件被更改,包括 2 次插入0 次删除
  1. 2 0
      code/OgreBinarySerializer.cpp

+ 2 - 0
code/OgreBinarySerializer.cpp

@@ -864,6 +864,8 @@ bool OgreBinarySerializer::ImportSkeleton(Assimp::IOSystem *pIOHandler, Mesh *me
     }
     }
 
 
     MemoryStreamReaderPtr reader = OpenReader(pIOHandler, mesh->skeletonRef);
     MemoryStreamReaderPtr reader = OpenReader(pIOHandler, mesh->skeletonRef);
+    if (!reader)
+      return false;
 
 
     Skeleton *skeleton = new Skeleton();
     Skeleton *skeleton = new Skeleton();
     OgreBinarySerializer serializer(reader.get(), OgreBinarySerializer::AM_Skeleton);
     OgreBinarySerializer serializer(reader.get(), OgreBinarySerializer::AM_Skeleton);