diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-12-09 23:17:21 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-12-09 23:18:20 +0200 |
| commit | d1c88237c5b5d027ee8891c4013ea8580f5f4364 (patch) | |
| tree | e1c3625ed5ec035c9cbc5648e39ce0bb2619afba /indra/llprimitive/llmaterial.cpp | |
| parent | e538aaabc77deb48b2a724029ccf21ca1eec6694 (diff) | |
Revert "SL-12069 Issues with bakes-on-mesh and alpha modes"
This reverts commit afd734b5f4ba66204f80f7726aa5fec538fcf1e4. Fix will be updated and moved to DRTVWR-515.
Diffstat (limited to 'indra/llprimitive/llmaterial.cpp')
| -rw-r--r-- | indra/llprimitive/llmaterial.cpp | 40 |
1 files changed, 1 insertions, 39 deletions
diff --git a/indra/llprimitive/llmaterial.cpp b/indra/llprimitive/llmaterial.cpp index a1bfc4edd9..a219ac1450 100644 --- a/indra/llprimitive/llmaterial.cpp +++ b/indra/llprimitive/llmaterial.cpp @@ -28,8 +28,6 @@ #include "llmaterial.h" -#include "../llrender/llglheaders.h" - /** * Materials cap parameters */ @@ -107,8 +105,6 @@ LLMaterial::LLMaterial() , mSpecularLightExponent(LLMaterial::DEFAULT_SPECULAR_LIGHT_EXPONENT) , mEnvironmentIntensity(LLMaterial::DEFAULT_ENV_INTENSITY) , mDiffuseAlphaMode(LLMaterial::DIFFUSE_ALPHA_MODE_BLEND) - , mDiffuseFormatPrimary(GL_RGBA) - , mDiffuseBaked(false) , mAlphaMaskCutoff(0) { } @@ -315,20 +311,6 @@ void LLMaterial::setEnvironmentIntensity(U8 intensity) mEnvironmentIntensity = intensity; } -U8 LLMaterial::getDiffuseAlphaModeRender() const -{ - if (mDiffuseBaked - || mDiffuseFormatPrimary == GL_RGBA - || mDiffuseFormatPrimary == GL_ALPHA) - { - return mDiffuseAlphaMode; - } - else - { - return DIFFUSE_ALPHA_MODE_NONE; - } -} - U8 LLMaterial::getDiffuseAlphaMode() const { return mDiffuseAlphaMode; @@ -339,26 +321,6 @@ void LLMaterial::setDiffuseAlphaMode(U8 alpha_mode) mDiffuseAlphaMode = alpha_mode; } -U32 LLMaterial::getDiffuseFormatPrimary() const -{ - return mDiffuseFormatPrimary; -} - -void LLMaterial::setDiffuseFormatPrimary(U32 format_primary) -{ - mDiffuseFormatPrimary = format_primary; -} - -bool LLMaterial::getIsDiffuseBaked() const -{ - return mDiffuseBaked; -} - -void LLMaterial::setDiffuseBaked(bool baked) -{ - mDiffuseBaked = baked; -} - U8 LLMaterial::getAlphaMaskCutoff() const { return mAlphaMaskCutoff; @@ -475,7 +437,7 @@ U32 LLMaterial::getShaderMask(U32 alpha_mode) } else { - ret = getDiffuseAlphaModeRender(); + ret = getDiffuseAlphaMode(); } llassert(ret < SHADER_COUNT); |