From b08d4527490c888cbc84c8d9032fad18c14aa59c Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Thu, 13 Feb 2014 16:49:42 -0800
Subject: [PATCH] Fix for head appearing at wrong position for a single frame.

---
 interface/src/avatar/FaceModel.cpp     | 4 ++++
 interface/src/avatar/SkeletonModel.cpp | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/interface/src/avatar/FaceModel.cpp b/interface/src/avatar/FaceModel.cpp
index b368024337..c9d2565cee 100644
--- a/interface/src/avatar/FaceModel.cpp
+++ b/interface/src/avatar/FaceModel.cpp
@@ -19,6 +19,10 @@ FaceModel::FaceModel(Head* owningHead) :
 }
 
 void FaceModel::simulate(float deltaTime) {
+    if (!isActive()) {
+        Model::simulate(deltaTime);
+        return;
+    }
     Avatar* owningAvatar = static_cast<Avatar*>(_owningHead->_owningAvatar);
     glm::vec3 neckPosition;
     if (!owningAvatar->getSkeletonModel().getNeckPosition(neckPosition)) {
diff --git a/interface/src/avatar/SkeletonModel.cpp b/interface/src/avatar/SkeletonModel.cpp
index 5ae17c3923..c6788c34f7 100644
--- a/interface/src/avatar/SkeletonModel.cpp
+++ b/interface/src/avatar/SkeletonModel.cpp
@@ -20,6 +20,10 @@ SkeletonModel::SkeletonModel(Avatar* owningAvatar) :
 }
 
 void SkeletonModel::simulate(float deltaTime) {
+    if (!isActive()) {
+        Model::simulate(deltaTime);
+        return;
+    }
     setTranslation(_owningAvatar->getPosition());
     setRotation(_owningAvatar->getOrientation() * glm::angleAxis(180.0f, 0.0f, 1.0f, 0.0f));
     const float MODEL_SCALE = 0.0006f;