diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-05-06 16:57:13 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-05-06 16:57:13 -0500 |
| commit | 9609fa72594dd71f8be6417b5a889cfac7112cfd (patch) | |
| tree | 7549ef4fe79639c43a52baeb50d1937c2a343230 /indra/newview/lldrawpoolalpha.cpp | |
| parent | 85a123a3e3b07de57bba18e46bdad615174428da (diff) | |
| parent | 18e3985120d53acdf07d43dce79312b78629e57a (diff) | |
Automated merge with https://bitbucket.org/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]); |