diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-19 09:09:20 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-19 09:09:20 -0500 |
| commit | 1333e9332a074e25178cd28b351bb40998617e10 (patch) | |
| tree | c229dd9782a27e3c72d7d99c4a6e15367fb8dbd9 /indra/newview/lldrawpoolmaterials.cpp | |
| parent | 6a3cb427071641585d9beb44c3e46a148f90a791 (diff) | |
| parent | 4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff) | |
merge changes for 3.7.23
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, |