summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2019-04-25 14:43:27 +0100
committerMike Krus <mike.krus@kdab.com>2019-05-13 05:54:01 +0000
commit2b0f52bd4c2c9035d5ca1672e4ce4229490eb655 (patch)
tree6d04246acb64c6e57ad50276e2d3070ce5a64a81
parent7a310b1f813e3f3c2759c7b316ed9af30f57d5cd (diff)
Fix number of lights
When an environment map is in use, no extra light is added and the count should be 0. Change-Id: Ieb14c48dd9627530b7b7b0682a20096237635d4d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r--src/render/renderers/opengl/renderer/renderview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/renderers/opengl/renderer/renderview.cpp b/src/render/renderers/opengl/renderer/renderview.cpp
index 47e6a8fb1..be9968d06 100644
--- a/src/render/renderers/opengl/renderer/renderview.cpp
+++ b/src/render/renderers/opengl/renderer/renderview.cpp
@@ -1042,7 +1042,7 @@ void RenderView::setShaderAndUniforms(RenderCommand *command,
}
if (uniformNamesIds.contains(LIGHT_COUNT_NAME_ID))
- setUniformValue(command->m_parameterPack, LIGHT_COUNT_NAME_ID, UniformValue(qMax(1, lightIdx)));
+ setUniformValue(command->m_parameterPack, LIGHT_COUNT_NAME_ID, UniformValue(qMax((environmentLight ? 0 : 1), lightIdx)));
// If no active light sources and no environment light, add a default light
if (activeLightSources.isEmpty() && !environmentLight) {