diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-19 22:22:42 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-19 22:22:42 +0300 |
commit | 3a476a8296c78eef1007c6fdca7188e78f9b6280 (patch) | |
tree | 8f4e061aacccf82813048634d22b760adf7f6fe2 /indra/llrender/llrender.cpp | |
parent | 8b5fe507a439c73ac22fdd71c4083d42cf351d79 (diff) | |
parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) |
Merge branch 'master' into DRTVWR-530-maint
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; |