From fd4ed29405c01639a88fbf697d65bbee958bf054 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Mon, 7 Dec 2015 09:03:40 -0800
Subject: [PATCH] MyAvatar.clearJointData bug fix

MyAvatar.setJointRotation() now works properly after MyAvatar.clearJointData()
---
 interface/src/avatar/MyAvatar.cpp | 2 --
 libraries/animation/src/Rig.cpp   | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 5c4b51fefd..b75835dc96 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -967,8 +967,6 @@ void MyAvatar::clearJointData(int index) {
         QMetaObject::invokeMethod(this, "clearJointData", Q_ARG(int, index));
         return;
     }
-    // HACK: ATM only JS scripts call clearJointData() on MyAvatar so we hardcode the priority
-    _rig->setJointState(index, false, glm::quat(), glm::vec3(), 0.0f);
     _rig->clearJointAnimationPriority(index);
 }
 
diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index 8fb56ed699..98b347c660 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -294,6 +294,7 @@ void Rig::clearJointStates() {
 void Rig::clearJointAnimationPriority(int index) {
     if (isIndexValid(index)) {
         _internalPoseSet._overrideFlags[index] = false;
+        _internalPoseSet._overridePoses[index] = _animSkeleton->getRelativeDefaultPose(index);
     }
 }