Merge branch 'master' into reorg

pull/2506/head
Kim Kulling 2019-06-11 00:22:50 +02:00
commit f76d77955d
5 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);

0
code/X3D/FIReader.cpp 100755 → 100644
View File

0
code/glTF/glTFImporter.cpp 100755 → 100644
View File

0
code/glTF2/glTF2Asset.inl 100755 → 100644
View File

0
code/glTF2/glTF2Importer.cpp 100755 → 100644
View File