From c76fdd1f5fe98a6710f36394bb25554330830da3 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Mon, 15 Jan 2018 10:43:26 -0800
Subject: [PATCH] adding scale

---
 libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp | 5 +++--
 libraries/render-utils/src/Model.cpp                       | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index fb5ca84ac7..0f9573bb84 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -397,8 +397,9 @@ void Avatar::relayJointDataToChildren() {
                             modelEntity->setLocalJointTranslation(jointIndex, jointTranslation);
                         }
                     }
-
-                    modelEntity->setOverrideTransform(_skeletonModel->getTransform(), _skeletonModel->getOffset());
+                    Transform avatarTransform = _skeletonModel->getTransform();
+                    avatarTransform.setScale(_skeletonModel->getScale());
+                    modelEntity->setOverrideTransform(avatarTransform, _skeletonModel->getOffset());
                     modelEntity->simulateRelayedJoints();
                 }
             }
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 68d407ac2b..3744a0f090 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -1373,6 +1373,7 @@ void Model::overrideModelTransformAndOffset(const Transform& transform, const gl
     _overrideTranslation = transform.getTranslation();
     _overrideRotation = transform.getRotation();
     _overrideModelTransform = true;
+    setScale(transform.getScale());
     setOffset(offset);
 }