summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
Diffstat (limited to 'scene')
-rw-r--r--scene/3d/voxelizer.cpp2
-rw-r--r--scene/resources/material.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/scene/3d/voxelizer.cpp b/scene/3d/voxelizer.cpp
index 4d7054726d..7cf26ab974 100644
--- a/scene/3d/voxelizer.cpp
+++ b/scene/3d/voxelizer.cpp
@@ -1087,7 +1087,7 @@ PoolVector<uint8_t> Voxelizer::get_sdf_3d_image() const {
if (d == 0) {
w[i] = 0;
} else {
- w[i] = CLAMP(d, 0, 254) + 1;
+ w[i] = MIN(d, 254) + 1;
}
}
}
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
index 01e3c4c930..6e2fe01834 100644
--- a/scene/resources/material.cpp
+++ b/scene/resources/material.cpp
@@ -423,6 +423,7 @@ void BaseMaterial3D::_update_shader() {
case TEXTURE_FILTER_LINEAR_WITH_MIPMAPS: texfilter_str = "filter_linear_mipmap"; break;
case TEXTURE_FILTER_NEAREST_WITH_MIMPAMPS_ANISOTROPIC: texfilter_str = "filter_nearest_mipmap_aniso"; break;
case TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC: texfilter_str = "filter_linear_mipmap_aniso"; break;
+ case TEXTURE_FILTER_MAX: break; // Internal value, skip.
}
if (flags[FLAG_USE_TEXTURE_REPEAT]) {