diff options
| author | Geenz <geenz@geenzo.com> | 2013-04-15 19:40:12 -0400 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-04-15 19:40:12 -0400 |
| commit | c72c3691ecf83875d4ee3e0784b3e76cb4b4633a (patch) | |
| tree | 7959f729f94b8fcd85bb3b32a7b5bb271c746b47 /indra/newview/lldrawpoolalpha.cpp | |
| parent | 39544a3b06e3221602444eb81c7df8c1030c6bb5 (diff) | |
| parent | fafa21315f043ab51e3373e825c85646685778a6 (diff) | |
Merged Graham's stuff amongst others.
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolalpha.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index d8d85b11c7..31b84bb258 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -253,6 +253,10 @@ void LLDrawPoolAlpha::render(S32 pass) simple_shader->setMinimumAlpha(0.33f); pushMaskBatches(LLRenderPass::PASS_ALPHA_MASK, getVertexDataMask() | LLVertexBuffer::MAP_TEXTURE_INDEX, TRUE, TRUE); + pushMaskBatches(LLRenderPass::PASS_MATERIAL_ALPHA_MASK, getVertexDataMask() | LLVertexBuffer::MAP_TEXTURE_INDEX, TRUE, TRUE); + pushMaskBatches(LLRenderPass::PASS_SPECMAP_MASK, getVertexDataMask() | LLVertexBuffer::MAP_TEXTURE_INDEX, TRUE, TRUE); + pushMaskBatches(LLRenderPass::PASS_NORMMAP_MASK, getVertexDataMask() | LLVertexBuffer::MAP_TEXTURE_INDEX, TRUE, TRUE); + pushMaskBatches(LLRenderPass::PASS_NORMSPEC_MASK, getVertexDataMask() | LLVertexBuffer::MAP_TEXTURE_INDEX, TRUE, TRUE); } if (fullbright_shader) { @@ -483,7 +487,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask) current_shader = NULL; } - if (params.mMaterialID != LLMaterialID::null && current_shader == simple_shader) + if (params.mMaterial.notNull() && current_shader == simple_shader) { // I apologize in advance for not giving this its own shader. // We have a material. Supply the appropriate data here. |