diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-07-26 17:49:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-07-26 17:49:41 -0400 |
| commit | 47f2c6bd52a9e929af8ccefa08d11ad18f05602b (patch) | |
| tree | 77d601c23539f576807f3e2cd8a62603b275905d /indra/llrender/llshadermgr.h | |
| parent | bea18c933bd97b838644f0d1738c633495b6b102 (diff) | |
| parent | 19640c015ecfefde767be49168684b27f5ceabb2 (diff) | |
merge callums latest changes
Diffstat (limited to 'indra/llrender/llshadermgr.h')
| -rw-r--r-- | indra/llrender/llshadermgr.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index 50b7c8b9d9..394b38f832 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -215,8 +215,7 @@ public: TERRAIN_ALPHARAMP, SHINY_ORIGIN, - DISPLAY_GAMMA, - INVERSE_TEX_Y, +DISPLAY_GAMMA, END_RESERVED_UNIFORMS } eGLSLReservedUniforms; |