From 1ad2171952678fddcfecf16ca8c34051dd55c20a Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Tue, 4 Feb 2014 15:23:10 -0800
Subject: [PATCH] Fix #1862 camera should not follow head orientation when
 using faceshift

---
 interface/src/avatar/Head.cpp | 4 +---
 interface/src/avatar/Head.h   | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/interface/src/avatar/Head.cpp b/interface/src/avatar/Head.cpp
index 2269d1d4a6..f8faed56ed 100644
--- a/interface/src/avatar/Head.cpp
+++ b/interface/src/avatar/Head.cpp
@@ -37,7 +37,6 @@ Head::Head(Avatar* owningAvatar) :
     _leftEyeBlinkVelocity(0.0f),
     _rightEyeBlinkVelocity(0.0f),
     _timeWithoutTalking(0.0f),
-    _cameraYaw(_yaw),
     _isCameraMoving(false),
     _faceModel(this)
 {
@@ -189,8 +188,7 @@ glm::quat Head::getOrientation() const {
 
 glm::quat Head::getCameraOrientation () const {
     Avatar* owningAvatar = static_cast<Avatar*>(_owningAvatar);
-    return owningAvatar->getWorldAlignedOrientation()
-            * glm::quat(glm::radians(glm::vec3(_pitch, _cameraYaw, 0.0f)));
+    return owningAvatar->getWorldAlignedOrientation();
 }
 
 glm::quat Head::getEyeRotation(const glm::vec3& eyePosition) const {
diff --git a/interface/src/avatar/Head.h b/interface/src/avatar/Head.h
index 94b8bd3dc7..169f2af749 100644
--- a/interface/src/avatar/Head.h
+++ b/interface/src/avatar/Head.h
@@ -96,7 +96,6 @@ private:
     float _leftEyeBlinkVelocity;
     float _rightEyeBlinkVelocity;
     float _timeWithoutTalking;
-    float _cameraYaw;
     bool _isCameraMoving;
     FaceModel _faceModel;