diff options
| author | Graham Madarasz (Graham) <graham@lindenlab.com> | 2013-05-03 09:16:15 -0700 |
|---|---|---|
| committer | Graham Madarasz (Graham) <graham@lindenlab.com> | 2013-05-03 09:16:15 -0700 |
| commit | 9187a06d0bc70ea7670192a5fe53f75ef6f36259 (patch) | |
| tree | 9e902c03d217e9698e7707406defa259b87cc5a3 /indra/newview/llvovolume.cpp | |
| parent | 419a06036b8ec172bdfa91ab7f1f7691cdbdb2ca (diff) | |
NORSPEC-151 make disabling bumpyshiny disable adv lighting model as well
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rwxr-xr-x | indra/newview/llvovolume.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index a08a8a9676..9b940300f5 100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -4152,7 +4152,7 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep, draw_vec.push_back(draw_info); draw_info->mTextureMatrix = tex_mat; draw_info->mModelMatrix = model_mat; - if (mat) + if (mat && LLPipeline::sRenderBump && LLPipeline::sRenderDeferred) { // We have a material. Update our draw info accordingly. draw_info->mMaterial = mat; @@ -4178,6 +4178,7 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep, 0.5f, 0.75f }; + llassert(shiny <= 3); float spec = alpha[shiny]; LLVector4 specColor(spec, spec, spec, spec); draw_info->mSpecColor = specColor; |