summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolmaterials.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2014-12-01 16:16:11 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2014-12-01 16:16:11 -0500
commit38a258d04a98939e12bb2cfce6caea288a7fc3a5 (patch)
treef221aca4c34189bb1cced52a2edb86cc67314138 /indra/newview/lldrawpoolmaterials.cpp
parent1135ba80ec569e20187c36a5364debf9eae8aab7 (diff)
parentfa9097b65f9d89fd0c8bf7b32924f0327a617cdc (diff)
merge
Diffstat (limited to 'indra/newview/lldrawpoolmaterials.cpp')
-rw-r--r--indra/newview/lldrawpoolmaterials.cpp2
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,