From e87067f93d0841312c540073b755100ceb458f48 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Mon, 5 Feb 2018 15:31:37 -0800
Subject: [PATCH] fix variable naming and edge case

---
 interface/src/avatar/MyAvatar.cpp | 10 ++++++----
 interface/src/avatar/MyAvatar.h   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 516c601931..0ee409745f 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1448,6 +1448,10 @@ void MyAvatar::clearJointsData() {
 }
 
 void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
+    if (skeletonModelURL != _skeletonModelURL) {
+        _shouldInitHeadBones = true;
+    }
+
     Avatar::setSkeletonModelURL(skeletonModelURL);
     _skeletonModel->setVisibleInScene(true, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE);
     _headBoneSet.clear();
@@ -1893,14 +1897,12 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) {
 
     Avatar::postUpdate(deltaTime, scene);
 
-    if (_skeletonModel->isLoaded() && !_skeletonModel->getRig().getAnimNode() && _initHeadBones) {
+    if (_skeletonModel->isLoaded() && !_skeletonModel->getRig().getAnimNode() && _shouldInitHeadBones) {
         initHeadBones();
         _skeletonModel->setCauterizeBoneSet(_headBoneSet);
         _fstAnimGraphOverrideUrl = _skeletonModel->getGeometry()->getAnimGraphOverrideUrl();
         initAnimGraph();
-        _initHeadBones = false;
-    } else if (!_skeletonModel->isLoaded()) {
-        _initHeadBones = true;
+        _shouldInitHeadBones = false;
     }
 
     if (_enableDebugDrawDefaultPose || _enableDebugDrawAnimPose) {
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 532eb06974..45dddb45a4 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -817,7 +817,7 @@ private:
     bool _enableDebugDrawIKConstraints { false };
     bool _enableDebugDrawIKChains { false };
     bool _enableDebugDrawDetailedCollision { false };
-    bool _initHeadBones { false };
+    bool _shouldInitHeadBones { true };
 
     mutable bool _cauterizationNeedsUpdate; // do we need to scan children and update their "cauterized" state?