diff options
author | Geenz <geenz@geenzo.com> | 2013-04-29 14:21:02 -0400 |
---|---|---|
committer | Geenz <geenz@geenzo.com> | 2013-04-29 14:21:02 -0400 |
commit | a8a3401d78058fb8fea68acfc96fbe61ebcbc358 (patch) | |
tree | 110a2ae17928e14b818c33196590dee93755f78c /indra/newview/pipeline.cpp | |
parent | 2a96a5f3eae9c0cf5a239a6734a8a656a71c2cb7 (diff) | |
parent | 243c7bd06441af0c286d71d6ff0b7d488285bc1c (diff) |
Merged with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r-- | indra/newview/pipeline.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 9b7608e197..1957345b6d 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1677,14 +1677,7 @@ U32 LLPipeline::getPoolTypeFromTE(const LLTextureEntry* te, LLViewerTexture* ima alpha = false; break; default: //alpha mode set to "mask", go to alpha pool if fullbright - if (te->getFullbright()) - { - alpha = true; - } - else - { - alpha = false; // Material's alpha mode is set to none, mask, or emissive. Toss it into the opaque material draw pool. - } + alpha = false; // Material's alpha mode is set to none, mask, or emissive. Toss it into the opaque material draw pool. break; } } |