Merge branch 'master' of https://github.com/highfidelity/hifi into android

This commit is contained in:
Atlante45 2015-01-28 13:13:58 -08:00
commit d68b59d4c7

View file

@ -221,16 +221,16 @@ public:
glm::mat4 offset; glm::mat4 offset;
int leftEyeJointIndex; int leftEyeJointIndex = -1;
int rightEyeJointIndex; int rightEyeJointIndex = -1;
int neckJointIndex; int neckJointIndex = -1;
int rootJointIndex; int rootJointIndex = -1;
int leanJointIndex; int leanJointIndex = -1;
int headJointIndex; int headJointIndex = -1;
int leftHandJointIndex; int leftHandJointIndex = -1;
int rightHandJointIndex; int rightHandJointIndex = -1;
int leftToeJointIndex; int leftToeJointIndex = -1;
int rightToeJointIndex; int rightToeJointIndex = -1;
QVector<int> humanIKJointIndices; QVector<int> humanIKJointIndices;