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

Merge pull request #8778 from honix/master

Browse Source 
Particles potential crash fix 2
This commit is contained in:
Rémi Verschelde 2017-05-16 16:34:37 +02:00 committed by GitHub
commit d801ff2b3d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/3d/particles.cpp
View File

@ -48,11 +48,13 @@ void Particles::set_emitting(bool p_emitting) {
void Particles::set_amount(int p_amount) { void Particles::set_amount(int p_amount) {
ERR_FAIL_COND(p_amount < 1);
amount = p_amount; amount = p_amount;
VS::get_singleton()->particles_set_amount(particles, amount); VS::get_singleton()->particles_set_amount(particles, amount);
} }
void Particles::set_lifetime(float p_lifetime) { void Particles::set_lifetime(float p_lifetime) {
ERR_FAIL_COND(p_lifetime <= 0);
lifetime = p_lifetime; lifetime = p_lifetime;
VS::get_singleton()->particles_set_lifetime(particles, lifetime); VS::get_singleton()->particles_set_lifetime(particles, lifetime);
} }