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

Merge pull request #6407 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
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -177,7 +177,7 @@ float AvatarData::getTargetScale() const {
void AvatarData::setTargetScale(float targetScale, bool overideReferential) { void AvatarData::setTargetScale(float targetScale, bool overideReferential) {
if (!_referential || 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; return maxAvailableSize;
} }
_targetScale = scale; _targetScale = std::max(MIN_AVATAR_SCALE, std::min(MAX_AVATAR_SCALE, scale));
} // 20 bytes } // 20 bytes
{ // Lookat Position { // Lookat Position