summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-05-20 17:07:41 -0500
committerDave Parks <davep@lindenlab.com>2013-05-20 17:07:41 -0500
commit812241856738b065c8d324d5d978e754df198736 (patch)
tree7c646b283b6db8f1d5fc78930d28344e0fc8f7cb
parent9ef64494559dce5f7c0afb271b591036054f01ce (diff)
NORSPEC-197 Fix for fullbright alpha masked objects not rendering
-rwxr-xr-xindra/newview/pipeline.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 19ff1e852d..984ea446fe 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1699,7 +1699,14 @@ U32 LLPipeline::getPoolTypeFromTE(const LLTextureEntry* te, LLViewerTexture* ima
alpha = color_alpha;
break;
default: //alpha mode set to "mask", go to alpha pool if fullbright
- alpha = color_alpha; // Material's alpha mode is set to none, mask, or emissive. Toss it into the opaque material draw pool.
+ if (te->getFullbright())
+ {
+ alpha = true;
+ }
+ else
+ {
+ alpha = color_alpha; // Material's alpha mode is set to none, mask, or emissive. Toss it into the opaque material draw pool.
+ }
break;
}
}