From e7b852ca3835528b88904580aa441f12bc929029 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 17 Jun 2019 13:18:03 -0700 Subject: [PATCH] don't try to create collision shape before compound shape resource is finished loading --- libraries/entities-renderer/src/RenderableModelEntityItem.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index 1fc8a2382b..54edd3543c 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -368,6 +368,10 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) { } if (type == SHAPE_TYPE_COMPOUND) { + if (!_compoundShapeResource || !_compoundShapeResource->isLoaded()) { + return; + } + updateModelBounds(); // should never fall in here when collision model not fully loaded