diff options
| author | Hein-Pieter van Braam <hp@tmm.cx> | 2019-02-27 00:19:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-27 00:19:32 +0100 |
| commit | 270bbee018ff42f3e9fa400d960a6c63a4918f3a (patch) | |
| tree | fd496c749af384ce92055ae5908d6d7db0b93fee | |
| parent | 28a57c2c291366980bad267e194d192e02105c6d (diff) | |
| parent | 7f289304af9484ad3aa145adc221d5b12608d539 (diff) | |
Merge pull request #26316 from marxin/fix-26100-Wextra-warning
Fix #26100 by casting to integer.
| -rw-r--r-- | drivers/gles3/rasterizer_scene_gles3.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gles3/rasterizer_scene_gles3.cpp b/drivers/gles3/rasterizer_scene_gles3.cpp index 4cf9054bf6..e645e39f3f 100644 --- a/drivers/gles3/rasterizer_scene_gles3.cpp +++ b/drivers/gles3/rasterizer_scene_gles3.cpp @@ -5053,7 +5053,7 @@ void RasterizerSceneGLES3::initialize() { state.scene_shader.add_custom_define("#define MAX_LIGHT_DATA_STRUCTS " + itos(state.max_ubo_lights) + "\n"); state.scene_shader.add_custom_define("#define MAX_FORWARD_LIGHTS " + itos(state.max_forward_lights_per_object) + "\n"); - state.max_ubo_reflections = MIN(RenderList::MAX_REFLECTIONS, max_ubo_size / sizeof(ReflectionProbeDataUBO)); + state.max_ubo_reflections = MIN((int)RenderList::MAX_REFLECTIONS, max_ubo_size / sizeof(ReflectionProbeDataUBO)); state.reflection_array_tmp = (uint8_t *)memalloc(sizeof(ReflectionProbeDataUBO) * state.max_ubo_reflections); |