diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-11-13 14:26:15 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-11-13 14:26:15 +0200 |
| commit | 9de2af8b2dde7dc326f970d61950bebc565883f6 (patch) | |
| tree | 87d799179a0fdb1ad6279f62a4f41747dedfce19 /indra/newview/pipeline.cpp | |
| parent | 8da9e0ffd73e30a55734864e49a6ec917e3bee00 (diff) | |
MAINT-7847 Remake of 'white alpfa' fix
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index d3be5fea1a..138d186e06 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1691,7 +1691,7 @@ U32 LLPipeline::getPoolTypeFromTE(const LLTextureEntry* te, LLViewerTexture* ima alpha = alpha || (imagep->getComponents() == 4 && imagep->getType() != LLViewerTexture::MEDIA_TEXTURE) || (imagep->getComponents() == 2); } - if (alpha && mat) + if (alpha && mat && !mat->isDiffuseAlphaInvalid()) { switch (mat->getDiffuseAlphaMode()) { @@ -1712,7 +1712,7 @@ U32 LLPipeline::getPoolTypeFromTE(const LLTextureEntry* te, LLViewerTexture* ima { return LLDrawPool::POOL_ALPHA; } - else if ((te->getBumpmap() || te->getShiny()) && (!mat || mat->getNormalID().isNull())) + else if ((te->getBumpmap() || te->getShiny()) && (!mat || mat->getNormalID().isNull() || mat->isNormalInvalid())) { return LLDrawPool::POOL_BUMP; } |