From 6c553e59237087ba8b03df8d5fc360f44b2e745e Mon Sep 17 00:00:00 2001
From: utkarshgautamnyu <utkarsh.gautam@nyu.edu>
Date: Wed, 25 Oct 2017 19:04:12 -0700
Subject: [PATCH] moved FBXBaker::abort() to ModelBaker::abort()

---
 libraries/baking/src/FBXBaker.cpp   | 18 +++++++++---------
 libraries/baking/src/FBXBaker.h     |  2 +-
 libraries/baking/src/ModelBaker.cpp | 10 ++++++++++
 libraries/baking/src/ModelBaker.h   |  1 +
 libraries/baking/src/OBJBaker.cpp   |  4 ++--
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/libraries/baking/src/FBXBaker.cpp b/libraries/baking/src/FBXBaker.cpp
index 8df9964d0c..a4341fe57c 100644
--- a/libraries/baking/src/FBXBaker.cpp
+++ b/libraries/baking/src/FBXBaker.cpp
@@ -51,15 +51,15 @@ FBXBaker::~FBXBaker() {
     }
 }
 
-void FBXBaker::abort() {
-    Baker::abort();
-
-    // tell our underlying TextureBaker instances to abort
-    // the FBXBaker will wait until all are aborted before emitting its own abort signal
-    for (auto& textureBaker : bakingTextures) {
-        textureBaker->abort();
-    }
-}
+//void FBXBaker::abort() {
+//    Baker::abort();
+//
+//    // tell our underlying TextureBaker instances to abort
+//    // the FBXBaker will wait until all are aborted before emitting its own abort signal
+//    for (auto& textureBaker : bakingTextures) {
+//        textureBaker->abort();
+//    }
+//}
 
 void FBXBaker::bake() {    
     qDebug() << "FBXBaker" << modelURL << "bake starting";
diff --git a/libraries/baking/src/FBXBaker.h b/libraries/baking/src/FBXBaker.h
index 941c86b703..6d6c2aa90a 100644
--- a/libraries/baking/src/FBXBaker.h
+++ b/libraries/baking/src/FBXBaker.h
@@ -42,7 +42,7 @@ public:
 
 public slots:
     virtual void bake() override;
-    virtual void abort() override;
+    //virtual void abort() override;
 
 signals:
     void sourceCopyReadyToLoad();
diff --git a/libraries/baking/src/ModelBaker.cpp b/libraries/baking/src/ModelBaker.cpp
index 9e213d1630..36abce6355 100644
--- a/libraries/baking/src/ModelBaker.cpp
+++ b/libraries/baking/src/ModelBaker.cpp
@@ -41,6 +41,16 @@ ModelBaker::ModelBaker(const QUrl& modelURL, TextureBakerThreadGetter textureThr
 
 void ModelBaker::bake() {}
 
+void ModelBaker::abort() {
+    Baker::abort();
+
+    // tell our underlying TextureBaker instances to abort
+    // the FBXBaker will wait until all are aborted before emitting its own abort signal
+    for (auto& textureBaker : bakingTextures) {
+        textureBaker->abort();
+    }
+}
+
 bool ModelBaker::compressMesh(FBXMesh& mesh, bool hasDeformers,FBXNode& dracoMeshNode, getMaterialIDCallback materialIDCallback) {
     if (mesh.wasCompressed) {
         handleError("Cannot re-bake a file that contains compressed mesh");
diff --git a/libraries/baking/src/ModelBaker.h b/libraries/baking/src/ModelBaker.h
index ad787076ac..f2d106b3e7 100644
--- a/libraries/baking/src/ModelBaker.h
+++ b/libraries/baking/src/ModelBaker.h
@@ -55,6 +55,7 @@ protected:
 
 public slots:
     virtual void bake() override;
+    virtual void abort() override;
 
 private slots:
     void handleBakedTexture();
diff --git a/libraries/baking/src/OBJBaker.cpp b/libraries/baking/src/OBJBaker.cpp
index c4e8c172bd..cf8733a3b2 100644
--- a/libraries/baking/src/OBJBaker.cpp
+++ b/libraries/baking/src/OBJBaker.cpp
@@ -257,7 +257,6 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, FBXGeometry& geometry) {
     }
     
     // Generating Texture Node
-    int count = 0;
     // iterate through mesh parts and process the associated textures
     for (int i = 0;i < meshParts.size();i++) {
         QString material = meshParts[i].materialID;
@@ -333,7 +332,8 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, FBXGeometry& geometry) {
     }
     
     // Connect textures to materials
-    for (int i = 0;i < _mapTextureMaterial.size();i++) {
+    int mapSize = _mapTextureMaterial.size();
+    for (int i = 0;i < mapSize;i++) {
         FBXNode cNode2;
         cNode2.name = C_NODE_NAME;
         propertyString = CONNECTIONS_NODE_PROPERTY_1;