diff --git a/Engine/source/T3D/debris.cpp b/Engine/source/T3D/debris.cpp index 495b5dbc2..77d5fc603 100644 --- a/Engine/source/T3D/debris.cpp +++ b/Engine/source/T3D/debris.cpp @@ -659,11 +659,7 @@ void Debris::onRemove() } } - if( getSceneManager() ) - getSceneManager()->removeObjectFromScene(this); - - if( getContainer() ) - getContainer()->removeObject(this); + removeFromScene(); Parent::onRemove(); } diff --git a/Engine/source/T3D/fx/explosion.cpp b/Engine/source/T3D/fx/explosion.cpp index dd81dcba8..f23400232 100644 --- a/Engine/source/T3D/fx/explosion.cpp +++ b/Engine/source/T3D/fx/explosion.cpp @@ -964,10 +964,7 @@ void Explosion::onRemove() mMainEmitter = NULL; } - if (getSceneManager() != NULL) - getSceneManager()->removeObjectFromScene(this); - if (getContainer() != NULL) - getContainer()->removeObject(this); + removeFromScene(); Parent::onRemove(); } diff --git a/Engine/source/T3D/fx/splash.cpp b/Engine/source/T3D/fx/splash.cpp index 1558f2dbc..0e9a2c6f4 100644 --- a/Engine/source/T3D/fx/splash.cpp +++ b/Engine/source/T3D/fx/splash.cpp @@ -415,11 +415,7 @@ void Splash::onRemove() ringList.clear(); - if( getSceneManager() ) - getSceneManager()->removeObjectFromScene(this); - - if( getContainer() ) - getContainer()->removeObject(this); + removeFromScene(); Parent::onRemove(); }