From d215856b238f8cc896fabadf5a1ab0815eecd8f5 Mon Sep 17 00:00:00 2001
From: kunalgosar <kunal.gosar@berkeley.edu>
Date: Fri, 14 Apr 2017 13:59:09 -0700
Subject: [PATCH] cleanup to blendshapes

---
 interface/src/avatar/SkeletonModel.cpp | 2 +-
 libraries/avatars/src/AvatarData.h     | 6 ------
 libraries/avatars/src/HeadData.cpp     | 3 ++-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/interface/src/avatar/SkeletonModel.cpp b/interface/src/avatar/SkeletonModel.cpp
index 9f13efe3b8..81a5bf38dc 100644
--- a/interface/src/avatar/SkeletonModel.cpp
+++ b/interface/src/avatar/SkeletonModel.cpp
@@ -242,7 +242,7 @@ void SkeletonModel::updateAttitude() {
 void SkeletonModel::simulate(float deltaTime, bool fullUpdate) {
     updateAttitude();
     if (fullUpdate) {
-		    setBlendshapeCoefficients(_owningAvatar->getHead()->getSummedBlendshapeCoefficients());
+        setBlendshapeCoefficients(_owningAvatar->getHead()->getSummedBlendshapeCoefficients());
 
         Model::simulate(deltaTime, fullUpdate);
 
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 79bcac5fcc..8319eb5249 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -438,12 +438,6 @@ public:
             _headData->setBlendshapeCoefficients(blendshapeCoefficients);
         }
     }
-    
-    void setSummedBlendshapeCoefficients(QVector<float>& blendshapeCoefficients) {
-        if (_headData) {
-            _headData->setSummedBlendshapeCoefficients(blendshapeCoefficients);
-        }
-    }
 
     // access to Head().set/getMousePitch (degrees)
     float getHeadPitch() const { return _headData->getBasePitch(); }
diff --git a/libraries/avatars/src/HeadData.cpp b/libraries/avatars/src/HeadData.cpp
index 59b1a209e7..6c0f0d3b5c 100644
--- a/libraries/avatars/src/HeadData.cpp
+++ b/libraries/avatars/src/HeadData.cpp
@@ -39,7 +39,7 @@ HeadData::HeadData(AvatarData* owningAvatar) :
     _averageLoudness(0.0f),
     _browAudioLift(0.0f),
     _owningAvatar(owningAvatar),
-    _baseBlendshapeCoefficients(0, 0),
+    _baseBlendshapeCoefficients(0, 0)
 {
 
 }
@@ -96,6 +96,7 @@ const QVector<float>& HeadData::getSummedBlendshapeCoefficients() {
 
 void HeadData::setBlendshape(QString name, float val) {
     const auto& blendshapeLookupMap = getBlendshapesLookupMap();
+
     //Check to see if the named blendshape exists, and then set its value if it does
     auto it = blendshapeLookupMap.find(name);
     if (it != blendshapeLookupMap.end()) {