asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8772 from honix/master

Browse source 
Particles potential crash fix
This commit is contained in:
Andreas Haas 2017-05-15 20:05:34 +02:00 committed by GitHub
commit aecab985b5
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gles3/rasterizer_storage_gles3.cpp
View file

@ -4859,6 +4859,7 @@ void RasterizerStorageGLES3::particles_set_amount(RID p_particles, int p_amount)
Particles *particles = particles_owner.getornull(p_particles);
ERR_FAIL_COND(!particles);
ERR_FAIL_COND(p_amount < 1);
particles->amount = p_amount;
@ -4912,6 +4913,7 @@ void RasterizerStorageGLES3::particles_set_lifetime(RID p_particles, float p_lif
Particles *particles = particles_owner.getornull(p_particles);
ERR_FAIL_COND(!particles);
ERR_FAIL_COND(p_lifetime <= 0);
particles->lifetime = p_lifetime;
}
void RasterizerStorageGLES3::particles_set_pre_process_time(RID p_particles, float p_time) {