From f4a4c9786c17204c5543b8f4677f34e5bcc5d283 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 11 Feb 2015 08:43:55 -0800 Subject: [PATCH] don't create shape for SHAPE_TYPE_NONE --- libraries/physics/src/ShapeManager.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libraries/physics/src/ShapeManager.cpp b/libraries/physics/src/ShapeManager.cpp index 4de7976549..02228bf7aa 100644 --- a/libraries/physics/src/ShapeManager.cpp +++ b/libraries/physics/src/ShapeManager.cpp @@ -27,6 +27,9 @@ ShapeManager::~ShapeManager() { } btCollisionShape* ShapeManager::getShape(const ShapeInfo& info) { + if (info.getType() == SHAPE_TYPE_NONE) { + return NULL; + } // Very small or large objects are not supported. float diagonal = 4.0f * glm::length2(info.getHalfExtents()); const float MIN_SHAPE_DIAGONAL_SQUARED = 3.0e-4f; // 1 cm cube