godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10383 from bojidar-bg/x-fix-particles-emitting 

Fix particles emitting when emitting is set to false in scene
This commit is contained in:
Rémi Verschelde 2017-08-17 10:52:35 +02:00 committed by GitHub
parent 2e54c5372d 995fca44b2
commit e2c1792d06
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gles3/rasterizer_storage_gles3.cpp
View File

@ -5177,6 +5177,10 @@ void RasterizerStorageGLES3::particles_set_emitting(RID p_particles, bool p_emit
Particles *particles = particles_owner.getornull(p_particles); Particles *particles = particles_owner.getornull(p_particles);
ERR_FAIL_COND(!particles); ERR_FAIL_COND(!particles);
if (p_emitting != particles->emitting) {
// Restart is overriden by set_emitting
particles->restart_request = false;
}
particles->emitting = p_emitting; particles->emitting = p_emitting;
} }
void RasterizerStorageGLES3::particles_set_amount(RID p_particles, int p_amount) { void RasterizerStorageGLES3::particles_set_amount(RID p_particles, int p_amount) {