From b945d9c4cb92b80a78846108444556c35d57bb4f Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Sat, 18 Mar 2017 14:34:19 -0700
Subject: [PATCH] fix a bug that caused obj models with no material to randomly
 use the materials of other things in the view

---
 libraries/fbx/src/OBJReader.cpp | 5 +++--
 libraries/fbx/src/OBJReader.h   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 73cf7a520e..0cb932b375 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -546,6 +546,7 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
     QString queryPart = _url.query();
     bool suppressMaterialsHack = queryPart.contains("hifiusemat"); // If this appears in query string, don't fetch mtl even if used.
     OBJMaterial& preDefinedMaterial = materials[SMART_DEFAULT_MATERIAL_NAME];
+    preDefinedMaterial.used = true;
     if (suppressMaterialsHack) {
         needsMaterialLibrary = preDefinedMaterial.userSpecifiesUV = false; // I said it was a hack...
     }
@@ -594,8 +595,8 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
     }
 
     foreach (QString materialID, materials.keys()) {
-       OBJMaterial& objMaterial = materials[materialID];
-       if (!objMaterial.used) {
+        OBJMaterial& objMaterial = materials[materialID];
+        if (!objMaterial.used) {
             continue;
         }
         geometry.materials[materialID] = FBXMaterial(objMaterial.diffuseColor,
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index 200f11548d..b4a48c570e 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -58,7 +58,7 @@ public:
     QByteArray specularTextureFilename;
     bool used { false };
     bool userSpecifiesUV { false };
-    OBJMaterial() : shininess(96.0f), opacity(1.0f), diffuseColor(1.0f), specularColor(1.0f) {}
+    OBJMaterial() : shininess(0.0f), opacity(1.0f), diffuseColor(0.9f), specularColor(0.9f) {}
 };
 
 class OBJReader: public QObject { // QObject so we can make network requests.