summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorZher Huei Lee <lee.zh.92@gmail.com>2017-08-12 16:13:29 +0800
committerZher Huei Lee <lee.zh.92@gmail.com>2017-08-12 18:37:01 +0800
commita625d7edfc60255f019186fabe7f34eb5438295c (patch)
treeeab6399d8e214ac759b3f9e46ccf13a3e74ff56d /scene
parent23f6d3fa69935c90c6cdcee342ae99d226e9b4ab (diff)
Disabling Particles::one_shot restarts emission
Fixes #10181
Diffstat (limited to 'scene')
-rw-r--r--scene/2d/particles_2d.cpp2
-rw-r--r--scene/3d/particles.cpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/scene/2d/particles_2d.cpp b/scene/2d/particles_2d.cpp
index 4aa841131a..a2ec33f403 100644
--- a/scene/2d/particles_2d.cpp
+++ b/scene/2d/particles_2d.cpp
@@ -55,6 +55,8 @@ void Particles2D::set_one_shot(bool p_enable) {
one_shot = p_enable;
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) {
diff --git a/scene/3d/particles.cpp b/scene/3d/particles.cpp
index 081caf4419..d83469da62 100644
--- a/scene/3d/particles.cpp
+++ b/scene/3d/particles.cpp
@@ -63,6 +63,8 @@ void Particles::set_one_shot(bool p_one_shot) {
one_shot = p_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) {