From 44de1dd2be479cb4f4f4f53a1abc4cead23796fe Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 12 Jul 2017 19:25:39 -0700 Subject: [PATCH] put result of Avatar::getJointNames back in index-order --- .../avatars-renderer/src/avatars-renderer/Avatar.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp index 6e8f0f01e7..7097d01226 100644 --- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp +++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp @@ -1048,11 +1048,17 @@ int Avatar::getJointIndex(const QString& name) const { } QStringList Avatar::getJointNames() const { - QStringList result; + QVector result; withValidJointIndicesCache([&]() { - result = _modelJointIndicesCache.keys(); + QHashIterator i(_modelJointIndicesCache); + while (i.hasNext()) { + i.next(); + int index = _modelJointIndicesCache[i.key()]; + result.resize(index); + result[index] = i.value(); + } }); - return result; + return result.toList(); } glm::vec3 Avatar::getJointPosition(int index) const {