diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-13 17:20:36 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-13 17:20:36 -0400 |
commit | d516a8729e413e3097c468e8f3c2c39ff73181bd (patch) | |
tree | 3ba17c58af42f23e77199516be4674245328cd86 /indra/newview/llviewerdisplay.cpp | |
parent | 3f001b520c42d9182de89c3cacb79f6684dd0471 (diff) | |
parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) |
merge
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
-rwxr-xr-x | indra/newview/llviewerdisplay.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 981e4c40aa..ea9463da04 100755 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -930,8 +930,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) if (gSavedSettings.getBOOL("RenderDepthPrePass") && LLGLSLShader::sNoFixedFunction) { gGL.setColorMask(false, false); - - U32 types[] = { + + static const U32 types[] = { LLRenderPass::PASS_SIMPLE, LLRenderPass::PASS_FULLBRIGHT, LLRenderPass::PASS_SHINY |