Ensure Elements don't unlink from an already dead Scene
This commit is contained in:
parent
9d34fc966b
commit
05f73f0b98
|
@ -30,6 +30,17 @@ Scene::Scene()
|
|||
geometry.rect = IntRect();
|
||||
}
|
||||
|
||||
Scene::~Scene()
|
||||
{
|
||||
/* Ensure elements don't unlink from a destructed Scene */
|
||||
IntruListLink<SceneElement> *iter;
|
||||
|
||||
for (iter = elements.begin(); iter != elements.end(); iter = iter->next)
|
||||
{
|
||||
iter->data->scene = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void Scene::insert(SceneElement &element)
|
||||
{
|
||||
IntruListLink<SceneElement> *iter;
|
||||
|
@ -162,5 +173,6 @@ bool SceneElement::operator<(const SceneElement &o) const
|
|||
|
||||
void SceneElement::unlink()
|
||||
{
|
||||
if (scene)
|
||||
scene->elements.remove(link);
|
||||
}
|
||||
|
|
|
@ -42,7 +42,7 @@ public:
|
|||
};
|
||||
|
||||
Scene();
|
||||
virtual ~Scene() {}
|
||||
virtual ~Scene();
|
||||
|
||||
virtual void composite();
|
||||
virtual void requestViewportRender(Vec4& /*color*/, Vec4& /*flash*/, Vec4& /*tone*/) {}
|
||||
|
|
Loading…
Reference in New Issue