From 8479f0d4c130944925a61cafb5653b8bd60ed1c2 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Mon, 13 Apr 2015 09:34:38 -0700
Subject: [PATCH] don't compute shape info until both render and collision
 geometries are fully loaded

---
 .../src/RenderableModelEntityItem.cpp               | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 73968607f7..1d601d1294 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -297,10 +297,17 @@ bool RenderableModelEntityItem::isReadyToComputeShape() {
         // no collision-model url, so we're ready to compute a shape (of type None).
         return true;
     }
+    if (_model->getURL().isEmpty()) {
+        // we need a render geometry with a scale to proceed, so give up.
+        return true;
+    }
 
     const QSharedPointer<NetworkGeometry> collisionNetworkGeometry = _model->getCollisionGeometry();
-    if (! collisionNetworkGeometry.isNull() && collisionNetworkGeometry->isLoadedWithTextures()) {
-        // we have a _collisionModelURL AND a collisionNetworkGeometry AND it's fully loaded.
+    const QSharedPointer<NetworkGeometry> renderNetworkGeometry = _model->getGeometry();
+
+    if ((! collisionNetworkGeometry.isNull() && collisionNetworkGeometry->isLoadedWithTextures()) &&
+        (! renderNetworkGeometry.isNull() && renderNetworkGeometry->isLoadedWithTextures())) {
+        // we have both URLs AND both geometries AND they are both fully loaded.
         return true;
     }
 
@@ -309,7 +316,7 @@ bool RenderableModelEntityItem::isReadyToComputeShape() {
 }
 
 void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& info) {
-    if (_model->getCollisionURL().isEmpty()) {
+    if (_model->getCollisionURL().isEmpty() || _model->getURL().isEmpty()) {
         info.setParams(getShapeType(), 0.5f * getDimensions());
     } else {
         const QSharedPointer<NetworkGeometry> collisionNetworkGeometry = _model->getCollisionGeometry();