summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-04-18 00:31:17 -0500
committerDave Parks <davep@lindenlab.com>2013-04-18 00:31:17 -0500
commit0e3aa71a69a7f68194ba41b0ea261462eb354d3c (patch)
treeb1c568005af92d022e7796054eadee445a33e494 /indra/llprimitive
parentc7b9b9e02cb771a082c33e073810791ed3158aeb (diff)
parent67af268b785e8a47d7db10aa3a566c269b0f16e3 (diff)
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/llprimitive')
-rw-r--r--indra/llprimitive/llmaterial.h5
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;