From 242001a589e726a523d3f17944a72f93b754ffbd Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard.stearns@gmail.com>
Date: Wed, 29 Apr 2015 22:17:44 -0700
Subject: [PATCH] Restore some very odd modularity used by VHACDUtil.

---
 libraries/fbx/src/OBJReader.h      | 4 ++++
 tools/vhacd-util/src/VHACDUtil.cpp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index 6a798c9a50..1734518493 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -56,3 +56,7 @@ public:
     void fbxDebugDump(const FBXGeometry& fbxgeo);
     bool parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, FBXGeometry& geometry, float& scaleGuess);
 };
+
+// What are these utilities doing here? Apparently used by fbx loading code in VHACD Utils.
+void setMeshPartDefaults(FBXMeshPart &meshPart, QString materialID);
+void fbxDebugDump(const FBXGeometry& fbxgeo);
\ No newline at end of file
diff --git a/tools/vhacd-util/src/VHACDUtil.cpp b/tools/vhacd-util/src/VHACDUtil.cpp
index 92ae62db13..c24d6dc8f2 100644
--- a/tools/vhacd-util/src/VHACDUtil.cpp
+++ b/tools/vhacd-util/src/VHACDUtil.cpp
@@ -36,7 +36,7 @@ bool vhacd::VHACDUtil::loadFBX(const QString filename, FBXGeometry& result) {
     QByteArray fbxContents = fbx.readAll();
 
     if (filename.toLower().endsWith(".obj")) {
-        result = readOBJ(fbxContents, QVariantHash());
+        result = OBJReader().readOBJ(fbxContents, QVariantHash());
     } else if (filename.toLower().endsWith(".fbx")) {
         result = readFBX(fbxContents, QVariantHash());
     } else {