godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00
Code Releases Wiki Activity

Merge pull request #107915 from QbieShay/fix_emitting_reset

Browse Source 
Fix particles resetting properties when emitting is toggled
This commit is contained in:
Thaddeus Crews
2025-07-04 10:09:03 -05:00
parent 9b22b41531 b93f6fa1ba
commit 6caf4c698f
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scene/2d/cpu_particles_2d.cpp
View File

@@ -45,7 +45,7 @@ void CPUParticles2D::set_emitting(bool p_emitting) {
return; return;
} }
if (p_emitting && !use_fixed_seed) { if (p_emitting && !use_fixed_seed && one_shot) {
set_seed(Math::rand()); set_seed(Math::rand());
} }

2
scene/2d/gpu_particles_2d.cpp
View File

@@ -41,7 +41,7 @@
void GPUParticles2D::set_emitting(bool p_emitting) { void GPUParticles2D::set_emitting(bool p_emitting) {
// Do not return even if `p_emitting == emitting` because `emitting` is just an approximation. // Do not return even if `p_emitting == emitting` because `emitting` is just an approximation.
if (p_emitting && p_emitting != emitting && !use_fixed_seed) { if (p_emitting && p_emitting != emitting && !use_fixed_seed && one_shot) {
set_seed(Math::rand()); set_seed(Math::rand());
} }
if (p_emitting && one_shot) { if (p_emitting && one_shot) {

2
scene/3d/cpu_particles_3d.cpp
View File

@@ -48,7 +48,7 @@ void CPUParticles3D::set_emitting(bool p_emitting) {
return; return;
} }
if (p_emitting && !use_fixed_seed) { if (p_emitting && !use_fixed_seed && one_shot) {
set_seed(Math::rand()); set_seed(Math::rand());
} }

2
scene/3d/gpu_particles_3d.cpp
View File

@@ -42,7 +42,7 @@ AABB GPUParticles3D::get_aabb() const {
void GPUParticles3D::set_emitting(bool p_emitting) { void GPUParticles3D::set_emitting(bool p_emitting) {
// Do not return even if `p_emitting == emitting` because `emitting` is just an approximation. // Do not return even if `p_emitting == emitting` because `emitting` is just an approximation.
if (p_emitting && p_emitting != emitting && !use_fixed_seed) { if (p_emitting && p_emitting != emitting && !use_fixed_seed && one_shot) {
set_seed(Math::rand()); set_seed(Math::rand());
} }
if (p_emitting && one_shot) { if (p_emitting && one_shot) {