fix wearable scale on position change

This commit is contained in:
SamGondelman 2019-03-06 14:53:21 -08:00
parent 7585391642
commit 0f3e1b9157
2 changed files with 2 additions and 2 deletions

View file

@ -1868,7 +1868,7 @@ void EntityItem::setParentID(const QUuid& value) {
glm::vec3 EntityItem::getScaledDimensions() const { glm::vec3 EntityItem::getScaledDimensions() const {
glm::vec3 scale = getSNScale(); glm::vec3 scale = getSNScale();
return _unscaledDimensions * scale; return getUnscaledDimensions() * scale;
} }
void EntityItem::setScaledDimensions(const glm::vec3& value) { void EntityItem::setScaledDimensions(const glm::vec3& value) {

View file

@ -4177,7 +4177,7 @@ void EntityItemProperties::copySimulationRestrictedProperties(const EntityItemPo
setAcceleration(entity->getAcceleration()); setAcceleration(entity->getAcceleration());
} }
if (!_localDimensionsChanged && !_dimensionsChanged) { if (!_localDimensionsChanged && !_dimensionsChanged) {
setDimensions(entity->getScaledDimensions()); setLocalDimensions(entity->getScaledDimensions());
} }
} }