From 999f198aa33d791d0cb6d8e47a7d64c3ab6ff899 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 30 Nov 2015 15:01:02 -0500
Subject: [PATCH] Updated tinyobjloader and applied the changes

---
 ext/ghoul                                    | 2 +-
 modules/base/rendering/wavefrontgeometry.cpp | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index 6567991e2d..68ec5fef09 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 6567991e2d2f12929c6fec4e10cff28e21595af6
+Subproject commit 68ec5fef095ddc79f1d75057ea3a917816352556
diff --git a/modules/base/rendering/wavefrontgeometry.cpp b/modules/base/rendering/wavefrontgeometry.cpp
index 092a1bae10..39041eda42 100644
--- a/modules/base/rendering/wavefrontgeometry.cpp
+++ b/modules/base/rendering/wavefrontgeometry.cpp
@@ -53,9 +53,10 @@ void WavefrontGeometry::deinitialize() {
 bool WavefrontGeometry::loadModel(const std::string& filename) {
 	std::vector<tinyobj::shape_t> shapes;
 	std::vector<tinyobj::material_t> materials;
-    std::string err = tinyobj::LoadObj(shapes, materials, filename.c_str(), filename.c_str());
+    std::string err;
+    bool success = tinyobj::LoadObj(shapes, materials, err, filename.c_str(), filename.c_str());
 
-    if (!err.empty()) {
+    if (!success) {
         LERROR(err);
         return false;
     }