From db9c3cc103ef37f9a40c4e404fd03de0b0e865f8 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Thu, 2 Nov 2017 12:31:36 -0700
Subject: [PATCH 1/2] make Model::scaleToFit() public not protected

---
 libraries/render-utils/src/Model.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 8bce976b4e..3abf7e2758 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -262,6 +262,8 @@ public:
 
     Q_INVOKABLE MeshProxyList getMeshes() const;
 
+    void scaleToFit();
+
 public slots:
     void loadURLFinished(bool success);
 
@@ -320,7 +322,6 @@ protected:
     virtual void initJointStates();
 
     void setScaleInternal(const glm::vec3& scale);
-    void scaleToFit();
     void snapToRegistrationPoint();
 
     void computeMeshPartLocalBounds();

From 490483fde889e31ddee4c2697e4716eccc4bb792 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Thu, 2 Nov 2017 12:32:51 -0700
Subject: [PATCH 2/2] call Model::scaleToFit() before update render items

---
 libraries/entities-renderer/src/RenderableModelEntityItem.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 7db19704b4..03380ad321 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -215,6 +215,7 @@ void RenderableModelEntityItem::updateModelBounds() {
         model->setScaleToFit(true, getDimensions());
         model->setSnapModelToRegistrationPoint(true, getRegistrationPoint());
         updateRenderItems = true;
+        model->scaleToFit();
     }
 
     bool success;