Merge pull request #14080 from huffman/fix/111-models-not-being-resized

Fix models with 1^3 dimensions never being resized
This commit is contained in:
John Conklin II 2018-10-02 14:11:45 -07:00 committed by GitHub
commit 658c74a1c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -210,7 +210,8 @@ void RenderableModelEntityItem::updateModelBounds() {
}
if (model->getScaleToFitDimensions() != getScaledDimensions() ||
model->getRegistrationPoint() != getRegistrationPoint()) {
model->getRegistrationPoint() != getRegistrationPoint() ||
!model->getIsScaledToFit()) {
// 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
// have guards to make sure they don't happen after they've already been set. Here we reset those guards.