diff options
author | Graham Madarasz <graham@lindenlab.com> | 2013-05-06 13:45:49 -0700 |
---|---|---|
committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-06 13:45:49 -0700 |
commit | 85a123a3e3b07de57bba18e46bdad615174428da (patch) | |
tree | 9a6b91086609c4efaf4e78edefb0678b09b2fe85 /indra/newview/llvovolume.cpp | |
parent | cd50679da26925b33fbf75992ab122062b222c04 (diff) |
NORSPEC-118 fix regression of 118 from extra conditions added for 151
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rw-r--r-- | indra/newview/llvovolume.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 6cfdc1e9c6..50228476d8 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -4167,7 +4167,7 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep, draw_info->mEnvIntensity = spec; draw_info->mSpecularMap = NULL; - if (mat && LLPipeline::sRenderBump && LLPipeline::sRenderDeferred) + if (mat) { // We have a material. Update our draw info accordingly. draw_info->mMaterial = mat; |