Merge pull request #107915 from QbieShay/fix_emitting_reset

Repiteo · Repiteo · commit 6caf4c698f7b · 2025-07-04T10:09:03.000-05:00
Fix particles resetting properties when emitting is toggled
diff --git a/scene/2d/cpu_particles_2d.cpp b/scene/2d/cpu_particles_2d.cpp
@@ -45,7 +45,7 @@ void CPUParticles2D::set_emitting(bool p_emitting) {
 		return;
 	}
 
-	if (p_emitting && !use_fixed_seed) {
+	if (p_emitting && !use_fixed_seed && one_shot) {
 		set_seed(Math::rand());
 	}
 
diff --git a/scene/2d/gpu_particles_2d.cpp b/scene/2d/gpu_particles_2d.cpp
@@ -41,7 +41,7 @@
 void GPUParticles2D::set_emitting(bool p_emitting) {
 	// 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());
 	}
 	if (p_emitting && one_shot) {
diff --git a/scene/3d/cpu_particles_3d.cpp b/scene/3d/cpu_particles_3d.cpp
@@ -48,7 +48,7 @@ void CPUParticles3D::set_emitting(bool p_emitting) {
 		return;
 	}
 
-	if (p_emitting && !use_fixed_seed) {
+	if (p_emitting && !use_fixed_seed && one_shot) {
 		set_seed(Math::rand());
 	}
 
diff --git a/scene/3d/gpu_particles_3d.cpp b/scene/3d/gpu_particles_3d.cpp
@@ -42,7 +42,7 @@ AABB GPUParticles3D::get_aabb() const {
 
 void GPUParticles3D::set_emitting(bool p_emitting) {
 	// 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());
 	}
 	if (p_emitting && one_shot) {

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ void CPUParticles2D::set_emitting(bool p_emitting) {`
`45`	`45`	`return;`
`46`	`46`	`}`
`47`	`47`
`48`		`- if (p_emitting && !use_fixed_seed) {`
	`48`	`+ if (p_emitting && !use_fixed_seed && one_shot) {`
`49`	`49`	`set_seed(Math::rand());`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`void GPUParticles2D::set_emitting(bool p_emitting) {`
`42`	`42`	// Do not return even if `p_emitting == emitting` because `emitting` is just an approximation.
`43`	`43`
`44`		`- if (p_emitting && p_emitting != emitting && !use_fixed_seed) {`
	`44`	`+ if (p_emitting && p_emitting != emitting && !use_fixed_seed && one_shot) {`
`45`	`45`	`set_seed(Math::rand());`
`46`	`46`	`}`
`47`	`47`	`if (p_emitting && one_shot) {`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ void CPUParticles3D::set_emitting(bool p_emitting) {`
`48`	`48`	`return;`
`49`	`49`	`}`
`50`	`50`
`51`		`- if (p_emitting && !use_fixed_seed) {`
	`51`	`+ if (p_emitting && !use_fixed_seed && one_shot) {`
`52`	`52`	`set_seed(Math::rand());`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ AABB GPUParticles3D::get_aabb() const {`
`42`	`42`
`43`	`43`	`void GPUParticles3D::set_emitting(bool p_emitting) {`
`44`	`44`	// Do not return even if `p_emitting == emitting` because `emitting` is just an approximation.
`45`		`- if (p_emitting && p_emitting != emitting && !use_fixed_seed) {`
	`45`	`+ if (p_emitting && p_emitting != emitting && !use_fixed_seed && one_shot) {`
`46`	`46`	`set_seed(Math::rand());`
`47`	`47`	`}`
`48`	`48`	`if (p_emitting && one_shot) {`