Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 06:18:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #15117 from SamGondelman/wearables

Browse source 
Case 21596: Fix wearable scale on position change
This commit is contained in:
Shannon Romano 2019-03-07 10:29:47 -08:00 committed by GitHub
commit d11c04a19d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities/src/EntityItem.cpp
View file

@ -1873,7 +1873,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) {

2
libraries/entities/src/EntityItemProperties.cpp
View file

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