From bc82509ccd1ebd39a7e2c6f64affbe91e0df296f Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 27 Jul 2018 12:20:05 -0700
Subject: [PATCH] fix init on array
---
indra/newview/lldrawpoolwater.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
index f7cc8a31e10..e3dcc44c4d7 100644
--- a/indra/newview/lldrawpoolwater.cpp
+++ b/indra/newview/lldrawpoolwater.cpp
@@ -645,7 +645,7 @@ void LLDrawPoolWater::shade()
shader->uniform1f(LLShaderMgr::WATER_SPECULAR_EXP, light_exp);
if (LLEnvironment::instance().isCloudScrollPaused())
{
- static const std::array<F32, 2> zerowave({{0.0f, 0.0f}});
+ static const std::array<F32, 2> zerowave{ {0.0f, 0.0f} };
shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR1, 1, zerowave.data());
shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR2, 1, zerowave.data());
--
GitLab