diff --git a/doc/contributions.txt b/doc/contributions.txt index 26fbfe2bb0c5452affaa537100fa0777df0bc1f7..5c445e9ed00162dd726a100c06fdbece23df520d 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 1021615255dea63e419cc419854b3bad85e0f0d9..52d05c80300a8dfbe78c3e6a6d6bd7f2a5f0d956 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;