#5893: Fix crash when rendering shaders without materials in lighting…

… mode. Fix GL program state leak which caused the ortho view grid to appear black
codereader · Jan 28, 2022 · 03bcfae · 03bcfae
1 parent 8ca921b
commit 03bcfae
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/radiantcore/rendersystem/OpenGLRenderSystem.cpp b/radiantcore/rendersystem/OpenGLRenderSystem.cpp
@@ -246,6 +246,11 @@ void OpenGLRenderSystem::setupViewMatrices(const Matrix4& modelview, const Matri
 
 void OpenGLRenderSystem::finishRendering()
 {
+    if (GLEW_ARB_shader_objects)
+    {
+        glUseProgramObjectARB(0);
+    }
+
     glDisableClientState(GL_VERTEX_ARRAY);
     glDisableClientState(GL_COLOR_ARRAY);
     glDisableClientState(GL_TEXTURE_COORD_ARRAY);

diff --git a/radiantcore/rendersystem/backend/LightInteractions.cpp b/radiantcore/rendersystem/backend/LightInteractions.cpp
@@ -105,7 +105,10 @@ void LightInteractions::fillDepthBuffer(OpenGLState& state, RenderStateFlags glo
             auto& surfaceList = pair.second;
 
             // Skip translucent materials
-            if (shader->getMaterial()->getCoverage() == Material::MC_TRANSLUCENT) continue;
+            if (shader->getMaterial() && shader->getMaterial()->getCoverage() == Material::MC_TRANSLUCENT)
+            {
+                continue;
+            }
 
             if (!shader->getDepthFillPass()) continue;