From 49ce04e214db275aa203b3d6cc8da1cee068491d Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Mon, 5 Dec 2016 15:17:32 -0800
Subject: [PATCH] Revert "Merge pull request #9150 from
 hyperlogic/bug-fix/driving-while-flying-in-hmd"

This reverts commit a69d77ffbe4f31edbc720515f0f37af459e6f134, reversing
changes made to 996d3f58754f1203c157507cd4e5d5ade1ab4f54.
---
 interface/src/avatar/MyAvatar.cpp | 6 +-----
 interface/src/avatar/MyAvatar.h   | 3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 5b691a6dc6..9a0b04aa6d 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -467,8 +467,6 @@ void MyAvatar::simulate(float deltaTime) {
 
     if (_characterController.getState() != CharacterController::State::Hover) {
         updateSensorToWorldMatrix(_enableVerticalComfortMode ? SensorToWorldUpdateMode::VerticalComfort : SensorToWorldUpdateMode::Vertical);
-    } else {
-        updateSensorToWorldMatrix(SensorToWorldUpdateMode::None);
     }
 
     {
@@ -618,8 +616,6 @@ void MyAvatar::updateSensorToWorldMatrix(SensorToWorldUpdateMode mode) {
         } else if (mode == SensorToWorldUpdateMode::Vertical) {
             setSensorToWorldMatrix(sensorToWorldMat);
         }
-    } else if (mode == SensorToWorldUpdateMode::None) {
-        setSensorToWorldMatrix(_sensorToWorldMatrix);
     }
 }
 
@@ -1901,7 +1897,7 @@ void MyAvatar::applyVelocityToSensorToWorldMatrix(const glm::vec3& velocity, flo
         // update the position column of matrix
         glm::mat4 newSensorToWorldMatrix = _sensorToWorldMatrix;
         newSensorToWorldMatrix[3] = glm::vec4(position, 1.0f);
-        _sensorToWorldMatrix = newSensorToWorldMatrix;
+        setSensorToWorldMatrix(newSensorToWorldMatrix);
     }
 }
 
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 72936ec0ce..feef171a29 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -192,8 +192,7 @@ public:
     enum class SensorToWorldUpdateMode {
         Full = 0,
         Vertical,
-        VerticalComfort,
-        None
+        VerticalComfort
     };
     void updateSensorToWorldMatrix(SensorToWorldUpdateMode mode = SensorToWorldUpdateMode::Full);