diff options
| author | callum_linden <none@none> | 2013-05-06 19:45:23 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2013-05-06 19:45:23 -0700 |
| commit | 1e7b133e75c2c93290db6b0c9db721e95849ff30 (patch) | |
| tree | 0a329819a22244fb84a0f25d2f3e9c04f0d3dd29 /indra/newview/lldrawpoolalpha.cpp | |
| parent | 90d3045c7f693f599dac64c1845ddc639150fe1e (diff) | |
| parent | 9609fa72594dd71f8be6417b5a889cfac7112cfd (diff) | |
Merge with lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolalpha.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index 1912ae0c16..d5de5d30b0 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -481,7 +481,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask) if (!params.mFullbright && deferred_render && mat) { - U32 mask = mat->getShaderMask(); + U32 mask = params.mShaderMask; llassert(mask < LLMaterial::SHADER_COUNT); target_shader = &(gDeferredMaterialProgram[mask]); |