diff options
| author | callum_linden <none@none> | 2013-05-15 12:56:47 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2013-05-15 12:56:47 -0700 |
| commit | 83608fedb76a346f0f69e1c73769723c4069d9fd (patch) | |
| tree | 4f467b5c80b4741d608aa4b8ade638da4775da29 /indra/newview | |
| parent | 20fc4bf1867b5165ebc140bd5f7a557874689681 (diff) | |
| parent | 46eface63c94ca7e047b731f140aeaacfc4860e4 (diff) | |
Merge
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llvovolume.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 1021615255..52d05c8030 100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -4183,13 +4183,13 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep, draw_info->mSpecColor = specColor; draw_info->mEnvIntensity = spec; draw_info->mSpecularMap = NULL; + draw_info->mMaterial = mat; + draw_info->mShaderMask = shader_mask; if (mat) { // We have a material. Update our draw info accordingly. - draw_info->mMaterial = mat; - draw_info->mShaderMask = shader_mask; - + if (!mat->getSpecularID().isNull()) { LLVector4 specColor; |