diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-06-07 21:53:41 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-06-07 21:53:41 +0000 |
| commit | c3d7cd4ac12fd73bf3d7abd402312765a71e06c3 (patch) | |
| tree | 3778170a54540aeda742494df8d18b8383e11f23 /indra/newview/lldrawpoolavatar.cpp | |
| parent | 639acb6ff7495a6840d437dd8473172ec03e200a (diff) | |
| parent | 9dc6a6a1b7ec21a578ac6f5a92eb16037f323824 (diff) | |
Merged in DV528-merge-6.4.20 (pull request #591)
DRTVWR-528 merge up to 6.4.20
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolavatar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index 55b3864b6d..687b13d2c8 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -2129,7 +2129,7 @@ void LLDrawPoolAvatar::renderRigged(LLVOAvatar* avatar, U32 type, bool glow) if (mat) { - switch (LLMaterial::eDiffuseAlphaMode(mat->getDiffuseAlphaModeRender())) + switch (LLMaterial::eDiffuseAlphaMode(mat->getDiffuseAlphaMode())) { case LLMaterial::DIFFUSE_ALPHA_MODE_MASK: { @@ -2267,7 +2267,7 @@ void LLDrawPoolAvatar::renderRigged(LLVOAvatar* avatar, U32 type, bool glow) sVertexProgram->uniform4f(LLShaderMgr::SPECULAR_COLOR, col.mV[0], col.mV[1], col.mV[2], spec); sVertexProgram->uniform1f(LLShaderMgr::ENVIRONMENT_INTENSITY, env); - if (mat->getDiffuseAlphaModeRender() == LLMaterial::DIFFUSE_ALPHA_MODE_MASK) + if (mat->getDiffuseAlphaMode() == LLMaterial::DIFFUSE_ALPHA_MODE_MASK) { F32 cutoff = mat->getAlphaMaskCutoff()/255.f; sVertexProgram->setMinimumAlpha(cutoff); |