From 189da81bb1ac00eb2164a9887b41f10d1a71021b Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 18 Jan 2017 10:44:54 -0800
Subject: [PATCH] fix for crash on unloaded model

---
 interface/src/avatar/CauterizedModel.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/interface/src/avatar/CauterizedModel.cpp b/interface/src/avatar/CauterizedModel.cpp
index d58d392bb0..5c06412d9c 100644
--- a/interface/src/avatar/CauterizedModel.cpp
+++ b/interface/src/avatar/CauterizedModel.cpp
@@ -49,16 +49,18 @@ void CauterizedModel::createCollisionRenderItemSet() {
 }
 
 bool CauterizedModel::updateGeometry() {
-    bool returnValue = Model::updateGeometry();
-    if (_rig->jointStatesEmpty() && getFBXGeometry().joints.size() > 0) {
-        const FBXGeometry& fbxGeometry = getFBXGeometry();
-        foreach (const FBXMesh& mesh, fbxGeometry.meshes) {
-            Model::MeshState state;
-            state.clusterMatrices.resize(mesh.clusters.size());
-            _cauterizeMeshStates.append(state);
+    bool needsFullUpdate = Model::updateGeometry();
+    if (needsFullUpdate) {
+        if (_rig->jointStatesEmpty() && getFBXGeometry().joints.size() > 0) {
+            const FBXGeometry& fbxGeometry = getFBXGeometry();
+            foreach (const FBXMesh& mesh, fbxGeometry.meshes) {
+                Model::MeshState state;
+                state.clusterMatrices.resize(mesh.clusters.size());
+                _cauterizeMeshStates.append(state);
+            }
         }
     }
-	return returnValue;
+	return needsFullUpdate;
 }
 
 void CauterizedModel::updateClusterMatrices() {