From 020942c82602c98ea36bc475ffeddf492703e062 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 10 Nov 2016 16:50:36 -0800 Subject: [PATCH] better handling for a flipped min/max scale --- assignment-client/src/avatars/AvatarMixer.cpp | 4 +++- interface/src/avatar/MyAvatar.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index 9700c544c1..041449dc57 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -568,7 +568,9 @@ void AvatarMixer::parseDomainServerSettings(const QJsonObject& domainSettings) { _domainMaximumScale = glm::clamp(settingMaxScale, MIN_AVATAR_SCALE, MAX_AVATAR_SCALE); // make sure that the domain owner didn't flip min and max - _domainMinimumScale = std::min(_domainMinimumScale, _domainMaximumScale); + if (_domainMinimumScale > _domainMaximumScale) { + std::swap(_domainMinimumScale, _domainMaximumScale); + } qDebug() << "This domain requires a minimum avatar scale of" << _domainMinimumScale << "and a maximum avatar scale of" << _domainMaximumScale; diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 7ce0f92d72..155b059f68 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1910,7 +1910,9 @@ void MyAvatar::restrictScaleFromDomainSettings(const QJsonObject& domainSettings setDomainMaximumScale(settingMaxScale); // make sure that the domain owner didn't flip min and max - _domainMinimumScale = std::min(_domainMinimumScale, _domainMaximumScale); + if (_domainMinimumScale > _domainMaximumScale) { + std::swap(_domainMinimumScale, _domainMaximumScale); + } qCDebug(interfaceapp, "This domain requires a minimum avatar scale of %f and a maximum avatar scale of %f", _domainMinimumScale, _domainMaximumScale);