summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-05-01 08:11:15 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-05-01 08:11:15 -0700
commit025c8909582f59f68f786d52bea06f5a272df0b5 (patch)
tree6d9980e216f89c74776155432b32e6778f3b6367 /indra/newview/pipeline.cpp
parent536a30d7f2083d39dbd6d06f16fa53064c3ee379 (diff)
parent70c1e21956b8589c9873ac5fa6a05467dc2e0a89 (diff)
Merge vwr-dev-mat
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rwxr-xr-xindra/newview/pipeline.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index b7dd11e78d..f053d26172 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1677,7 +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
- 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;
}
}