diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-22 09:44:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-22 09:44:59 +0100 |
| commit | 60fe9321ac8b3b7a7f9ba9ddd515bdf515ea8457 (patch) | |
| tree | 94b3c7be9e61ebbc3d5c92772094ffe9b0ae7c0f /scene | |
| parent | 8b231b96e347b677ea4189784c960bc4517b8e6a (diff) | |
| parent | 7de7f0ef178d2800f1ca70c15e8aff8aeb16bb8d (diff) | |
Merge pull request #26099 from marxin/fix-Wtype-limits-warnings
Fix all -Wtype-limits warnings.
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/3d/voxel_light_baker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/3d/voxel_light_baker.cpp b/scene/3d/voxel_light_baker.cpp index 91b3ea6ca0..42c2318701 100644 --- a/scene/3d/voxel_light_baker.cpp +++ b/scene/3d/voxel_light_baker.cpp @@ -2208,7 +2208,7 @@ PoolVector<int> VoxelLightBaker::create_gi_probe_data() { } { - uint16_t alpha = CLAMP(uint32_t(bake_cells[i].alpha * 65535.0), 0, 65535); + uint16_t alpha = MAX(uint32_t(bake_cells[i].alpha * 65535.0), 65535); uint16_t level = bake_cells[i].level; w32[ofs++] = (uint32_t(level) << 16) | uint32_t(alpha); |