From d31c3854ad79cb91d31fa47caabbf7859dfb823e Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Wed, 23 Oct 2013 12:06:11 -0700
Subject: [PATCH] fix merge issue

---
 interface/src/Application.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index a8fc32a76a..2dbaf42144 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -387,10 +387,10 @@ void Application::paintGL() {
         _myCamera.setTightness(0.0f);
         _myCamera.setDistance(0.3f);
         glm::vec3 targetPosition = _myAvatar.getUprightHeadPosition();
-        if (_myAvatar.getHead().getBlendFace().isActive()) {
+        if (_myAvatar.getHead().getFaceModel().isActive()) {
             // make sure we're aligned to the blend face eyes
             glm::vec3 leftEyePosition, rightEyePosition;
-            if (_myAvatar.getHead().getBlendFace().getEyePositions(leftEyePosition, rightEyePosition, true)) {
+            if (_myAvatar.getHead().getFaceModel().getEyePositions(leftEyePosition, rightEyePosition)) {
                 targetPosition = (leftEyePosition + rightEyePosition) * 0.5f;
             }
         }