diff options
author | Richard Linden <none@none> | 2012-01-17 12:05:23 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2012-01-17 12:05:23 -0800 |
commit | 37593f276cacb9db7f1f8ed8ff6c1fe1b56ff883 (patch) | |
tree | 2ec32a4cf984cde8a003f45b324de328f318c675 /indra/llrender/llglslshader.h | |
parent | 944814941d16e7853ff365acc17a16b3a20ac9cb (diff) | |
parent | facb0fa42cf7dbc4deb3a4026cc216aa0099111e (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
Diffstat (limited to 'indra/llrender/llglslshader.h')
-rw-r--r-- | indra/llrender/llglslshader.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h index 2a6c050eac..00b4b0dbd4 100644 --- a/indra/llrender/llglslshader.h +++ b/indra/llrender/llglslshader.h @@ -36,6 +36,7 @@ public: bool calculatesLighting; bool calculatesAtmospherics; bool hasLighting; // implies no transport (it's possible to have neither though) + bool isAlphaLighting; // indicates lighting shaders need not be linked in (lighting performed directly in alpha shader to match deferred lighting functions) bool isShiny; bool isFullbright; // implies no lighting bool isSpecular; |