From 3280894e29c77e778fc9efd85a1917b3fdabc0e3 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Tue, 15 Dec 2015 19:26:39 -0800
Subject: [PATCH] Load texture by convention with .obj

---
 libraries/fbx/src/OBJReader.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 835bb1a9b6..11164afbbb 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -217,7 +217,6 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
             materials[matName] = currentMaterial;
             matName = tokenizer.getDatum();
             currentMaterial = materials[matName];
-            currentMaterial.diffuseTextureFilename = "test";
             #ifdef WANT_DEBUG
             qCDebug(modelformat) << "OBJ Reader Starting new material definition " << matName;
             #endif
@@ -461,6 +460,9 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
             }
 
             if (!textName.isEmpty()) {
+                #ifdef WANT_DEBUG
+                qCDebug(modelformat) << "OBJ Reader found a default texture: " << textName;
+                #endif
                 preDefinedMaterial.diffuseTextureFilename = textName;
             }
             materials[SMART_DEFAULT_MATERIAL_NAME] = preDefinedMaterial;
@@ -553,9 +555,7 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
         model::MaterialPointer modelMaterial = fbxMaterial._material;
 
         if (!objMaterial.diffuseTextureFilename.isEmpty()) {
-            FBXTexture texture;
-            QUrl url = _url.resolved(QUrl(objMaterial.diffuseTextureFilename));
-            // TODO -- something to get textures working again
+            fbxMaterial.diffuseTexture.filename = objMaterial.diffuseTextureFilename;
         }
 
         modelMaterial->setEmissive(fbxMaterial.emissiveColor);