Skip to content

bugfix(fx): Destroy slave particle systems with their master instead of orphaning them #3071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wh1ter0se69 wants to merge 3 commits into
base: main
Choose a base branch
from
+6 −0
Open

bugfix(fx): Destroy slave particle systems with their master instead of orphaning them #3071

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0064b8a
bugfix(fx): Destroy slave particle systems with their master instead …
wh1ter0se69 Aug 7, 2026
f63e1e0
Shorten the source comment and move the explanation to the PR
wh1ter0se69 Aug 7, 2026
b489125
Address review: drop the PR reference, say position instead of transform
wh1ter0se69 Aug 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Core/GameEngine/Source/GameClient/System/ParticleSys.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,6 +1235,12 @@ ParticleSystem::~ParticleSystem()
{

DEBUG_ASSERTCRASH( m_slaveSystem->getMaster() == this, ("~ParticleSystem: Our slave doesn't have us as a master!") );

// TheSuperHackers @bugfix wh1ter0se69 10/08/2026 Destroy the slave instead of orphaning it
// alive. A slave has no position of its own - its master merges one in on every burst - and
// nothing stops a masterless slave from emitting, so it starts bursting at the world origin.
m_slaveSystem->destroy();

m_slaveSystem->setMaster( nullptr );
setSlave( nullptr );

Expand Down
Loading