From 9adfdb06fe95c0808ffb738f237eee2e03a2ea17 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Fri, 19 Jun 2015 11:00:27 +0200 Subject: [PATCH] undo local modif to SKeletonModel.cpp --- interface/src/avatar/SkeletonModel.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/interface/src/avatar/SkeletonModel.cpp b/interface/src/avatar/SkeletonModel.cpp index 9497e2099d..8c52c79ca0 100644 --- a/interface/src/avatar/SkeletonModel.cpp +++ b/interface/src/avatar/SkeletonModel.cpp @@ -41,7 +41,6 @@ SkeletonModel::SkeletonModel(Avatar* owningAvatar, QObject* parent) : _headClipDistance(DEFAULT_NEAR_CLIP) { assert(_owningAvatar); - _enableShapes = true; } SkeletonModel::~SkeletonModel() { @@ -255,13 +254,9 @@ void SkeletonModel::applyPalmData(int jointIndex, PalmData& palm) { } void SkeletonModel::updateJointState(int index) { - if (index > _jointStates.size()) { - return; // bail - } JointState& state = _jointStates[index]; const FBXJoint& joint = state.getFBXJoint(); - // if (joint.parentIndex != -1 && joint.parentIndex <= _jointStates.size()) { - if (joint.parentIndex > -1 && joint.parentIndex <= _jointStates.size()) { + if (joint.parentIndex != -1) { const JointState& parentState = _jointStates.at(joint.parentIndex); const FBXGeometry& geometry = _geometry->getFBXGeometry(); if (index == geometry.leanJointIndex) {