Browse Source

Merge branch 'master' into reorg

Kim Kulling 6 years ago
parent
commit
f76d77955d
2 changed files with 2 additions and 0 deletions
  1. 2 0
      code/Ogre/OgreBinarySerializer.cpp
  2. 0 0
      code/X3D/FIReader.cpp

+ 2 - 0
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);

+ 0 - 0
code/X3D/FIReader.cpp