diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-12-20 22:03:06 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-12-20 22:03:06 +0200 |
| commit | 9fe126e7e5be64ff4251b285eb168ff9c45e76fb (patch) | |
| tree | ccda5cea245f6dad1e98de8c3bfd4519f523d558 /indra/newview/pipeline.cpp | |
| parent | de8ff2c7b397f22d1e15b21e7553a8c3e3933d45 (diff) | |
Backed out changeset: 761e890970b2
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 138d186e06..d3be5fea1a 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 && !mat->isDiffuseAlphaInvalid()) + if (alpha && mat) { 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() || mat->isNormalInvalid())) + else if ((te->getBumpmap() || te->getShiny()) && (!mat || mat->getNormalID().isNull())) { return LLDrawPool::POOL_BUMP; } |