From e9b3d481650e7fdfa1baa6044b07677fc22aba0b Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 20 Aug 2015 16:10:31 -0700
Subject: [PATCH] Add menu item that disables adjusting eyelids to follow pupil

Developer > Avatar > Disable Eyelid Adjustment
---
 interface/src/Menu.cpp        | 1 +
 interface/src/Menu.h          | 1 +
 interface/src/avatar/Head.cpp | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index f074dc5ac7..11bc38c85e 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -444,6 +444,7 @@ Menu::Menu() {
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderFocusIndicator, 0, false);
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowWhosLookingAtMe, 0, false);
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::FixGaze, 0, false);
+    addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::DisableEyelidAdjustment, 0, false);
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu,
                                            MenuOption::Connexion,
                                            0, false,
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index ca46b80f92..278da363d1 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -168,6 +168,7 @@ namespace MenuOption {
     const QString DecreaseAvatarSize = "Decrease Avatar Size";
     const QString DeleteBookmark = "Delete Bookmark...";
     const QString DisableActivityLogger = "Disable Activity Logger";
+    const QString DisableEyelidAdjustment = "Disable Eyelid Adjustment";
     const QString DisableLightEntities = "Disable Light Entities";
     const QString DisableNackPackets = "Disable Entity NACK Packets";
     const QString DiskCacheEditor = "Disk Cache Editor";
diff --git a/interface/src/avatar/Head.cpp b/interface/src/avatar/Head.cpp
index 9ab2c83a79..d645253eab 100644
--- a/interface/src/avatar/Head.cpp
+++ b/interface/src/avatar/Head.cpp
@@ -277,6 +277,10 @@ void Head::calculateMouthShapes() {
 void Head::applyEyelidOffset(glm::quat headOrientation) {
     // Adjusts the eyelid blendshape coefficients so that the eyelid follows the iris as the head pitches.
 
+    if (Menu::getInstance()->isOptionChecked(MenuOption::DisableEyelidAdjustment)) {
+        return;
+    }
+
     glm::quat eyeRotation = rotationBetween(headOrientation * IDENTITY_FRONT, getLookAtPosition() - _eyePosition);
     eyeRotation = eyeRotation * glm::angleAxis(safeEulerAngles(headOrientation).y, IDENTITY_UP);  // Rotation w.r.t. head
     float eyePitch = safeEulerAngles(eyeRotation).x;