diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-13 13:56:09 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-13 13:56:09 +0200 |
| commit | 829675b65b8a9d661828b18bbd2703744d4c3db7 (patch) | |
| tree | 9ed2b9fd867e34ef534f79f10e3493a17bd24b76 /src/render/renderers/opengl | |
| parent | e9642824244fa9fe55dca2cef8e002192a4f1b17 (diff) | |
| parent | 2b0f52bd4c2c9035d5ca1672e4ce4229490eb655 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp
Change-Id: I27de9b83fa6ef6bb319e4b11c932f91f9ff92dc3
Diffstat (limited to 'src/render/renderers/opengl')
| -rw-r--r-- | src/render/renderers/opengl/renderer/renderview.cpp | 2 |
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 de25f55d1..ef86e6669 100644 --- a/src/render/renderers/opengl/renderer/renderview.cpp +++ b/src/render/renderers/opengl/renderer/renderview.cpp @@ -1047,7 +1047,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) { |