From 654468619cf08bca961f86c25f1645473e966ea1 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 1 Jun 2016 10:31:54 -0700 Subject: [PATCH] swap order of if-else blocks --- .../src/RenderableModelEntityItem.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index 151ac9cb8a..7b2494e1e0 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -599,11 +599,7 @@ bool RenderableModelEntityItem::isReadyToComputeShape() { void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& info) { ShapeType type = getShapeType(); - if (type != SHAPE_TYPE_COMPOUND) { - ModelEntityItem::computeShapeInfo(info); - info.setParams(type, 0.5f * getDimensions()); - adjustShapeInfoByRegistration(info); - } else { + if (type == SHAPE_TYPE_COMPOUND) { updateModelBounds(); // should never fall in here when collision model not fully loaded @@ -709,6 +705,10 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& info) { info.setParams(type, collisionModelDimensions, _compoundShapeURL); info.setConvexHulls(points); info.setOffset(_model->getOffset()); + } else { + ModelEntityItem::computeShapeInfo(info); + info.setParams(type, 0.5f * getDimensions()); + adjustShapeInfoByRegistration(info); } }