only one copy of entityIDs instead of two

This commit is contained in:
Andrew Meadows 2019-11-13 15:29:48 -08:00
parent dbeea4038d
commit 9dd0105ba5

View file

@ -339,14 +339,12 @@ void Avatar::removeAvatarEntitiesFromTree() {
auto treeRenderer = DependencyManager::get<EntityTreeRenderer>();
EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr;
if (entityTree) {
QList<QUuid> avatarEntityIDs;
_avatarEntitiesLock.withReadLock([&] {
avatarEntityIDs = _packedAvatarEntityData.keys();
});
std::vector<EntityItemID> ids;
ids.reserve(avatarEntityIDs.size());
foreach (auto id, avatarEntityIDs) {
ids.push_back(id);
ids.reserve(_packedAvatarEntityData.size());
PackedAvatarEntityMap::const_iterator itr = _packedAvatarEntityData.constBegin();
while (itr != _packedAvatarEntityData.constEnd()) {
ids.push_back(itr.key());
++itr;
}
bool force = true;
bool ignoreWarnings = true;