diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-19 07:48:05 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-19 07:48:05 -0700 |
| commit | 6adc6d71a7147a7f53f266bb05cd0157e34f9f4b (patch) | |
| tree | ad3b8886cd2c09cc1510db6a8c2e2e87ffafb441 /indra/llprimitive | |
| parent | 8bccedd163f1eb25c631e8501bdd468c24e6bf40 (diff) | |
| parent | f9ff68b5e3b016a53fe987e5b51442741ca88f15 (diff) | |
Merge viewer-dev-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; |