From f80333ee9e010737008896e4dd864a0f301c1cb7 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Fri, 6 May 2016 10:06:51 -0700 Subject: [PATCH] fix indentation, move an early exit to earlier --- libraries/physics/src/ObjectActionSpring.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/physics/src/ObjectActionSpring.cpp b/libraries/physics/src/ObjectActionSpring.cpp index 22b7ade979..e67a681481 100644 --- a/libraries/physics/src/ObjectActionSpring.cpp +++ b/libraries/physics/src/ObjectActionSpring.cpp @@ -49,6 +49,11 @@ bool ObjectActionSpring::getTarget(float deltaTimeStep, glm::quat& rotation, glm } bool ObjectActionSpring::prepareForSpringUpdate(btScalar deltaTimeStep) { + auto ownerEntity = _ownerEntity.lock(); + if (!ownerEntity) { + return false; + } + glm::quat rotation; glm::vec3 position; glm::vec3 linearVelocity; @@ -57,12 +62,7 @@ bool ObjectActionSpring::prepareForSpringUpdate(btScalar deltaTimeStep) { bool valid = false; int springCount = 0; - auto ownerEntity = _ownerEntity.lock(); - if (!ownerEntity) { - return false; - } - - QList springDerivedActions; + QList springDerivedActions; springDerivedActions.append(ownerEntity->getActionsOfType(ACTION_TYPE_SPRING)); springDerivedActions.append(ownerEntity->getActionsOfType(ACTION_TYPE_HOLD));