diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-09-24 18:05:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-24 18:05:44 +0200 |
| commit | 0c3335d1f3e83c5a95ceb93bb84da776e3fb7e63 (patch) | |
| tree | 1f7f206b2e1a776333737a442f90daad1ad1002a /scene/resources | |
| parent | 2b628e5d5b1b955beb599199e681b38edb5394a4 (diff) | |
| parent | bc94203addfddfab386878125d98c52765d489ad (diff) | |
Merge pull request #32309 from clayjohn/particles_tex_scale
Fix particles scale randomization
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/particles_material.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/resources/particles_material.cpp b/scene/resources/particles_material.cpp index dc6ef2b49c..969743f78c 100644 --- a/scene/resources/particles_material.cpp +++ b/scene/resources/particles_material.cpp @@ -567,8 +567,8 @@ void ParticlesMaterial::_update_shader() { } } //scale by scale - code += " float base_scale = mix(scale * tex_scale, 1.0, scale_random * scale_rand);\n"; - code += " if (base_scale == 0.0) {\n"; + code += " float base_scale = tex_scale * mix(scale, 1.0, scale_random * scale_rand);\n"; + code += " if (base_scale < 0.000001) {\n"; code += " base_scale = 0.000001;\n"; code += " }\n"; if (trail_size_modifier.is_valid()) { |