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

Merge pull request #15153 from danteruiz/fix-soft-entity-popping

Browse source 
Case 21618: menithal's avatar is constantly flashing
This commit is contained in:
Shannon Romano 2019-03-11 18:09:44 -07:00 committed by GitHub
commit 44fa00606a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -181,9 +181,11 @@ void RenderableModelEntityItem::updateModelBounds() {
updateRenderItems = true; updateRenderItems = true;
} }
if (model->getScaleToFitDimensions() != getScaledDimensions() || bool overridingModelTransform = model->isOverridingModelTransformAndOffset();
model->getRegistrationPoint() != getRegistrationPoint() || if (!overridingModelTransform &&
!model->getIsScaledToFit()) { (model->getScaleToFitDimensions() != getScaledDimensions() ||
model->getRegistrationPoint() != getRegistrationPoint() ||
!model->getIsScaledToFit())) {
// The machinery for updateModelBounds will give existing models the opportunity to fix their // The machinery for updateModelBounds will give existing models the opportunity to fix their
// translation/rotation/scale/registration. The first two are straightforward, but the latter two // translation/rotation/scale/registration. The first two are straightforward, but the latter two
// have guards to make sure they don't happen after they've already been set. Here we reset those guards. // have guards to make sure they don't happen after they've already been set. Here we reset those guards.