diff options
| author | Yuri Sizov <yuris@humnom.net> | 2023-06-12 18:18:51 +0200 |
|---|---|---|
| committer | Yuri Sizov <yuris@humnom.net> | 2023-06-12 18:18:51 +0200 |
| commit | 991f4d51832b71753c30a289b3b2d4d9a019f7fc (patch) | |
| tree | b1958954d707e36cfbd95e9355a2fe0531310886 | |
| parent | 7b1387ff218cd86be77dd7e774542e54251e7ea6 (diff) | |
| download | redot-engine-991f4d51832b71753c30a289b3b2d4d9a019f7fc.tar.gz | |
Avoid error spam when (un)pausing GPUParticles out of tree
| -rw-r--r-- | scene/2d/gpu_particles_2d.cpp | 10 | ||||
| -rw-r--r-- | scene/3d/gpu_particles_3d.cpp | 20 |
2 files changed, 17 insertions, 13 deletions
diff --git a/scene/2d/gpu_particles_2d.cpp b/scene/2d/gpu_particles_2d.cpp index 08c7b8e131..9fd41ff227 100644 --- a/scene/2d/gpu_particles_2d.cpp +++ b/scene/2d/gpu_particles_2d.cpp @@ -551,10 +551,12 @@ void GPUParticles2D::_notification(int p_what) { case NOTIFICATION_PAUSED: case NOTIFICATION_UNPAUSED: { - if (can_process()) { - RS::get_singleton()->particles_set_speed_scale(particles, speed_scale); - } else { - RS::get_singleton()->particles_set_speed_scale(particles, 0); + if (is_inside_tree()) { + if (can_process()) { + RS::get_singleton()->particles_set_speed_scale(particles, speed_scale); + } else { + RS::get_singleton()->particles_set_speed_scale(particles, 0); + } } } break; diff --git a/scene/3d/gpu_particles_3d.cpp b/scene/3d/gpu_particles_3d.cpp index b4131ff4b2..c5ec3ef453 100644 --- a/scene/3d/gpu_particles_3d.cpp +++ b/scene/3d/gpu_particles_3d.cpp @@ -417,15 +417,6 @@ NodePath GPUParticles3D::get_sub_emitter() const { void GPUParticles3D::_notification(int p_what) { switch (p_what) { - case NOTIFICATION_PAUSED: - case NOTIFICATION_UNPAUSED: { - if (can_process()) { - RS::get_singleton()->particles_set_speed_scale(particles, speed_scale); - } else { - RS::get_singleton()->particles_set_speed_scale(particles, 0); - } - } break; - // Use internal process when emitting and one_shot is on so that when // the shot ends the editor can properly update. case NOTIFICATION_INTERNAL_PROCESS: { @@ -450,6 +441,17 @@ void GPUParticles3D::_notification(int p_what) { RS::get_singleton()->particles_set_subemitter(particles, RID()); } break; + case NOTIFICATION_PAUSED: + case NOTIFICATION_UNPAUSED: { + if (is_inside_tree()) { + if (can_process()) { + RS::get_singleton()->particles_set_speed_scale(particles, speed_scale); + } else { + RS::get_singleton()->particles_set_speed_scale(particles, 0); + } + } + } break; + case NOTIFICATION_VISIBILITY_CHANGED: { // Make sure particles are updated before rendering occurs if they were active before. if (is_visible_in_tree() && !RS::get_singleton()->particles_is_inactive(particles)) { |