diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-24 13:48:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 13:48:56 +0200 |
| commit | 25022a1d89e83bbad6f4e5d8db0a4f1939bbf3ea (patch) | |
| tree | e8d64bfd21236eb9820079c379093be0328cd52e /drivers | |
| parent | 1cb2b682ab72e2c457b54fdf63628bc1db126c7d (diff) | |
| parent | 64ecc8a5a3e22f92cf480f65249ac5468b9b5b89 (diff) | |
Merge pull request #29974 from clayjohn/particles_restart
Properly set emitting when particles restart
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles3/rasterizer_storage_gles3.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index 0840717d68..96094dd0ad 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -6074,10 +6074,7 @@ void RasterizerStorageGLES3::particles_set_emitting(RID p_particles, bool p_emit Particles *particles = particles_owner.getornull(p_particles); ERR_FAIL_COND(!particles); - if (p_emitting != particles->emitting) { - // Restart is overridden by set_emitting - particles->restart_request = false; - } + particles->emitting = p_emitting; } @@ -6475,7 +6472,6 @@ void RasterizerStorageGLES3::update_particles() { Particles *particles = particle_update_list.first()->self(); if (particles->restart_request) { - particles->emitting = true; //restart from zero particles->prev_ticks = 0; particles->phase = 0; particles->prev_phase = 0; |