From 6eed3e43bcafc67484c7d0694d71f4c9199125ec Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Wed, 2 Oct 2019 12:47:04 -0700
Subject: [PATCH] Fix skinning deformer data being added to graphics::Mesh even
 if the mesh has no skinning

---
 .../model-baker/src/model-baker/ReweightDeformersTask.cpp   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/model-baker/src/model-baker/ReweightDeformersTask.cpp b/libraries/model-baker/src/model-baker/ReweightDeformersTask.cpp
index 98f9d419ba..097833e110 100644
--- a/libraries/model-baker/src/model-baker/ReweightDeformersTask.cpp
+++ b/libraries/model-baker/src/model-baker/ReweightDeformersTask.cpp
@@ -12,8 +12,12 @@
 #include "ReweightDeformersTask.h"
 
 baker::ReweightedDeformers getReweightedDeformers(size_t numMeshVertices, const std::vector<const hfm::Deformer*> deformers, const uint16_t weightsPerVertex) {
-    size_t numClusterIndices = numMeshVertices * weightsPerVertex;
     baker::ReweightedDeformers reweightedDeformers;
+    if (deformers.size() == 0) {
+        return reweightedDeformers;
+    }
+
+    size_t numClusterIndices = numMeshVertices * weightsPerVertex;
     reweightedDeformers.weightsPerVertex = weightsPerVertex;
     // TODO: Consider having a rootCluster property in the DynamicTransform rather than appending the root to the end of the cluster list.
     reweightedDeformers.indices.resize(numClusterIndices, (uint16_t)(deformers.size() - 1));