diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-18 03:03:40 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-18 03:03:41 +0200 |
| commit | fd748abaab7c1369613be2754e614041a0339502 (patch) | |
| tree | 2b51b285b484b451a8c5de7417eb45c8106ebdfa /src/render/renderers/opengl/renderer/renderview.cpp | |
| parent | b0db56ded0f38e9f59f379c6ff80b668ed49c743 (diff) | |
| parent | 829675b65b8a9d661828b18bbd2703744d4c3db7 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I830139030c589f9f9354223dc9a73dbe3e137532
Diffstat (limited to 'src/render/renderers/opengl/renderer/renderview.cpp')
| -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 8626d0125..cf4a930bc 100644 --- a/src/render/renderers/opengl/renderer/renderview.cpp +++ b/src/render/renderers/opengl/renderer/renderview.cpp @@ -1100,7 +1100,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) { |