diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-15 17:23:51 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-15 17:23:51 -0400 |
| commit | 387732090b7464763f6b5788a50545db243ac4be (patch) | |
| tree | 1023f4c5513a0cab5f5c343e653f2bf7c4c96d68 /indra/newview/llvovolume.cpp | |
| parent | ad09e2111cd980117ae937b79155ef6c24e4567c (diff) | |
| parent | 83608fedb76a346f0f69e1c73769723c4069d9fd (diff) | |
merge up to latest integration repo
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -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 8e811527eb..694ad82914 100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -4185,13 +4185,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; |