From 78ecdb17f955b39decfc8122f8ba276640d2da85 Mon Sep 17 00:00:00 2001 From: clayjohn Date: Mon, 10 Jul 2023 10:17:27 +0200 Subject: [PATCH] Unify error condition for particles trail lifetime --- scene/2d/gpu_particles_2d.cpp | 2 +- scene/3d/gpu_particles_3d.cpp | 2 +- servers/rendering/renderer_rd/storage_rd/particles_storage.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scene/2d/gpu_particles_2d.cpp b/scene/2d/gpu_particles_2d.cpp index 078a73c5836..735159c6606 100644 --- a/scene/2d/gpu_particles_2d.cpp +++ b/scene/2d/gpu_particles_2d.cpp @@ -149,7 +149,7 @@ void GPUParticles2D::set_trail_enabled(bool p_enabled) { } void GPUParticles2D::set_trail_lifetime(double p_seconds) { - ERR_FAIL_COND(p_seconds < 0.001); + ERR_FAIL_COND(p_seconds < 0.01); trail_lifetime = p_seconds; RS::get_singleton()->particles_set_trails(particles, trail_enabled, trail_lifetime); queue_redraw(); diff --git a/scene/3d/gpu_particles_3d.cpp b/scene/3d/gpu_particles_3d.cpp index 4ac81d63b6e..4d0bc8b02f8 100644 --- a/scene/3d/gpu_particles_3d.cpp +++ b/scene/3d/gpu_particles_3d.cpp @@ -181,7 +181,7 @@ void GPUParticles3D::set_trail_enabled(bool p_enabled) { } void GPUParticles3D::set_trail_lifetime(double p_seconds) { - ERR_FAIL_COND(p_seconds < 0.001); + ERR_FAIL_COND(p_seconds < 0.01); trail_lifetime = p_seconds; RS::get_singleton()->particles_set_trails(particles, trail_enabled, trail_lifetime); } diff --git a/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp b/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp index b36e027f076..6bfc0403cfc 100644 --- a/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp +++ b/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp @@ -430,7 +430,7 @@ void ParticlesStorage::particles_set_fractional_delta(RID p_particles, bool p_en void ParticlesStorage::particles_set_trails(RID p_particles, bool p_enable, double p_length) { Particles *particles = particles_owner.get_or_null(p_particles); ERR_FAIL_COND(!particles); - ERR_FAIL_COND(p_length < 0.1); + ERR_FAIL_COND(p_length < 0.01); p_length = MIN(10.0, p_length); particles->trails_enabled = p_enable;