diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-27 16:39:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-27 16:39:03 +0100 |
| commit | 2498151cd66a4ae2c772f31b0171e1aea5e63b27 (patch) | |
| tree | cef3e6c7323620b8f7c1db1da81ee944925a499e /scene/3d/cpu_particles.cpp | |
| parent | 6574c557c962d9e4dd726b494322aea246a0245a (diff) | |
| parent | 24b7f088927e17d80e1e21573b16bee8d3d5d50b (diff) | |
Merge pull request #27259 from humblers/fix-cpuparticles
Ensure non-emitting particles not processed on entering tree
Diffstat (limited to 'scene/3d/cpu_particles.cpp')
| -rw-r--r-- | scene/3d/cpu_particles.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scene/3d/cpu_particles.cpp b/scene/3d/cpu_particles.cpp index 85bc2dd529..469a1e87db 100644 --- a/scene/3d/cpu_particles.cpp +++ b/scene/3d/cpu_particles.cpp @@ -47,7 +47,8 @@ PoolVector<Face3> CPUParticles::get_faces(uint32_t p_usage_flags) const { void CPUParticles::set_emitting(bool p_emitting) { emitting = p_emitting; - set_process_internal(true); + if (emitting) + set_process_internal(true); } void CPUParticles::set_amount(int p_amount) { @@ -1002,9 +1003,11 @@ void CPUParticles::_set_redraw(bool p_redraw) { if (redraw) { VS::get_singleton()->connect("frame_pre_draw", this, "_update_render_thread"); VS::get_singleton()->instance_geometry_set_flag(get_instance(), VS::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE, true); + VS::get_singleton()->multimesh_set_visible_instances(multimesh, -1); } else { VS::get_singleton()->disconnect("frame_pre_draw", this, "_update_render_thread"); VS::get_singleton()->instance_geometry_set_flag(get_instance(), VS::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE, false); + VS::get_singleton()->multimesh_set_visible_instances(multimesh, 0); } #ifndef NO_THREADS update_mutex->unlock(); @@ -1029,7 +1032,7 @@ void CPUParticles::_update_render_thread() { void CPUParticles::_notification(int p_what) { if (p_what == NOTIFICATION_ENTER_TREE) { - _set_redraw(true); + set_process_internal(emitting); } if (p_what == NOTIFICATION_EXIT_TREE) { @@ -1048,8 +1051,6 @@ void CPUParticles::_notification(int p_what) { float delta = get_process_delta_time(); if (emitting) { - - _set_redraw(true); inactive_time = 0; } else { inactive_time += delta; @@ -1065,6 +1066,7 @@ void CPUParticles::_notification(int p_what) { return; } } + _set_redraw(true); bool processed = false; |