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

Merge pull request #10297 from leezh/fix_10181

Browse source 
Disabling Particles::one_shot restarts emission
This commit is contained in:
Rémi Verschelde 2017-08-13 17:25:58 +02:00 committed by GitHub
commit 26137f37eb
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scene/2d/particles_2d.cpp
View file

@ -55,6 +55,8 @@ void Particles2D::set_one_shot(bool p_enable) {
one_shot = p_enable; one_shot = p_enable;
VS::get_singleton()->particles_set_one_shot(particles, one_shot); VS::get_singleton()->particles_set_one_shot(particles, one_shot);
if (!one_shot && emitting)
VisualServer::get_singleton()->particles_restart(particles);
} }
void Particles2D::set_pre_process_time(float p_time) { void Particles2D::set_pre_process_time(float p_time) {

2
scene/3d/particles.cpp
View file

@ -63,6 +63,8 @@ void Particles::set_one_shot(bool p_one_shot) {
one_shot = p_one_shot; one_shot = p_one_shot;
VS::get_singleton()->particles_set_one_shot(particles, one_shot); VS::get_singleton()->particles_set_one_shot(particles, one_shot);
if (!one_shot && emitting)
VisualServer::get_singleton()->particles_restart(particles);
} }
void Particles::set_pre_process_time(float p_time) { void Particles::set_pre_process_time(float p_time) {