From a3f4aeb1826e2249a2f9e1332f0e108bcaf2d730 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Mon, 24 Jul 2017 19:41:30 -0700
Subject: [PATCH] code review

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

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 5ec6a9023d..3099782588 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -130,7 +130,6 @@ bool OBJTokenizer::getVertex(glm::vec3& vertex, glm::vec3& vertexColor) {
     auto y = getFloat(); // And order of arguments is different on Windows/Linux.
     auto z = getFloat();
     vertex = glm::vec3(x, y, z);
-    vertexColor = glm::vec3(1.0f); // default, in case there is not color information
 
     auto r = 1.0f, g = 1.0f, b = 1.0f;
     bool hasVertexColor = false;
@@ -415,7 +414,8 @@ bool OBJReader::parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mappi
                 #endif
             }
         } else if (token == "v") {
-            glm::vec3 vertex, vertexColor;
+            glm::vec3 vertex;
+            glm::vec3 vertexColor { glm::vec3(1.0f) };
 
             bool hasVertexColor = tokenizer.getVertex(vertex, vertexColor);
             vertices.append(vertex);
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 095712f351..42bb91ce94 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -463,7 +463,7 @@ bool Model::convexHullContains(glm::vec3 point) {
     return false;
 }
 
-MeshProxyList Model::getMeshes() {
+MeshProxyList Model::getMeshes() const {
     MeshProxyList result;
     const Geometry::Pointer& renderGeometry = getGeometry();
     const Geometry::GeometryMeshes& meshes = renderGeometry->getMeshes();
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index da8677aeed..497346c138 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -257,7 +257,7 @@ public:
     int getResourceDownloadAttempts() { return _renderWatcher.getResourceDownloadAttempts(); }
     int getResourceDownloadAttemptsRemaining() { return _renderWatcher.getResourceDownloadAttemptsRemaining(); }
 
-    Q_INVOKABLE MeshProxyList getMeshes();
+    Q_INVOKABLE MeshProxyList getMeshes() const;
 
 public slots:
     void loadURLFinished(bool success);