From bd57cc7b1499c0541fa057f649a6fec057503ce4 Mon Sep 17 00:00:00 2001
From: Sam Gateau <sam@highfidelity.io>
Date: Thu, 17 Oct 2019 15:56:41 -0700
Subject: [PATCH] Fixing bad indexing

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

diff --git a/libraries/fbx/src/OBJSerializer.cpp b/libraries/fbx/src/OBJSerializer.cpp
index 0c795d3a94..8384a3e4b8 100644
--- a/libraries/fbx/src/OBJSerializer.cpp
+++ b/libraries/fbx/src/OBJSerializer.cpp
@@ -899,6 +899,10 @@ HFMModel::Pointer OBJSerializer::read(const hifi::ByteArray& data, const hifi::V
         if (!objMaterial.used) {
             continue;
         }
+        qCDebug(modelformat) << "OBJSerializer Material Name:" << materialID;
+
+        // capture the name to index map
+        materialNameToIndex[materialID] = hfmModel.materials.size();
 
         hfmModel.materials.emplace_back(objMaterial.diffuseColor,
             objMaterial.specularColor,
@@ -906,7 +910,6 @@ HFMModel::Pointer OBJSerializer::read(const hifi::ByteArray& data, const hifi::V
             objMaterial.shininess,
             objMaterial.opacity);
         HFMMaterial& hfmMaterial = hfmModel.materials.back();
-        materialNameToIndex[materialID] = hfmModel.materials.size();
 
         hfmMaterial.name = materialID;
         hfmMaterial.materialID = materialID;