diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-05-14 16:20:54 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-05-14 16:20:54 -0500 |
| commit | 46eface63c94ca7e047b731f140aeaacfc4860e4 (patch) | |
| tree | 8b6d4fad01e54ac220d437346737f71366bed2d4 | |
| parent | be712ba6b56bc087c947203290d172275aa975d9 (diff) | |
NORSPEC-181 Fix for performance regression.
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/llvovolume.cpp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 26fbfe2bb0..5c445e9ed0 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1023,6 +1023,7 @@ Ryozu Kojima VWR-287 Sachi Vixen Sahkolihaa Contepomi + MATBUG-102 Saii Hallard SaintLEOlions Zimer Salahzar Stenvaag 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; |