Merge pull request godotengine#119631 from QbieShay/qbe/fix-particle-first-frame

Repiteo · Repiteo · commit eb03ae8fc546 · 2026-06-11T15:18:56.000-05:00
Fix leftover particle data when updating particle buffers.
diff --git a/drivers/gles3/storage/particles_storage.cpp b/drivers/gles3/storage/particles_storage.cpp
@@ -868,6 +868,7 @@ void ParticlesStorage::_particles_update_buffers(Particles *particles) {
 	if (userdata_count != particles->userdata_count) {
 		// Mismatch userdata, re-create buffers.
 		_particles_free_data(particles);
+		particles->restart_request = true;
 	}
 
 	if (particles->amount > 0 && particles->front_process_buffer == 0) {
diff --git a/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp b/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp
@@ -1394,6 +1394,7 @@ void ParticlesStorage::_particles_update_buffers(Particles *particles) {
 		if (particles->particle_buffer.is_null()) {
 			particles->particle_buffer = RD::get_singleton()->storage_buffer_create((sizeof(ParticleData) + userdata_count * sizeof(float) * 4) * total_amount);
 			particles->userdata_count = userdata_count;
+			particles->restart_request = true;
 		}
 
 		PackedByteArray data;

Original file line number	Diff line number	Diff line change
`@@ -868,6 +868,7 @@ void ParticlesStorage::_particles_update_buffers(Particles *particles) {`
`868`	`868`	`if (userdata_count != particles->userdata_count) {`
`869`	`869`	`// Mismatch userdata, re-create buffers.`
`870`	`870`	`_particles_free_data(particles);`
	`871`	`+ particles->restart_request = true;`
`871`	`872`	`}`
`872`	`873`
`873`	`874`	`if (particles->amount > 0 && particles->front_process_buffer == 0) {`
Original file line number	Diff line number	Diff line change
`@@ -1394,6 +1394,7 @@ void ParticlesStorage::_particles_update_buffers(Particles *particles) {`
`1394`	`1394`	`if (particles->particle_buffer.is_null()) {`
`1395`	`1395`	`particles->particle_buffer = RD::get_singleton()->storage_buffer_create((sizeof(ParticleData) + userdata_count * sizeof(float) * 4) * total_amount);`
`1396`	`1396`	`particles->userdata_count = userdata_count;`
	`1397`	`+ particles->restart_request = true;`
`1397`	`1398`	`}`
`1398`	`1399`
`1399`	`1400`	`PackedByteArray data;`