Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-27 11:55:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request from jherico/dargo

Browse source 
Exclude avatar scales out of the permissable range
This commit is contained in:
Brad Hefta-Gaub 2015-11-17 18:41:15 -08:00
commit ba922290a4
1 changed files with 2 additions and 2 deletions

4
libraries/avatars/src/AvatarData.cpp
View file

@ -177,7 +177,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));
}
}
@ -531,7 +531,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