Merge pull request #4029 from Atlante45/new_glm_fix

Fix compile error with new glm version
This commit is contained in:
Philip Rosedale 2015-01-04 11:26:37 -08:00
commit a01ab38f1b

View file

@ -176,7 +176,7 @@ void JointState::clearTransformTranslation() {
void JointState::applyRotationDelta(const glm::quat& delta, bool constrain, float priority) {
// NOTE: delta is in model-frame
assert(_fbxJoint != NULL);
if (priority < _animationPriority || delta.null) {
if (priority < _animationPriority || delta == glm::quat()) {
return;
}
_animationPriority = priority;