diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-07-20 00:57:39 +0300 |
---|---|---|
committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-07-20 00:58:09 +0300 |
commit | b8d846f0eda7edc45fda3c311f0f5864801ed0f5 (patch) | |
tree | a8a1c8b5c5b0117dbff0ed187a72e7c8599745bb /indra/llrender/llrender.cpp | |
parent | a5675bedbb2bd34ce03dd16651dc74d8078efea9 (diff) | |
parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) |
Merge master (DRTVWR-516) into DRTVWR-542-meshopt
Diffstat (limited to 'indra/llrender/llrender.cpp')
-rw-r--r-- | indra/llrender/llrender.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index d515fc707a..03b6aac20c 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -50,6 +50,7 @@ U32 LLRender::sUIVerts = 0; U32 LLTexUnit::sWhiteTexture = 0; bool LLRender::sGLCoreProfile = false; bool LLRender::sNsightDebugSupport = false; +LLVector2 LLRender::sUIGLScaleFactor = LLVector2(1.f, 1.f); static const U32 LL_NUM_TEXTURE_LAYERS = 32; static const U32 LL_NUM_LIGHT_UNITS = 8; |