diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-15 15:05:00 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-15 15:05:00 -0700 |
| commit | 5dea7c6b8f6bc0d7306c52b8c9d642f2a7f5dfc5 (patch) | |
| tree | 6b5ab629c02f6830d3bed0b3845e86c5ebc2571c /indra/newview/llvovolume.cpp | |
| parent | f58b17cb29ec85ef15465e3ede27cae9ae3b203f (diff) | |
| parent | 83608fedb76a346f0f69e1c73769723c4069d9fd (diff) | |
Merge
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 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; |