From 5dddca37ca2bf80888fcebaae18a8ef24e590f9c Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 23 Apr 2015 13:44:39 -0700 Subject: [PATCH] fix default shape of zones --- libraries/entities/src/ZoneEntityItem.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/entities/src/ZoneEntityItem.cpp b/libraries/entities/src/ZoneEntityItem.cpp index b1d440e5e5..9ccb2697a0 100644 --- a/libraries/entities/src/ZoneEntityItem.cpp +++ b/libraries/entities/src/ZoneEntityItem.cpp @@ -200,10 +200,11 @@ void ZoneEntityItem::debugDump() const { } ShapeType ZoneEntityItem::getShapeType() const { + // Zones are not allowed to have a SHAPE_TYPE_NONE... they are always at least a SHAPE_TYPE_BOX if (_shapeType == SHAPE_TYPE_COMPOUND) { - return hasCompoundShapeURL() ? SHAPE_TYPE_COMPOUND : SHAPE_TYPE_NONE; + return hasCompoundShapeURL() ? SHAPE_TYPE_COMPOUND : SHAPE_TYPE_BOX; } else { - return _shapeType; + return _shapeType == SHAPE_TYPE_NONE ? SHAPE_TYPE_BOX : _shapeType; } }