Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:24:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

function name change

Browse source
This commit is contained in:
Dante Ruiz 2016-11-16 22:09:22 +00:00
parent ff7c11d48c
commit 9c4ae9df5a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/entities/src/EntityTree.cpp
View file

@ -438,7 +438,7 @@ void EntityTree::deleteEntity(const EntityItemID& entityID, bool force, bool ign
return;
}
checkEntity(entityID);
IsAvatarParentOfEntity(entityID);
emit deletingEntity(entityID);
// NOTE: callers must lock the tree before using this method
@ -448,7 +448,7 @@ void EntityTree::deleteEntity(const EntityItemID& entityID, bool force, bool ign
_isDirty = true;
}
void EntityTree::checkEntity(const EntityItemID entityID) {
void EntityTree::IsAvatarParentOfEntity(const EntityItemID entityID) {
EntityItemPointer entity = findEntityByEntityItemID(entityID);
@ -488,7 +488,7 @@ void EntityTree::deleteEntities(QSet<EntityItemID> entityIDs, bool force, bool i
}
// tell our delete operator about this entityID
checkEntity(entityID);
IsAvatarParentOfEntity(entityID);
theOperator.addEntityIDToDeleteList(entityID);
emit deletingEntity(entityID);
}

2
libraries/entities/src/EntityTree.h
View file

@ -122,7 +122,7 @@ public:
bool updateEntity(EntityItemPointer entity, const EntityItemProperties& properties, const SharedNodePointer& senderNode = SharedNodePointer(nullptr));
// check if the avatar is a child of this entity, If so set the avatar parentID to null
void checkEntity(const EntityItemID entityID);
void IsAvatarParentOfEntity(const EntityItemID entityID);
void deleteEntity(const EntityItemID& entityID, bool force = false, bool ignoreWarnings = true);
void deleteEntities(QSet<EntityItemID> entityIDs, bool force = false, bool ignoreWarnings = true);