diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-23 14:49:10 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-23 14:49:10 -0700 |
| commit | 71e986b0597341f9fcfb28f71bfbc46d65f08d88 (patch) | |
| tree | 68223bfe71c27f81b8ee172caf05af96f94e1829 /indra/newview | |
| parent | 29216ac5e725254c48711737f5c22d2ad3e5e4a2 (diff) | |
NORSPEC-285 fix merge error with attenuation on alpha masquerading as this norspec from wayback
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/pipeline.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 9f808776ec..b0c73d0304 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -122,6 +122,10 @@ //#define DEBUG_INDICES #endif +// Expensive and currently broken +// +#define MATERIALS_IN_REFLECTIONS 0 + bool gShiftFrame = false; //cached settings @@ -8477,6 +8481,7 @@ void LLPipeline::renderDeferredLighting() } gDeferredSunProgram.uniform3fv(sOffset, slice, offset); + gDeferredSunProgram.uniform2f(LLShaderMgr::DEFERRED_SCREEN_RES, mDeferredLight.getWidth(), mDeferredLight.getHeight()); { LLGLDisable blend(GL_BLEND); |