Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 22:16:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4084 from ZappoMan/master

Browse source 
Fix Philip's entity delete crash
This commit is contained in:
Philip Rosedale 2015-01-11 12:46:46 -08:00
commit 343ee4ea67
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/entities/src/DeleteEntityOperator.cpp
View file

@ -92,7 +92,8 @@ bool DeleteEntityOperator::preRecursion(OctreeElement* element) {
// and we can stop searching. // and we can stop searching.
if (entityTreeElement == details.containingElement) { if (entityTreeElement == details.containingElement) {
EntityItem* theEntity = details.entity; EntityItem* theEntity = details.entity;
assert(entityTreeElement->removeEntityItem(theEntity)); // remove it from the element bool entityDeleted = entityTreeElement->removeEntityItem(theEntity); // remove it from the element
assert(entityDeleted);
_tree->setContainingElement(details.entity->getEntityItemID(), NULL); // update or id to element lookup _tree->setContainingElement(details.entity->getEntityItemID(), NULL); // update or id to element lookup
_foundCount++; _foundCount++;
} }