diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-03 18:06:45 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-03 18:06:45 -0400 |
| commit | 9acabccdde5cff91cac3bae0502c8ff5b26cada6 (patch) | |
| tree | b6fc95044fc41cdc43969195f9c1939e8ecb0158 /indra/llrender/llshadermgr.h | |
| parent | dd2ede9991a9a31821fbe43a7fa17a5aafa19542 (diff) | |
| parent | 7fa8c2313b47959ba8c0a40d92461f6892e0d0d3 (diff) | |
merge changes for 3.6.0-materials-beta1
Diffstat (limited to 'indra/llrender/llshadermgr.h')
| -rwxr-xr-x | indra/llrender/llshadermgr.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index a33eca4448..c049e935b8 100755 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -109,6 +109,7 @@ public: GLOW_DELTA, MINIMUM_ALPHA, + EMISSIVE_BRIGHTNESS, DEFERRED_SHADOW_MATRIX, DEFERRED_ENV_MAT, |