From 0ad1d080411fb0f305ac098056c3eb25bd978d89 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Tue, 17 Nov 2015 16:46:25 -0800 Subject: [PATCH] Exclude avatar scales out of the permissable range --- libraries/avatars/src/AvatarData.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 017ef7578a..9f3cbf092b 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -178,7 +178,7 @@ float AvatarData::getTargetScale() const { void AvatarData::setTargetScale(float targetScale, bool overideReferential) { if (!_referential || overideReferential) { - _targetScale = targetScale; + _targetScale = std::max(MIN_AVATAR_SCALE, std::min(MAX_AVATAR_SCALE, targetScale)); } } @@ -532,7 +532,7 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) { } return maxAvailableSize; } - _targetScale = scale; + _targetScale = std::max(MIN_AVATAR_SCALE, std::min(MAX_AVATAR_SCALE, scale)); } // 20 bytes { // Lookat Position