diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-09 12:39:01 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-09 12:39:01 -0700 |
| commit | 991a3cf40eb22559f89808a87fdeda1d44eaaf8f (patch) | |
| tree | 7ecdda17135130988843d04c278e85e0fb76845d /indra/llprimitive/llmaterial.cpp | |
| parent | 893bcf34f7daa432ce70224b4d30d3c22f9c80ad (diff) | |
| parent | 76f36001e2e09a0a017bffedfe140b181677f590 (diff) | |
Merge
Diffstat (limited to 'indra/llprimitive/llmaterial.cpp')
| -rw-r--r-- | indra/llprimitive/llmaterial.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llprimitive/llmaterial.cpp b/indra/llprimitive/llmaterial.cpp index 7d1ce4ab86..1e92847b38 100644 --- a/indra/llprimitive/llmaterial.cpp +++ b/indra/llprimitive/llmaterial.cpp @@ -51,6 +51,8 @@ #define MATERIALS_CAP_ALPHA_MASK_CUTOFF_FIELD "AlphaMaskCutoff" #define MATERIALS_CAP_DIFFUSE_ALPHA_MODE_FIELD "DiffuseAlphaMode" +const LLColor4U LLMaterial::DEFAULT_SPECULAR_LIGHT_COLOR = LLColor4U::white; + /** * Materials constants */ @@ -99,7 +101,8 @@ LLMaterial::LLMaterial() , mSpecularRepeatX(.0f) , mSpecularRepeatY(.0f) , mSpecularRotation(.0f) - , mSpecularLightExponent(0) + , mSpecularLightColor(LLMaterial::DEFAULT_SPECULAR_LIGHT_COLOR) + , mSpecularLightExponent(LLMaterial::DEFAULT_SPECULAR_LIGHT_EXPONENT) , mEnvironmentIntensity(0) , mDiffuseAlphaMode(0) , mAlphaMaskCutoff(0) @@ -214,3 +217,4 @@ U32 LLMaterial::getShaderMask() return ret; } + |