Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Merge pull request #8775 from godotengine/revert-8772-master 

Revert "Particles potential crash fix"
3.0
Andreas Haas 2017-05-15 20:18:54 +07:00 committed by GitHub
parent aecab985b5 c3e43c6d5f
commit 9fa4f1c54c
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gles3/rasterizer_storage_gles3.cpp
Unescape Escape View File

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