mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-25 09:44:02 +00:00
Code Issues Releases Wiki Activity

Fix possible crash when loading applying a skeletal twice in one frame.

Browse source 
Possibly a regression from 300f326777.
This commit is contained in:
fgenesis 2016-05-12 00:25:00 +02:00
parent d6dc3a8a09
commit 65179870a9
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
BBGE/RenderObject.cpp
View file

@ -967,6 +967,10 @@ void RenderObject::enqueueChildDeletion(RenderObject *r)
{ {
if (r->parent == this) if (r->parent == this)
{ {
// Don't garbage a child more than once
for (size_t i = 0; i < childGarbage.size(); ++i)
if(childGarbage[i] == r)
return;
childGarbage.push_back(r); childGarbage.push_back(r);
} }
} }

1
BBGE/SkeletalSprite.cpp
View file

@ -1105,7 +1105,6 @@ void SkeletalSprite::deleteBones()
{ {
(*it)->safeKill(); (*it)->safeKill();
} }
bones.clear();
} }
Animation *SkeletalSprite::getAnimation(const std::string& anim) Animation *SkeletalSprite::getAnimation(const std::string& anim)