From 2d309028133adaf845a168fe43c69d7a66928300 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Wed, 14 Nov 2018 09:11:56 -0800
Subject: [PATCH] Fix OBJBaker not setting combineParts

---
 libraries/baking/src/OBJBaker.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/baking/src/OBJBaker.cpp b/libraries/baking/src/OBJBaker.cpp
index ae29a82c28..5a1239f88f 100644
--- a/libraries/baking/src/OBJBaker.cpp
+++ b/libraries/baking/src/OBJBaker.cpp
@@ -143,9 +143,10 @@ void OBJBaker::bakeOBJ() {
 
     QByteArray objData = objFile.readAll();
 
-    bool combineParts = true; // set true so that OBJSerializer reads material info from material library
     OBJSerializer serializer;
-    auto geometry = serializer.read(objData, QVariantHash(), _modelURL);
+    QVariantHash mapping;
+    mapping["combineParts"] = true; // set true so that OBJSerializer reads material info from material library
+    auto geometry = serializer.read(objData, mapping, _modelURL);
 
     // Write OBJ Data as FBX tree nodes
     createFBXNodeTree(_rootNode, *geometry);