From b7d5804edbceeb6bdd96f3915d8f69ab01fa49de Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Fri, 3 Aug 2018 12:55:11 -0700 Subject: [PATCH] Format if..else statements --- libraries/physics/src/PhysicsEngine.cpp | 3 +-- libraries/shared/src/RegisteredMetaTypes.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp index 5ba6501006..d55fbf7e34 100644 --- a/libraries/physics/src/PhysicsEngine.cpp +++ b/libraries/physics/src/PhysicsEngine.cpp @@ -879,8 +879,7 @@ struct AllContactsCallback : public btCollisionWorld::ContactResultCallback { otherBody = colObj1->m_collisionObject; penetrationPoint = getWorldPoint(cp.m_localPointB, colObj1->getWorldTransform()); otherPenetrationPoint = getWorldPoint(cp.m_localPointA, colObj0->getWorldTransform()); - } - else { + } else { otherBody = colObj0->m_collisionObject; penetrationPoint = getWorldPoint(cp.m_localPointA, colObj0->getWorldTransform()); otherPenetrationPoint = getWorldPoint(cp.m_localPointB, colObj1->getWorldTransform()); diff --git a/libraries/shared/src/RegisteredMetaTypes.h b/libraries/shared/src/RegisteredMetaTypes.h index 69fa5b2b5d..a96903100e 100644 --- a/libraries/shared/src/RegisteredMetaTypes.h +++ b/libraries/shared/src/RegisteredMetaTypes.h @@ -235,8 +235,7 @@ public: if (shapeType >= SHAPE_TYPE_COMPOUND && shapeType <= SHAPE_TYPE_STATIC_MESH && shape["modelURL"].isValid()) { QString newURL = shape["modelURL"].toString(); modelURL.setUrl(newURL); - } - else { + } else { modelURL.setUrl(""); }