diff options
Diffstat (limited to 'indra/llprimitive/llmaterial.cpp')
| -rw-r--r-- | indra/llprimitive/llmaterial.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/indra/llprimitive/llmaterial.cpp b/indra/llprimitive/llmaterial.cpp index e6d2790a5f..57ceb3e11b 100644 --- a/indra/llprimitive/llmaterial.cpp +++ b/indra/llprimitive/llmaterial.cpp @@ -106,16 +106,10 @@ LLMaterial::LLMaterial() , mEnvironmentIntensity(LLMaterial::DEFAULT_ENV_INTENSITY) , mDiffuseAlphaMode(LLMaterial::DIFFUSE_ALPHA_MODE_BLEND) , mAlphaMaskCutoff(0) - , mIsDiffuseAlphaInvalid(false) - , mIsNormalInvalid(false) - , mIsSpecularInvalid(false) { } LLMaterial::LLMaterial(const LLSD& material_data) - : mIsDiffuseAlphaInvalid(false) - , mIsNormalInvalid(false) - , mIsSpecularInvalid(false) { fromLLSD(material_data); } @@ -205,17 +199,13 @@ U32 LLMaterial::getShaderMask(U32 alpha_mode) { ret = getDiffuseAlphaMode(); } - if (mIsDiffuseAlphaInvalid && ret != DIFFUSE_ALPHA_MODE_DEFAULT) - { - ret = alpha_mode != DIFFUSE_ALPHA_MODE_NONE; - } llassert(ret < SHADER_COUNT); //next bit is whether or not specular map is present const U32 SPEC_BIT = 0x4; - if (getSpecularID().notNull() && !mIsSpecularInvalid) + if (getSpecularID().notNull()) { ret |= SPEC_BIT; } @@ -224,7 +214,7 @@ U32 LLMaterial::getShaderMask(U32 alpha_mode) //next bit is whether or not normal map is present const U32 NORM_BIT = 0x8; - if (getNormalID().notNull() && !mIsNormalInvalid) + if (getNormalID().notNull()) { ret |= NORM_BIT; } |