From 9e5763ea5c9fd2c9421c8dfed57caec0182f4c10 Mon Sep 17 00:00:00 2001
From: amantley <amantley@googlemail.com>
Date: Tue, 3 Jul 2018 11:46:59 -0700
Subject: [PATCH] adding the recentering back into the non hmd lean code

---
 interface/src/avatar/MyAvatar.cpp | 4 ++--
 interface/src/avatar/MyAvatar.h   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index bc71d12cf0..e39c3dd607 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -3533,7 +3533,7 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat
             activate(Vertical);
         }
     } else {
-        if (!isActive(Rotation) && getForceActivateRotation()) {
+        if (!isActive(Rotation) && (getForceActivateRotation() || shouldActivateRotation(myAvatar, desiredBodyMatrix, currentBodyMatrix))) {
             activate(Rotation);
             setForceActivateRotation(false);
         }
@@ -3541,7 +3541,7 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat
             activate(Horizontal);
             setForceActivateHorizontal(false);
         }
-        if (!isActive(Vertical) && getForceActivateVertical()) {
+        if (!isActive(Vertical) && (getForceActivateVertical() || shouldActivateVertical(myAvatar, desiredBodyMatrix, currentBodyMatrix))) {
             activate(Vertical);
             setForceActivateVertical(false);
         }
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index ec2b2d9661..68476bfe2a 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -1646,7 +1646,6 @@ private:
     bool _shouldLoadScripts { false };
 
     bool _haveReceivedHeightLimitsFromDomain { false };
-
 };
 
 QScriptValue audioListenModeToScriptValue(QScriptEngine* engine, const AudioListenerMode& audioListenerMode);