summaryrefslogtreecommitdiff
path: root/servers
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-05-25 10:28:19 +0200
committerGitHub <noreply@github.com>2022-05-25 10:28:19 +0200
commit1c99b7415fcfd3a9128c7d2ac70f77477fe55c78 (patch)
treedd15600408f9b0671f2abbade813baa7cb9b6767 /servers
parent360119ffbf3e7690971fe54d3772cb3dffd004ad (diff)
parent3c95a70081b7394ccaa4300b205f93eb0c490cfb (diff)
Merge pull request #57302 from GanidhuAbey/particle_bug
Fix particles freezing by resetting particle timer
Diffstat (limited to 'servers')
-rw-r--r--servers/rendering/renderer_rd/storage_rd/particles_storage.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp b/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp
index e15d3e13a9..58a96ed1f9 100644
--- a/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp
+++ b/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp
@@ -540,11 +540,8 @@ void ParticlesStorage::particles_emit(RID p_particles, const Transform3D &p_tran
_particles_allocate_emission_buffer(particles);
}
- if (particles->inactive) {
- //in case it was inactive, make active again
- particles->inactive = false;
- particles->inactive_time = 0;
- }
+ particles->inactive = false;
+ particles->inactive_time = 0;
int32_t idx = particles->emission_buffer->particle_count;
if (idx < particles->emission_buffer->particle_max) {