Pārlūkot izejas kodu

Fixed emitting not initialized correctly in cpu particles 2d/3d

Fixes uninitialized variable caused by PR #32921
PouleyKetchoupp 5 gadi atpakaļ
vecāks
revīzija
1e0f37a70f
2 mainītis faili ar 8 papildinājumiem un 4 dzēšanām
  1. 4 2
      scene/2d/cpu_particles_2d.cpp
  2. 4 2
      scene/3d/cpu_particles.cpp

+ 4 - 2
scene/2d/cpu_particles_2d.cpp

@@ -260,8 +260,7 @@ void CPUParticles2D::restart() {
 	inactive_time = 0;
 	frame_remainder = 0;
 	cycle = 0;
-
-	set_emitting(true);
+	emitting = false;
 
 	{
 		int pc = particles.size();
@@ -271,6 +270,8 @@ void CPUParticles2D::restart() {
 			w[i].active = false;
 		}
 	}
+
+	set_emitting(true);
 }
 
 void CPUParticles2D::set_direction(Vector2 p_direction) {
@@ -1422,6 +1423,7 @@ CPUParticles2D::CPUParticles2D() {
 	frame_remainder = 0;
 	cycle = 0;
 	redraw = false;
+	emitting = false;
 
 	mesh = VisualServer::get_singleton()->mesh_create();
 	multimesh = VisualServer::get_singleton()->multimesh_create();

+ 4 - 2
scene/3d/cpu_particles.cpp

@@ -240,8 +240,7 @@ void CPUParticles::restart() {
 	inactive_time = 0;
 	frame_remainder = 0;
 	cycle = 0;
-
-	set_emitting(true);
+	emitting = false;
 
 	{
 		int pc = particles.size();
@@ -251,6 +250,8 @@ void CPUParticles::restart() {
 			w[i].active = false;
 		}
 	}
+
+	set_emitting(true);
 }
 
 void CPUParticles::set_direction(Vector3 p_direction) {
@@ -1494,6 +1495,7 @@ CPUParticles::CPUParticles() {
 	frame_remainder = 0;
 	cycle = 0;
 	redraw = false;
+	emitting = false;
 
 	set_notify_transform(true);