From f1e81c34a323ed992773861e0459b3514968a103 Mon Sep 17 00:00:00 2001
From: trent <trent@joy-machine.com>
Date: Fri, 17 Mar 2017 14:34:17 -0400
Subject: [PATCH] Fixed the texture assignment for the OBJ loader (it wasn't
 doing anything with the spceular texture)

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

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 73cf7a520e..2660ecede5 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -267,7 +267,7 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
             }
             if (token == "map_Kd") {
                 currentMaterial.diffuseTextureFilename = filename;
-            } else {
+            } else if( token == "map_Ks" ) {
                 currentMaterial.specularTextureFilename = filename;
             }
         }
@@ -611,6 +611,9 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
         if (!objMaterial.diffuseTextureFilename.isEmpty()) {
             fbxMaterial.albedoTexture.filename = objMaterial.diffuseTextureFilename;
         }
+		if (!objMaterial.specularTextureFilename.isEmpty()) {
+			fbxMaterial.specularTexture.filename = objMaterial.specularTextureFilename;
+		}
 
         modelMaterial->setEmissive(fbxMaterial.emissiveColor);
         modelMaterial->setAlbedo(fbxMaterial.diffuseColor);