From 905e11faa34f42ddcb3c94f59ee4761273a1ea50 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 23 Nov 2015 16:54:17 -0600 Subject: [PATCH] use MIN_AVATAR_SCALE to ensure avatar fades complete --- interface/src/avatar/AvatarManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp index 769b1d56a2..8e5166d7b7 100644 --- a/interface/src/avatar/AvatarManager.cpp +++ b/interface/src/avatar/AvatarManager.cpp @@ -154,7 +154,7 @@ void AvatarManager::simulateAvatarFades(float deltaTime) { QVector::iterator fadingIterator = _avatarFades.begin(); const float SHRINK_RATE = 0.9f; - const float MIN_FADE_SCALE = 0.001f; + const float MIN_FADE_SCALE = MIN_AVATAR_SCALE; render::ScenePointer scene = qApp->getMain3DScene(); render::PendingChanges pendingChanges; @@ -162,7 +162,7 @@ void AvatarManager::simulateAvatarFades(float deltaTime) { auto avatar = std::static_pointer_cast(*fadingIterator); avatar->startUpdate(); avatar->setTargetScale(avatar->getScale() * SHRINK_RATE, true); - if (avatar->getTargetScale() < MIN_FADE_SCALE) { + if (avatar->getTargetScale() <= MIN_FADE_SCALE) { avatar->removeFromScene(*fadingIterator, scene, pendingChanges); fadingIterator = _avatarFades.erase(fadingIterator); } else {