Merge pull request #15284 from amantley/eyeRotationOverrideBug

Fixes Bug that Prevented Eye Rotation Override When Procedural Eye Movement is Disabled
This commit is contained in:
Shannon Romano 2019-04-12 17:06:11 -07:00 committed by GitHub
commit d321ae9b79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -334,7 +334,9 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
eyeParams.leftEyeJointIndex = _rig.indexOfJoint("LeftEye");
eyeParams.rightEyeJointIndex = _rig.indexOfJoint("RightEye");
_rig.updateFromEyeParameters(eyeParams);
if (_owningAvatar->getHasProceduralEyeFaceMovement()) {
_rig.updateFromEyeParameters(eyeParams);
}
updateFingers();
}