From fc7575f5c5a60501fbe1252b7ac7b93207105d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Wed, 22 May 2019 10:23:06 +0200
Subject: [PATCH 1/2] Remove Unix executable bit on code files

---
 code/FIReader.cpp      | 0
 code/glTF2Asset.inl    | 0
 code/glTF2Importer.cpp | 0
 code/glTFImporter.cpp  | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 code/FIReader.cpp
 mode change 100755 => 100644 code/glTF2Asset.inl
 mode change 100755 => 100644 code/glTF2Importer.cpp
 mode change 100755 => 100644 code/glTFImporter.cpp

diff --git a/code/FIReader.cpp b/code/FIReader.cpp
old mode 100755
new mode 100644
diff --git a/code/glTF2Asset.inl b/code/glTF2Asset.inl
old mode 100755
new mode 100644
diff --git a/code/glTF2Importer.cpp b/code/glTF2Importer.cpp
old mode 100755
new mode 100644
diff --git a/code/glTFImporter.cpp b/code/glTFImporter.cpp
old mode 100755
new mode 100644

From 5679dd435ab06925595f7b1d7e09308853a0bf0f Mon Sep 17 00:00:00 2001
From: Arkeon <arkeon.work@gmail.com>
Date: Fri, 7 Jun 2019 09:49:24 +0200
Subject: [PATCH 2/2] Prevent crash when Ogre skeleton file is missing

---
 code/OgreBinarySerializer.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/OgreBinarySerializer.cpp b/code/OgreBinarySerializer.cpp
index b2326e244..589e69c7e 100644
--- a/code/OgreBinarySerializer.cpp
+++ b/code/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);