From a545d770d888f12b42dbde32df275783afb02236 Mon Sep 17 00:00:00 2001
From: "U-GAPOS\\andrew" <andrew@highfidelity.io>
Date: Mon, 2 Nov 2015 11:06:17 -0800
Subject: [PATCH] fix bug preventing avatar motion in 2D mode

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

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 95a494e4fd..3bf1b79902 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1295,8 +1295,13 @@ void MyAvatar::prepareForPhysicsSimulation() {
     relayDriveKeysToCharacterController();
     _characterController.setTargetVelocity(getTargetVelocity());
     _characterController.setAvatarPositionAndOrientation(getPosition(), getOrientation());
-    updateHMDFollowVelocity();
-    _characterController.setHMDVelocity(_hmdFollowVelocity);
+    if (qApp->isHMDMode()) {
+        updateHMDFollowVelocity();
+        _characterController.setHMDVelocity(_hmdFollowVelocity);
+    } else {
+        _characterController.setHMDVelocity(Vectors::ZERO);
+        _isFollowingHMD = false;
+    }
 }
 
 void MyAvatar::harvestResultsFromPhysicsSimulation() {