Merge branch 'faster-getters-on-avatar-for-scripts' of github.com:sethalves/hifi into faster-getters-on-avatar-for-scripts

This commit is contained in:
Seth Alves 2017-07-06 17:35:07 -07:00
commit 0d3412bd97

View file

@ -1019,6 +1019,10 @@ void Avatar::cacheJoints() const {
int Avatar::getJointIndex(const QString& name) const {
auto getJointIndexWorker = [&]() {
int result = getFauxJointIndex(name);
if (result != -1) {
return result;
}
if (_jointIndicesCache.contains(name)) {
return _jointIndicesCache[name];
}