summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.cpp
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-07-28 14:03:56 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-07-28 14:03:56 -0700
commit0f5dbc1935b17d41b98d26f550cf67d3faa69dce (patch)
tree18ba395807fa44a69a37448dfb685bc95395b8a0 /indra/newview/llvovolume.cpp
parent73703191e0fc91e022d01c91740c1deade8cbaf5 (diff)
NORSPEC-314 fix the fullbright alpha mask logic
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rwxr-xr-xindra/newview/llvovolume.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index c4b4c76254..406591046f 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5385,7 +5385,11 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std::
{
bool material_pass = false;
- if (fullbright)
+ // do NOT use 'fullbright' for this logic or you risk sending
+ // things without normals down the materials pipeline and will
+ // render poorly if not crash NORSPEC-240,314
+ //
+ if (te->getFullbright())
{
if (mat->getDiffuseAlphaMode() == LLMaterial::DIFFUSE_ALPHA_MODE_MASK)
{