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 | 04fceb5f006d6f3b9b36996382e4c1483a599dde (patch) | |
| tree | 28085d2cded5908ce654d9ef201f3a67cf804848 /indra/newview/pipeline.cpp | |
| parent | f1975f0fe9d09b0c9cffa94dad31de2c9f0d4849 (diff) | |
NORSPEC-151 make disabling bumpyshiny disable adv lighting model as well
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | 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 f053d26172..4cce654f47 100644 --- 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) && |