diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-22 15:02:25 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-22 15:02:25 -0500 |
commit | 655c2bd33757ce7ad5da2772f2cae8785898cbdb (patch) | |
tree | 319ef56eab5b71af7ce5e94ab6f16b739d83edb8 /indra/newview/lldrawpoolmaterials.cpp | |
parent | 87a033d3bf1af2b3cba1047b720e7d93f535dc46 (diff) | |
parent | 79a89f5d921f99ba7a990a1dbf7428d1d3758bc6 (diff) |
merge
Diffstat (limited to 'indra/newview/lldrawpoolmaterials.cpp')
-rw-r--r-- | indra/newview/lldrawpoolmaterials.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolmaterials.cpp b/indra/newview/lldrawpoolmaterials.cpp index 514411aef5..f92320490a 100644 --- a/indra/newview/lldrawpoolmaterials.cpp +++ b/indra/newview/lldrawpoolmaterials.cpp @@ -96,7 +96,7 @@ void LLDrawPoolMaterials::endDeferredPass(S32 pass) void LLDrawPoolMaterials::renderDeferred(S32 pass) { - U32 type_list[] = + static const U32 type_list[] = { LLRenderPass::PASS_MATERIAL, //LLRenderPass::PASS_MATERIAL_ALPHA, |