From 2d73b7845e95257bd40bf725eb597f28ba90de8f Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Wed, 29 Aug 2018 15:00:01 -0700 Subject: [PATCH] Code style fixes --- interface/src/raypick/CollisionPick.cpp | 3 +-- interface/src/raypick/CollisionPick.h | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/interface/src/raypick/CollisionPick.cpp b/interface/src/raypick/CollisionPick.cpp index 407595b86a..091ceb0794 100644 --- a/interface/src/raypick/CollisionPick.cpp +++ b/interface/src/raypick/CollisionPick.cpp @@ -94,8 +94,7 @@ bool CollisionPick::getShapeInfoReady() { } return false; - } - else { + } else { computeShapeInfoDimensionsOnly(_mathPick, *_mathPick.shapeInfo, _cachedResource); return true; } diff --git a/interface/src/raypick/CollisionPick.h b/interface/src/raypick/CollisionPick.h index 7ff3670e53..f46f0742f5 100644 --- a/interface/src/raypick/CollisionPick.h +++ b/interface/src/raypick/CollisionPick.h @@ -25,11 +25,7 @@ public: CollisionPickResult() {} CollisionPickResult(const QVariantMap& pickVariant) : PickResult(pickVariant) {} - CollisionPickResult(const CollisionRegion& searchRegion, - LoadState loadState, - const std::vector& entityIntersections, - const std::vector& avatarIntersections - ) : + CollisionPickResult(const CollisionRegion& searchRegion, LoadState loadState, const std::vector& entityIntersections, const std::vector& avatarIntersections) : PickResult(searchRegion.toVariantMap()), loadState(loadState), intersects(entityIntersections.size() || avatarIntersections.size()),