diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-06-26 15:33:07 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-06-26 15:33:07 -0500 |
| commit | 2b5205c74395ca67dde8c2978e26c2e2d5d41b97 (patch) | |
| tree | e94d0ec0c59cedeaf62eab0c88a5cf51db87a92b /indra/newview | |
| parent | bb66e722d3ebf62145784227178ccdd318189cf6 (diff) | |
Merge cleanup.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llviewershadermgr.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index d195971c03..7bce629d3e 100755 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -1366,8 +1366,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred() gDeferredMultiLightProgram[i].mShaderFiles.push_back(make_pair("deferred/multiPointLightF.glsl", GL_FRAGMENT_SHADER_ARB)); gDeferredMultiLightProgram[i].mShaderLevel = mVertexShaderLevel[SHADER_DEFERRED]; gDeferredMultiLightProgram[i].addPermutation("LIGHT_COUNT", llformat("%d", i+1)); - - SINGLE_FP_PERMUTATION(gDeferredMultiLightProgram[i]); success = gDeferredMultiLightProgram[i].createShader(NULL, NULL); } } |