From 083c5e34b217c86ae95b25f32c95f484321eb472 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Wed, 9 Oct 2013 15:11:14 -0700
Subject: [PATCH] Fix for non-Faceshift eye and mouth movement.

---
 interface/src/avatar/Head.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/interface/src/avatar/Head.cpp b/interface/src/avatar/Head.cpp
index 635edf29d4..9d8ba3cb9b 100644
--- a/interface/src/avatar/Head.cpp
+++ b/interface/src/avatar/Head.cpp
@@ -142,8 +142,10 @@ void Head::simulate(float deltaTime, bool isMine) {
     
     //  Update audio trailing average for rendering facial animations
     Faceshift* faceshift = Application::getInstance()->getFaceshift();
-    _isFaceshiftConnected = faceshift != NULL;
-
+    if (isMine) {
+        _isFaceshiftConnected = faceshift->isActive();
+    }
+    
     if (isMine && faceshift->isActive()) {
         const float EYE_OPEN_SCALE = 0.5f;
         _leftEyeBlink = faceshift->getLeftBlink() - EYE_OPEN_SCALE * faceshift->getLeftEyeOpen();
@@ -157,7 +159,7 @@ void Head::simulate(float deltaTime, bool isMine) {
         _browAudioLift = faceshift->getBrowUpCenter() * BROW_HEIGHT_SCALE;
         _blendshapeCoefficients = faceshift->getBlendshapeCoefficients();
         
-    } else  if (!_isFaceshiftConnected) {
+    } else if (!_isFaceshiftConnected) {
         // Update eye saccades
         const float AVERAGE_MICROSACCADE_INTERVAL = 0.50f;
         const float AVERAGE_SACCADE_INTERVAL = 4.0f;