diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-06-11 11:45:11 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-06-11 11:45:11 -0700 |
| commit | 0f608cb764856ae8586a9d9631842a782cb70a23 (patch) | |
| tree | 97a12c3bfcc14ae73df00c68141e9519493a0619 /indra/llrender/llshadermgr.h | |
| parent | 97da85de0b1e0f8c2fc60c156c31b237b869230a (diff) | |
| parent | 4fbdfe637049e0a2e93c6fed030e61b32a43ae07 (diff) | |
Merge
Diffstat (limited to 'indra/llrender/llshadermgr.h')
| -rw-r--r-- | indra/llrender/llshadermgr.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index 9919dbe31a..3fac21883f 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -74,6 +74,7 @@ public: PROJECTOR_AMBIENT_LOD, DIFFUSE_COLOR, DIFFUSE_MAP, + ALTERNATE_DIFFUSE_MAP, SPECULAR_MAP, BUMP_MAP, ENVIRONMENT_MAP, @@ -227,6 +228,7 @@ public: SCATTER_TEX, SINGLE_MIE_SCATTER_TEX, ILLUMINANCE_TEX, + BLEND_FACTOR, END_RESERVED_UNIFORMS } eGLSLReservedUniforms; |