From 0f3e1b91574c1f75fcab5e40f3aa21bc3a524ba1 Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Wed, 6 Mar 2019 14:53:21 -0800 Subject: [PATCH] fix wearable scale on position change --- libraries/entities/src/EntityItem.cpp | 2 +- libraries/entities/src/EntityItemProperties.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index 5da1c05aa2..df9f12afb9 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -1868,7 +1868,7 @@ void EntityItem::setParentID(const QUuid& value) { glm::vec3 EntityItem::getScaledDimensions() const { glm::vec3 scale = getSNScale(); - return _unscaledDimensions * scale; + return getUnscaledDimensions() * scale; } void EntityItem::setScaledDimensions(const glm::vec3& value) { diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index 5ae9b30869..ce5b8b558c 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -4177,7 +4177,7 @@ void EntityItemProperties::copySimulationRestrictedProperties(const EntityItemPo setAcceleration(entity->getAcceleration()); } if (!_localDimensionsChanged && !_dimensionsChanged) { - setDimensions(entity->getScaledDimensions()); + setLocalDimensions(entity->getScaledDimensions()); } }