Skip to content

Commit d30aa4b

Browse files
committed
Merge pull request #89432 from clayjohn/proximity-fade-limit
Set a minimum of 0.01 for proximity fade to avoid undefined behavior in shader
2 parents 48b650c + f4c6c80 commit d30aa4b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

scene/resources/material.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2443,8 +2443,8 @@ bool BaseMaterial3D::is_proximity_fade_enabled() const {
24432443
}
24442444

24452445
void BaseMaterial3D::set_proximity_fade_distance(float p_distance) {
2446-
proximity_fade_distance = p_distance;
2447-
RS::get_singleton()->material_set_param(_get_material(), shader_names->proximity_fade_distance, p_distance);
2446+
proximity_fade_distance = MAX(p_distance, 0.01);
2447+
RS::get_singleton()->material_set_param(_get_material(), shader_names->proximity_fade_distance, proximity_fade_distance);
24482448
}
24492449

24502450
float BaseMaterial3D::get_proximity_fade_distance() const {
@@ -2894,7 +2894,7 @@ void BaseMaterial3D::_bind_methods() {
28942894
ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "use_particle_trails"), "set_flag", "get_flag", FLAG_PARTICLE_TRAILS_MODE);
28952895
ADD_GROUP("Proximity Fade", "proximity_fade_");
28962896
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "proximity_fade_enabled"), "set_proximity_fade_enabled", "is_proximity_fade_enabled");
2897-
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "proximity_fade_distance", PROPERTY_HINT_RANGE, "0,4096,0.01,suffix:m"), "set_proximity_fade_distance", "get_proximity_fade_distance");
2897+
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "proximity_fade_distance", PROPERTY_HINT_RANGE, "0.01,4096,0.01,suffix:m"), "set_proximity_fade_distance", "get_proximity_fade_distance");
28982898
ADD_GROUP("MSDF", "msdf_");
28992899
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "msdf_pixel_range", PROPERTY_HINT_RANGE, "1,100,1"), "set_msdf_pixel_range", "get_msdf_pixel_range");
29002900
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "msdf_outline_size", PROPERTY_HINT_RANGE, "0,250,1"), "set_msdf_outline_size", "get_msdf_outline_size");

0 commit comments

Comments
 (0)