From da391564a8577676875c34335f5f31fcc742a1e9 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Fri, 23 Feb 2018 15:01:29 -0800
Subject: [PATCH] CR changes

---
 interface/src/avatar/MyAvatar.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 4a58af9378..28cfb3e8f4 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1638,8 +1638,7 @@ void MyAvatar::updateMotors() {
             _characterController.computeCollisionGroup() == BULLET_COLLISION_GROUP_COLLISIONLESS) {
         horizontalMotorTimescale = FLYING_MOTOR_TIMESCALE;
         verticalMotorTimescale = FLYING_MOTOR_TIMESCALE;
-    }
-    else {
+    } else {
         horizontalMotorTimescale = WALKING_MOTOR_TIMESCALE;
         verticalMotorTimescale = INVALID_MOTOR_TIMESCALE;
     }
@@ -1671,11 +1670,9 @@ void MyAvatar::updateMotors() {
     if (_motionBehaviors & AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED) {
         if (_scriptedMotorFrame == SCRIPTED_MOTOR_CAMERA_FRAME) {
             motorRotation = getMyHead()->getHeadOrientation() * glm::angleAxis(PI, Vectors::UNIT_Y);
-        }
-        else if (_scriptedMotorFrame == SCRIPTED_MOTOR_AVATAR_FRAME) {
+        } else if (_scriptedMotorFrame == SCRIPTED_MOTOR_AVATAR_FRAME) {
             motorRotation = getWorldOrientation() * glm::angleAxis(PI, Vectors::UNIT_Y);
-        }
-        else {
+        } else {
             // world-frame
             motorRotation = glm::quat();
         }