Merge pull request #26316 from marxin/fix-26100-Wextra-warning

Fix #26100 by casting to integer.
This commit is contained in:
Hein-Pieter van Braam 2019-02-27 00:19:32 +01:00 committed by GitHub
commit 270bbee018
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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);