diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-04-14 17:26:22 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-04-15 14:30:59 +0000 |
| commit | bad9cd31fc9f3bb911f59439c0468f8dc7170646 (patch) | |
| tree | 60d5a6afcd93a3adeb2f324dfa7d4e8bab6a8735 /src/render/renderers/opengl/renderer/renderview.cpp | |
| parent | 100175e92d6adb346169eda0392b9485ca41a905 (diff) | |
| parent | 276be935bfeccde733bacd4267abeb978f6efda5 (diff) | |
Merge remote-tracking branch origin/5.13 into dev
Change-Id: Ib5c04e9941aeea1a4cd27519b94b9a53e8349ea3
Diffstat (limited to 'src/render/renderers/opengl/renderer/renderview.cpp')
| -rw-r--r-- | src/render/renderers/opengl/renderer/renderview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/render/renderers/opengl/renderer/renderview.cpp b/src/render/renderers/opengl/renderer/renderview.cpp index ff43e74f4..8626d0125 100644 --- a/src/render/renderers/opengl/renderer/renderview.cpp +++ b/src/render/renderers/opengl/renderer/renderview.cpp @@ -102,9 +102,10 @@ int LIGHT_COLOR_NAMES[MAX_LIGHTS]; int LIGHT_INTENSITY_NAMES[MAX_LIGHTS]; QString LIGHT_STRUCT_NAMES[MAX_LIGHTS]; +bool wasInitialized = false; + } // anonymous namespace -bool wasInitialized = false; RenderView::StandardUniformsNameToTypeHash RenderView::ms_standardUniformSetters; |