diff options
| author | prep <none@none> | 2012-03-13 15:48:24 -0400 |
|---|---|---|
| committer | prep <none@none> | 2012-03-13 15:48:24 -0400 |
| commit | fab57eea612f34ed9d8c8559674ead1760aab42b (patch) | |
| tree | 51394d44e1b89bb75d168464aec539f60f44f8cd /indra/llrender/llshadermgr.cpp | |
| parent | 87b414c4934d0d52eef0b323245568bb1e95ec70 (diff) | |
| parent | 00717147d2b832fa3239267edf409f0a1dfcd9fd (diff) | |
pull and merge from viewer-development
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 1a03aeebb7..908443e8cf 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -94,13 +94,16 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader) } } - if (features->calculatesLighting) + if (features->calculatesLighting || features->atmosphericHelpers) { if (!shader->attachObject("windlight/atmosphericsHelpersV.glsl")) { return FALSE; } + } + if (features->calculatesLighting) + { if (features->isSpecular) { if (!shader->attachObject("lighting/lightFuncSpecularV.glsl")) |