Merge branch 'master' into reorg
commit
f76d77955d
|
@ -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);
|
||||||
|
|
Loading…
Reference in New Issue