summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolmaterials.cpp
diff options
context:
space:
mode:
authorNorthspring <pantera.polnocy@phoenixviewer.com>2014-12-19 23:30:06 +0100
committerNorthspring <pantera.polnocy@phoenixviewer.com>2014-12-19 23:30:06 +0100
commit35a39d5ea1cea63a3356a6cd310a3c3a90644b1c (patch)
tree9f097a8abfe45fb44c2d8f8746a609bdda8acd7f /indra/newview/lldrawpoolmaterials.cpp
parent09e94a2b5d0bf6feb8b2a4f8ad86346f0201714d (diff)
parent4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (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,