diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-22 22:21:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-22 22:21:33 +0200 |
| commit | cb62c91c1288e37ac096a19873f7e71a362512a0 (patch) | |
| tree | 645d6284f77c292293b9d386f1f951f8ce651ee3 /scene | |
| parent | baabad30f159a8de187d8297b06c5d8f1ca7d9d9 (diff) | |
| parent | 81940c8e57c16c87787f2750364677acdd8d2bf9 (diff) | |
Merge pull request #58600 from Calinou/material-triplanar-sharpness-clamp
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/resources/material.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index 78b6fd7945..bd0e470112 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -2052,8 +2052,9 @@ Vector3 BaseMaterial3D::get_uv1_offset() const { } void BaseMaterial3D::set_uv1_triplanar_blend_sharpness(float p_sharpness) { - uv1_triplanar_sharpness = p_sharpness; - RS::get_singleton()->material_set_param(_get_material(), shader_names->uv1_blend_sharpness, p_sharpness); + // Negative values or values higher than 150 can result in NaNs, leading to broken rendering. + uv1_triplanar_sharpness = CLAMP(p_sharpness, 0.0, 150.0); + RS::get_singleton()->material_set_param(_get_material(), shader_names->uv1_blend_sharpness, uv1_triplanar_sharpness); } float BaseMaterial3D::get_uv1_triplanar_blend_sharpness() const { @@ -2079,8 +2080,9 @@ Vector3 BaseMaterial3D::get_uv2_offset() const { } void BaseMaterial3D::set_uv2_triplanar_blend_sharpness(float p_sharpness) { - uv2_triplanar_sharpness = p_sharpness; - RS::get_singleton()->material_set_param(_get_material(), shader_names->uv2_blend_sharpness, p_sharpness); + // Negative values or values higher than 150 can result in NaNs, leading to broken rendering. + uv2_triplanar_sharpness = CLAMP(p_sharpness, 0.0, 150.0); + RS::get_singleton()->material_set_param(_get_material(), shader_names->uv2_blend_sharpness, uv2_triplanar_sharpness); } float BaseMaterial3D::get_uv2_triplanar_blend_sharpness() const { |