From 8153e660bf2bc8951ddaf90c8c16dd0c01e636a6 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 9 Aug 2018 08:54:28 -0700 Subject: [PATCH] don't simulate/animateScaleChanges for fading avatars --- interface/src/avatar/AvatarManager.cpp | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp index d21f9de554..bb598f0261 100644 --- a/interface/src/avatar/AvatarManager.cpp +++ b/interface/src/avatar/AvatarManager.cpp @@ -277,21 +277,6 @@ void AvatarManager::updateOtherAvatars(float deltaTime) { sortedAvatars.pop(); } - if (_shouldRender) { - if (!_avatarsToFade.empty()) { - QReadLocker lock(&_hashLock); - QVector::iterator itr = _avatarsToFade.begin(); - while (itr != _avatarsToFade.end() && usecTimestampNow() > updateExpiry) { - auto avatar = std::static_pointer_cast(*itr); - avatar->animateScaleChanges(deltaTime); - avatar->simulate(deltaTime, true); - avatar->updateRenderItem(transaction); - ++itr; - } - } - qApp->getMain3DScene()->enqueueTransaction(transaction); - } - _numAvatarsUpdated = numAvatarsUpdated; _numAvatarsNotUpdated = numAVatarsNotUpdated;