Mercurial > octave
changeset 28559:9693beca8e06
maint: merge stable to default.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sat, 11 Jul 2020 15:11:42 +0200 |
parents | 3fe9e1009399 (current diff) c9f7d1d7a6e7 (diff) |
children | 2de5389fc5ab |
files | libinterp/corefcn/gl-render.cc |
diffstat | 1 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/gl-render.cc Fri Jul 10 16:42:50 2020 -0700 +++ b/libinterp/corefcn/gl-render.cc Sat Jul 11 15:11:42 2020 +0200 @@ -4491,12 +4491,9 @@ // Check actual maximum number of lights possible if (m_max_lights == 0) { - for (m_max_lights = 0; m_max_lights < GL_MAX_LIGHTS; m_max_lights++) - { - m_glfcns.glDisable (GL_LIGHT0 + m_max_lights); - if (m_glfcns.glGetError ()) - break; - } + GLint max_lights; + m_glfcns.glGetIntegerv (GL_MAX_LIGHTS, &max_lights); + m_max_lights = max_lights; } #else