From 725d4ee6432b883e95c444bea30153f2e800e8b6 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Tue, 24 Sep 2019 10:57:16 -0700
Subject: [PATCH] Fix build warnings

---
 libraries/fbx/src/FBXSerializer.cpp                           | 4 ++--
 libraries/hfm/src/hfm/HFM.h                                   | 3 ++-
 .../model-baker/src/model-baker/BuildGraphicsMeshTask.cpp     | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/fbx/src/FBXSerializer.cpp b/libraries/fbx/src/FBXSerializer.cpp
index f3c620c929..e6b4a62b51 100644
--- a/libraries/fbx/src/FBXSerializer.cpp
+++ b/libraries/fbx/src/FBXSerializer.cpp
@@ -1480,7 +1480,7 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
                 // of skinning information in FBX
                 QString jointID = _connectionChildMap.value(clusterID);
                 hfmCluster.jointIndex = modelIDs.indexOf(jointID);
-                if (hfmCluster.jointIndex == -1) {
+                if (hfmCluster.jointIndex == hfm::Cluster::INVALID_JOINT_INDEX) {
                     qCDebug(modelformat) << "Joint not in model list: " << jointID;
                     hfmCluster.jointIndex = 0;
                 }
@@ -1514,7 +1514,7 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
         {
             HFMCluster cluster;
             cluster.jointIndex = modelIDs.indexOf(modelID);
-            if (cluster.jointIndex == -1) {
+            if (cluster.jointIndex == hfm::Cluster::INVALID_JOINT_INDEX) {
                 qCDebug(modelformat) << "Model not in model list: " << modelID;
                 cluster.jointIndex = 0;
             }
diff --git a/libraries/hfm/src/hfm/HFM.h b/libraries/hfm/src/hfm/HFM.h
index d13cf3e2d0..51c5f929d8 100644
--- a/libraries/hfm/src/hfm/HFM.h
+++ b/libraries/hfm/src/hfm/HFM.h
@@ -124,7 +124,8 @@ public:
 /// A single binding to a joint.
 class Cluster {
 public:
-    uint32_t jointIndex;
+    static const uint32_t INVALID_JOINT_INDEX { (uint32_t)-1 };
+    uint32_t jointIndex { INVALID_JOINT_INDEX };
     glm::mat4 inverseBindMatrix;
     Transform inverseBindTransform;
 };
diff --git a/libraries/model-baker/src/model-baker/BuildGraphicsMeshTask.cpp b/libraries/model-baker/src/model-baker/BuildGraphicsMeshTask.cpp
index a9a544c34a..ea05b81d1f 100644
--- a/libraries/model-baker/src/model-baker/BuildGraphicsMeshTask.cpp
+++ b/libraries/model-baker/src/model-baker/BuildGraphicsMeshTask.cpp
@@ -45,7 +45,6 @@ ReweightedDeformers getReweightedDeformers(size_t numMeshVertices, const hfm::Dy
     weightAccumulators.resize(numClusterIndices, 0.0f);
     for (uint16_t i = 0; i < (uint16_t)deformers.size(); ++i) {
         const hfm::Deformer& deformer = *deformers[i];
-        const hfm::Cluster& cluster = dynamicTransform->clusters[i];
 
         if (deformer.indices.size() != deformer.weights.size()) {
             reweightedDeformers.trimmedToMatch = true;