From 7a602aedd1e07a36cff0c59b98c1d25eb117dc09 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 3 Apr 2014 09:06:49 -0700 Subject: [PATCH] Fix crash: don't simulate until geometry exists --- interface/src/avatar/FaceModel.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/interface/src/avatar/FaceModel.cpp b/interface/src/avatar/FaceModel.cpp index 2934a022af..b0ef947f65 100644 --- a/interface/src/avatar/FaceModel.cpp +++ b/interface/src/avatar/FaceModel.cpp @@ -34,14 +34,13 @@ void FaceModel::simulate(float deltaTime) { const float MODEL_SCALE = 0.0006f; setScale(glm::vec3(1.0f, 1.0f, 1.0f) * _owningHead->getScale() * MODEL_SCALE); - if (isActive()) { - setOffset(-_geometry->getFBXGeometry().neckPivot); - } - setPupilDilation(_owningHead->getPupilDilation()); setBlendshapeCoefficients(_owningHead->getBlendshapeCoefficients()); - Model::simulateInternal(deltaTime); + if (isActive()) { + setOffset(-_geometry->getFBXGeometry().neckPivot); + Model::simulateInternal(deltaTime); + } } void FaceModel::maybeUpdateNeckRotation(const JointState& parentState, const FBXJoint& joint, JointState& state) {