From aaa78d108b380726fe374a782d30f7ffdb38e284 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 24 Mar 2017 11:17:24 -0700
Subject: [PATCH] if a model has too many meshes, give up.
---
.../entities-renderer/src/RenderableModelEntityItem.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 935dd4e796..f865e39b21 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -807,6 +807,13 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
auto& meshes = _model->getGeometry()->getMeshes();
int32_t numMeshes = (int32_t)(meshes.size());
+ const int MAX_ALLOWED_MESH_COUNT = 500;
+ if (numMeshes > MAX_ALLOWED_MESH_COUNT) {
+ // too many will cause the deadlock timer to throw...
+ shapeInfo.setParams(SHAPE_TYPE_BOX, 0.5f * dimensions);
+ return;
+ }
+
ShapeInfo::PointCollection& pointCollection = shapeInfo.getPointCollection();
pointCollection.clear();
if (type == SHAPE_TYPE_SIMPLE_COMPOUND) {