# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1594473102 -7200
# Node ID 9693beca8e060779632949b0f2b76860e52f0798
# Parent  3fe9e1009399382a99b7e747d662befabd4d023f# Parent  c9f7d1d7a6e7f5b448bb9c7c9987ceab4676ecd7
maint: merge stable to default.

diff -r 3fe9e1009399 -r 9693beca8e06 libinterp/corefcn/gl-render.cc
--- 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