diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-01-13 13:46:45 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-01-13 13:46:45 -0500 |
| commit | 6f3cf79a3afa66db229a1c1068e0c01f246f0b79 (patch) | |
| tree | 5eb6e710adc6a0c770f681fabb44fd385dbef977 /indra/newview/lldrawpoolmaterials.cpp | |
| parent | ccd10beb6f8523c401b08d57e916c85d756eb27e (diff) | |
| parent | fad02b30ce61a38007c5cd450cbdd2e09464888d (diff) | |
merge changes for 3.7.24-release
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, |