diff options
author | Graham Madarasz <graham@lindenlab.com> | 2013-05-07 12:42:32 -0700 |
---|---|---|
committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-07 12:42:32 -0700 |
commit | 1f5f0a4b060ca22ccc6b5764cb8f947d68ec87e2 (patch) | |
tree | 240f028339bc20371e73bda0161c5e5b44a6f6e8 /indra/llprimitive/llmaterial.cpp | |
parent | 792f606093daf89873342d3465eda296e329d407 (diff) | |
parent | 29246e8a1fa1f8ebec307cc32017910d1e4ab5f4 (diff) |
Merge vwr-dev-mat
Diffstat (limited to 'indra/llprimitive/llmaterial.cpp')
-rw-r--r-- | indra/llprimitive/llmaterial.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/llprimitive/llmaterial.cpp b/indra/llprimitive/llmaterial.cpp index bd98aa040a..ce443dea1d 100644 --- a/indra/llprimitive/llmaterial.cpp +++ b/indra/llprimitive/llmaterial.cpp @@ -186,12 +186,19 @@ bool LLMaterial::operator != (const LLMaterial& rhs) const } -U32 LLMaterial::getShaderMask() +U32 LLMaterial::getShaderMask(U32 alpha_mode) { //NEVER incorporate this value into the message system -- this function will vary depending on viewer implementation U32 ret = 0; //two least significant bits are "diffuse alpha mode" - ret = getDiffuseAlphaMode(); + if (alpha_mode != DIFFUSE_ALPHA_MODE_DEFAULT) + { + ret = alpha_mode; + } + else + { + ret = getDiffuseAlphaMode(); + } llassert(ret < SHADER_COUNT); |