From 9d13740979b9c9535b89acaec91b08151b0e9976 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Fri, 2 May 2014 14:06:54 -0700
Subject: [PATCH] Better default scale, get eye positions from skeleton.

---
 interface/src/ModelUploader.cpp | 4 ++--
 interface/src/avatar/Head.cpp   | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/interface/src/ModelUploader.cpp b/interface/src/ModelUploader.cpp
index 799301b541..83851ded8e 100644
--- a/interface/src/ModelUploader.cpp
+++ b/interface/src/ModelUploader.cpp
@@ -153,7 +153,7 @@ bool ModelUploader::zip() {
     
     // mixamo/autodesk defaults
     if (!mapping.contains(SCALE_FIELD)) {
-        mapping.insert(SCALE_FIELD, 10.0);
+        mapping.insert(SCALE_FIELD, 15.0);
     }
     QVariantHash joints = mapping.value(JOINT_FIELD).toHash();
     if (!joints.contains("jointEyeLeft")) {
@@ -600,7 +600,7 @@ static void setJointText(QComboBox* box, const QString& text) {
 void ModelPropertiesDialog::reset() {
     _name->setText(_originalMapping.value(NAME_FIELD).toString());
     _textureDirectory->setText(_originalMapping.value(TEXDIR_FIELD).toString());
-    _scale->setValue(_originalMapping.value(SCALE_FIELD, 1.0).toDouble());
+    _scale->setValue(_originalMapping.value(SCALE_FIELD).toDouble());
     
     QVariantHash jointHash = _originalMapping.value(JOINT_FIELD).toHash();
     setJointText(_leftEyeJoint, jointHash.value("jointEyeLeft").toString());
diff --git a/interface/src/avatar/Head.cpp b/interface/src/avatar/Head.cpp
index a213603a89..19aebba25c 100644
--- a/interface/src/avatar/Head.cpp
+++ b/interface/src/avatar/Head.cpp
@@ -161,7 +161,9 @@ void Head::simulate(float deltaTime, bool isMine, bool billboard) {
     _leftEyePosition = _rightEyePosition = getPosition();
     if (!billboard) {
         _faceModel.simulate(deltaTime);
-        _faceModel.getEyePositions(_leftEyePosition, _rightEyePosition);
+        if (!_faceModel.getEyePositions(_leftEyePosition, _rightEyePosition)) {
+            static_cast<Avatar*>(_owningAvatar)->getSkeletonModel().getEyePositions(_leftEyePosition, _rightEyePosition);
+        }
     }
     _eyePosition = calculateAverageEyePosition();
 }