Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:14:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:MiladNazeri/hifi

Browse source
This commit is contained in:
milad 2019-09-24 16:06:51 -07:00
commit b8e7b23ba3
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -229,7 +229,11 @@ void EntityTreeRenderer::clearDomainAndNonOwnedEntities() {
for (const auto& entry : _entitiesInScene) {
const auto& renderer = entry.second;
const EntityItemPointer& entityItem = renderer->getEntity();
if (!(entityItem->isLocalEntity() || (entityItem->isAvatarEntity() && entityItem->getOwningAvatarID() == sessionUUID))) {
auto parentID = entityItem->getParentID();
auto parent = getTree()->findEntityByEntityItemID(parentID);
if ((!entityItem->isLocalEntity() || (entityItem->isAvatarEntity() && entityItem->getOwningAvatarID() == sessionUUID))) {
fadeOutRenderable(renderer);
} else if (entityItem->isLocalEntity() && parent && parent->getNestableType() == NestableType::Entity) {
fadeOutRenderable(renderer);
} else {
savedEntities[entry.first] = entry.second;