From 1092c09e8bb5b60065f262fd5794250fecc79595 Mon Sep 17 00:00:00 2001
From: utkarshgautamnyu <utkarsh.gautam@nyu.edu>
Date: Thu, 26 Oct 2017 11:40:26 -0700
Subject: [PATCH] changed variable names

---
 libraries/baking/src/FBXBaker.h     |  1 -
 libraries/baking/src/ModelBaker.cpp | 12 ++++++------
 libraries/baking/src/ModelBaker.h   |  4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/libraries/baking/src/FBXBaker.h b/libraries/baking/src/FBXBaker.h
index 05dcb1d296..797be14011 100644
--- a/libraries/baking/src/FBXBaker.h
+++ b/libraries/baking/src/FBXBaker.h
@@ -59,7 +59,6 @@ private:
     void rewriteAndBakeSceneModels();
     void rewriteAndBakeSceneTextures();
     void exportScene();
-    void removeEmbeddedMediaFolder();
 
     FBXNode _rootNode;
     FBXGeometry* _geometry;
diff --git a/libraries/baking/src/ModelBaker.cpp b/libraries/baking/src/ModelBaker.cpp
index 531cc31b9f..19e15c8377 100644
--- a/libraries/baking/src/ModelBaker.cpp
+++ b/libraries/baking/src/ModelBaker.cpp
@@ -28,12 +28,12 @@
 #pragma warning( pop )
 #endif
 
-ModelBaker::ModelBaker(const QUrl& modelURL, TextureBakerThreadGetter textureThreadGetter,
-                       const QString& bakedOutputDir, const QString& originalOutputDir) :
-    modelURL(modelURL),
-    textureThreadGetter(textureThreadGetter),
-    bakedOutputDir(bakedOutputDir),
-    originalOutputDir(originalOutputDir)
+ModelBaker::ModelBaker(const QUrl& inputModelURL, TextureBakerThreadGetter inputTextureThreadGetter,
+                       const QString& bakedOutputDirectory, const QString& originalOutputDirectory) :
+    modelURL(inputModelURL),
+    textureThreadGetter(inputTextureThreadGetter),
+    bakedOutputDir(bakedOutputDirectory),
+    originalOutputDir(originalOutputDirectory)
 {
 
 }
diff --git a/libraries/baking/src/ModelBaker.h b/libraries/baking/src/ModelBaker.h
index f2d106b3e7..bb1b5e7c11 100644
--- a/libraries/baking/src/ModelBaker.h
+++ b/libraries/baking/src/ModelBaker.h
@@ -34,8 +34,8 @@ class ModelBaker : public Baker{
     Q_OBJECT
 
 public:
-    ModelBaker(const QUrl& modelURL, TextureBakerThreadGetter textureThreadGetter,
-               const QString& bakedOutputDir, const QString& originalOutputDir);
+    ModelBaker(const QUrl& inputModelURL, TextureBakerThreadGetter inputTextureThreadGetter,
+               const QString& bakedOutputDirectory, const QString& originalOutputDirectory);
     bool compressMesh(FBXMesh& mesh, bool hasDeformers, FBXNode& dracoMeshNode, getMaterialIDCallback materialIDCallback = NULL);
     QByteArray* compressTexture(QString textureFileName, getTextureTypeCallback textureTypeCallback = NULL);
     virtual void setWasAborted(bool wasAborted) override;