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/pipeline.cpp | |
| parent | 419a06036b8ec172bdfa91ab7f1f7691cdbdb2ca (diff) | |
NORSPEC-151 make disabling bumpyshiny disable adv lighting model as well
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rwxr-xr-x | indra/newview/pipeline.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index c62f099e3b..7317996de6 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1018,7 +1018,8 @@ void LLPipeline::updateRenderDeferred() { BOOL deferred = ((RenderDeferred && LLRenderTarget::sUseFBO && - LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") && + LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") && + LLFeatureManager::getInstance()->isFeatureAvailable("RenderObjectBump") && VertexShaderEnable && RenderAvatarVP && WindLightUseAtmosShaders) ? TRUE : FALSE) && |