From ef4a04b9cf31a201fd5e0dafd3e925913f8af44a Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 6 Jul 2017 18:01:58 -0700 Subject: [PATCH] code style --- .../avatars-renderer/src/avatars-renderer/Avatar.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp index 439beb94d6..fc604809dc 100644 --- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp +++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp @@ -1034,7 +1034,9 @@ int Avatar::getJointIndex(const QString& name) const { } }; QReadLocker readLock(&_jointIndicesCacheLock); - if (!_jointsCached) { + if (_jointsCached) { + return getJointIndexWorker(); + } else { readLock.unlock(); { QWriteLocker writeLock(&_jointIndicesCacheLock); @@ -1042,7 +1044,6 @@ int Avatar::getJointIndex(const QString& name) const { return getJointIndexWorker(); } } - return getJointIndexWorker(); } QStringList Avatar::getJointNames() const { @@ -1050,7 +1051,9 @@ QStringList Avatar::getJointNames() const { return _jointIndicesCache.keys(); }; QReadLocker readLock(&_jointIndicesCacheLock); - if (!_jointsCached) { + if (_jointsCached) { + return getJointNamesWorker(); + } else { readLock.unlock(); { QWriteLocker writeLock(&_jointIndicesCacheLock); @@ -1058,7 +1061,6 @@ QStringList Avatar::getJointNames() const { return getJointNamesWorker(); } } - return getJointNamesWorker(); } glm::vec3 Avatar::getJointPosition(int index) const {