diff options
author | Geenz <geenz@geenzo.com> | 2013-01-30 12:45:26 -0500 |
---|---|---|
committer | Geenz <geenz@geenzo.com> | 2013-01-30 12:45:26 -0500 |
commit | 071a53c814cc11631d6f854a4211de3c7c99590e (patch) | |
tree | 98c6ef71d7c114cbbfca0ee4cf73f452737b2602 /indra/newview/llvovolume.cpp | |
parent | aa1befd689703d9fea50399201911e0f8fca6ac6 (diff) | |
parent | 577515e93f122fe64cbf06913b8bacddee96ad22 (diff) |
Merge with latest viewer-dev-materials.
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rw-r--r-- | indra/newview/llvovolume.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index c9d6a34b8a..6c073a8e20 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -4172,7 +4172,6 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep, specColor.mV[2] = facep->getTextureEntry()->getMaterialParams()->getSpecularLightColor().mV[2] * (1.0 / 255); specColor.mV[3] = facep->getTextureEntry()->getMaterialParams()->getSpecularLightExponent() * (1.0 / 255); draw_info->mSpecColor = specColor; - LL_INFOS("Materials") << "Specular Color: " << specColor << LL_ENDL; draw_info->mEnvIntensity = facep->getTextureEntry()->getMaterialParams()->getEnvironmentIntensity() * (1.0 / 255); draw_info->mAlphaMaskCutoff = facep->getTextureEntry()->getMaterialParams()->getAlphaMaskCutoff() * (1.0 / 255); draw_info->mDiffuseAlphaMode = facep->getTextureEntry()->getMaterialParams()->getDiffuseAlphaMode(); |