From 27f4d182d97c9c7b74b757c6a8bdab78e7274083 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 23 Oct 2017 17:56:26 -0700
Subject: [PATCH] fix scale of rendered collision geometry

---
 libraries/render-utils/src/Model.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 964a1961d6..97f62a3ce0 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -235,7 +235,6 @@ void Model::updateRenderItems() {
         self->updateClusterMatrices();
 
         Transform modelTransform = self->getTransform();
-        Transform physicsTransform = modelTransform;
         modelTransform.setScale(glm::vec3(1.0f));
 
         uint32_t deleteGeometryCounter = self->_deleteGeometryCounter;
@@ -259,13 +258,12 @@ void Model::updateRenderItems() {
             });
         }
 
-        // collision mesh does not share the same unit scale as the FBX file's mesh: only apply offset
         Transform collisionMeshOffset;
         collisionMeshOffset.setIdentity();
         foreach(auto itemID, self->_collisionRenderItemsMap.keys()) {
-            transaction.updateItem<MeshPartPayload>(itemID, [physicsTransform, collisionMeshOffset](MeshPartPayload& data) {
+            transaction.updateItem<MeshPartPayload>(itemID, [modelTransform, collisionMeshOffset](MeshPartPayload& data) {
                 // update the model transform for this render item.
-                data.updateTransform(physicsTransform, collisionMeshOffset);
+                data.updateTransform(modelTransform, collisionMeshOffset);
             });
         }