Skip to content

Commit 3a9e132

Browse files
authored
Merge pull request #10451 from sebavan/master
Prevent subemitter dispose to overflow.
2 parents dd9eb1f + daba02e commit 3a9e132

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/Particles/subEmitter.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,10 @@ export class SubEmitter {
5757
// Automatically dispose of subemitter when system is disposed
5858
particleSystem.onDisposeObservable.add(() => {
5959
if (particleSystem.emitter && (<AbstractMesh>particleSystem.emitter).dispose) {
60-
(<AbstractMesh>particleSystem.emitter).dispose();
60+
// Prevent recursive dispose to break.
61+
const disposable = <AbstractMesh>particleSystem.emitter;
62+
particleSystem.emitter = Vector3.Zero();
63+
disposable.dispose();
6164
}
6265
});
6366
}

0 commit comments

Comments
 (0)