Skip to content

Commit 7030ac5

Browse files
committed
Merge pull request godotengine#79270 from clayjohn/particle-trails-error
Unify error condition for particles trail lifetime
2 parents 74f1488 + 78ecdb1 commit 7030ac5

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

scene/2d/gpu_particles_2d.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ void GPUParticles2D::set_trail_enabled(bool p_enabled) {
149149
}
150150

151151
void GPUParticles2D::set_trail_lifetime(double p_seconds) {
152-
ERR_FAIL_COND(p_seconds < 0.001);
152+
ERR_FAIL_COND(p_seconds < 0.01);
153153
trail_lifetime = p_seconds;
154154
RS::get_singleton()->particles_set_trails(particles, trail_enabled, trail_lifetime);
155155
queue_redraw();

scene/3d/gpu_particles_3d.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ void GPUParticles3D::set_trail_enabled(bool p_enabled) {
181181
}
182182

183183
void GPUParticles3D::set_trail_lifetime(double p_seconds) {
184-
ERR_FAIL_COND(p_seconds < 0.001);
184+
ERR_FAIL_COND(p_seconds < 0.01);
185185
trail_lifetime = p_seconds;
186186
RS::get_singleton()->particles_set_trails(particles, trail_enabled, trail_lifetime);
187187
}

servers/rendering/renderer_rd/storage_rd/particles_storage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ void ParticlesStorage::particles_set_fractional_delta(RID p_particles, bool p_en
430430
void ParticlesStorage::particles_set_trails(RID p_particles, bool p_enable, double p_length) {
431431
Particles *particles = particles_owner.get_or_null(p_particles);
432432
ERR_FAIL_COND(!particles);
433-
ERR_FAIL_COND(p_length < 0.1);
433+
ERR_FAIL_COND(p_length < 0.01);
434434
p_length = MIN(10.0, p_length);
435435

436436
particles->trails_enabled = p_enable;

0 commit comments

Comments
 (0)