Merge branch 'master' into reorg

2019-06-11 00:22:50 +02:00
parent 2da3a38d60 56d145e26a
commit f76d77955d
5 changed files with 2 additions and 0 deletions
--- a/code/Ogre/OgreBinarySerializer.cpp
+++ b/code/Ogre/OgreBinarySerializer.cpp
@@ -864,6 +864,8 @@ bool OgreBinarySerializer::ImportSkeleton(Assimp::IOSystem *pIOHandler, Mesh *me
    }

    MemoryStreamReaderPtr reader = OpenReader(pIOHandler, mesh->skeletonRef);
+    if (!reader)
+      return false;

    Skeleton *skeleton = new Skeleton();
    OgreBinarySerializer serializer(reader.get(), OgreBinarySerializer::AM_Skeleton);
--- a/code/X3D/FIReader.cpp
+++ b/code/X3D/FIReader.cpp
--- a/code/glTF/glTFImporter.cpp
+++ b/code/glTF/glTFImporter.cpp
--- a/code/glTF2/glTF2Asset.inl
+++ b/code/glTF2/glTF2Asset.inl
--- a/code/glTF2/glTF2Importer.cpp
+++ b/code/glTF2/glTF2Importer.cpp