From eb10c71d6c2d8b593d96d55c41adaf894ea53e50 Mon Sep 17 00:00:00 2001 From: clayjohn Date: Wed, 21 Dec 2022 15:19:57 -0700 Subject: Disable particle trails particles when parent parent is not active. --- servers/rendering/renderer_rd/shaders/particles.glsl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/servers/rendering/renderer_rd/shaders/particles.glsl b/servers/rendering/renderer_rd/shaders/particles.glsl index 9f6aa7adc0..f787b74dab 100644 --- a/servers/rendering/renderer_rd/shaders/particles.glsl +++ b/servers/rendering/renderer_rd/shaders/particles.glsl @@ -304,6 +304,11 @@ void main() { PARTICLE.flags = PARTICLE_FLAG_ACTIVE | (particles.data[src_idx].flags & (PARTICLE_FRAME_MASK << PARTICLE_FRAME_SHIFT)); return; //- this appears like it should be correct, but it seems not to be.. wonder why. } + if (!bool(particles.data[src_idx].flags & PARTICLE_FLAG_ACTIVE)) { + // Disable the entire trail if the parent is no longer active. + PARTICLE.flags = 0; + return; + } } else { PARTICLE.flags &= ~PARTICLE_FLAG_STARTED; } -- cgit v1.2.3