LoweBowe/LumixEngine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed infinite loop when destroying entity in complicated hierarchy

Browse source
This commit is contained in:
Mikulas Florek 2017-05-25 23:44:39 +02:00
parent d37d1b5f8d
commit 1a4bd2325e
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/engine/universe/universe.cpp
View file

@ -345,15 +345,11 @@ void Universe::destroyEntity(Entity entity)
if (!entity.isValid()) return;
EntityData& entity_data = m_entities[entity.index];
if (entity_data.hierarchy >= 0)
for (Entity first_child = getFirstChild(entity); first_child.isValid(); first_child = getFirstChild(entity))
{
Hierarchy& h = m_hierarchy[entity_data.hierarchy];
while (h.first_child.isValid())
{
setParent(INVALID_ENTITY, h.first_child);
}
setParent(INVALID_ENTITY, entity);
setParent(INVALID_ENTITY, first_child);
}
setParent(INVALID_ENTITY, entity);
u64 mask = entity_data.components;