Merge pull request #1035 from ey6es/master

Fix for non-Faceshift eye and mouth movement.
This commit is contained in:
Andrzej Kapolka 2013-10-09 15:13:34 -07:00
commit cbd9dae886

View file

@ -142,7 +142,9 @@ void Head::simulate(float deltaTime, bool isMine) {
// Update audio trailing average for rendering facial animations
Faceshift* faceshift = Application::getInstance()->getFaceshift();
_isFaceshiftConnected = faceshift != NULL;
if (isMine) {
_isFaceshiftConnected = faceshift->isActive();
}
if (isMine && faceshift->isActive()) {
const float EYE_OPEN_SCALE = 0.5f;