From 0a7ea17d43c7ad69645e496c458e21074d4235be Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 18 Apr 2014 15:10:15 -0700
Subject: [PATCH] fix a geometry race condition crash

---
 interface/src/renderer/Model.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/interface/src/renderer/Model.cpp b/interface/src/renderer/Model.cpp
index f8de7210ea..ef0911f673 100644
--- a/interface/src/renderer/Model.cpp
+++ b/interface/src/renderer/Model.cpp
@@ -468,8 +468,13 @@ void Model::clearShapes() {
 
 void Model::rebuildShapes() {
     clearShapes();
+    
+    if (!_geometry) {
+        return;
+    }
+    
     const FBXGeometry& geometry = _geometry->getFBXGeometry();
-
+    
     if (geometry.joints.isEmpty()) {
         return;
     }