Merge branch 'master' into kimkulling-patch-3

pull/2254/head
Kim Kulling 2019-06-10 00:39:05 +02:00 committed by GitHub
commit 6fc42cb898
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions

View File

@ -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);