From 691ee87c737fbbd9a56fe7db32052157ea313edd Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Tue, 22 Mar 2016 11:32:38 -0700
Subject: [PATCH] fix to default avatar model
---
libraries/avatars/src/AvatarData.cpp | 3 ++-
libraries/avatars/src/AvatarData.h | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 93d2ebb5da..290aaff820 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -968,9 +968,10 @@ bool AvatarData::hasIdentityChangedAfterParsing(const QByteArray& data) {
bool hasIdentityChanged = false;
- if (skeletonModelURL != _skeletonModelURL) {
+ if (_firstSkeletonCheck || (skeletonModelURL != _skeletonModelURL)) {
setSkeletonModelURL(skeletonModelURL);
hasIdentityChanged = true;
+ _firstSkeletonCheck = false;
}
if (displayName != _displayName) {
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 8a6b558383..900da38ffa 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -368,7 +368,8 @@ protected:
HeadData* _headData;
- QUrl _skeletonModelURL; // These need to be empty so that on first time setting them they will not short circuit
+ QUrl _skeletonModelURL;
+ bool _firstSkeletonCheck { true };
QUrl _skeletonFBXURL;
QVector<AttachmentData> _attachmentData;
QString _displayName;