diff options
author | Dave Parks <davep@lindenlab.com> | 2013-04-18 00:31:17 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2013-04-18 00:31:17 -0500 |
commit | 0e3aa71a69a7f68194ba41b0ea261462eb354d3c (patch) | |
tree | b1c568005af92d022e7796054eadee445a33e494 /indra/llprimitive | |
parent | c7b9b9e02cb771a082c33e073810791ed3158aeb (diff) | |
parent | 67af268b785e8a47d7db10aa3a566c269b0f16e3 (diff) |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/llprimitive')
-rw-r--r-- | indra/llprimitive/llmaterial.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llprimitive/llmaterial.h b/indra/llprimitive/llmaterial.h index df5a45cabd..b294288c64 100644 --- a/indra/llprimitive/llmaterial.h +++ b/indra/llprimitive/llmaterial.h @@ -49,8 +49,11 @@ public: typedef enum { - SHADER_COUNT = 16 + SHADER_COUNT = 16, + ALPHA_SHADER_COUNT = 4 } eShaderCount; + + static const U8 DEFAULT_SPECULAR_LIGHT_EXPONENT = ((U8)(0.2f * 255)); static const LLColor4U DEFAULT_SPECULAR_LIGHT_COLOR; |