Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 7 insertions, 7 deletions

diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
index 938bcc37ff..71b82b77eb 100644
--- a/indra/newview/lldrawpoolwater.cpp
+++ b/indra/newview/lldrawpoolwater.cpp
@@ -49,12 +49,12 @@
 #include "llsettingssky.h"
 #include "llsettingswater.h"
 
-BOOL LLDrawPoolWater::sSkipScreenCopy = FALSE;
-BOOL LLDrawPoolWater::sNeedsReflectionUpdate = TRUE;
-BOOL LLDrawPoolWater::sNeedsDistortionUpdate = TRUE;
+bool LLDrawPoolWater::sSkipScreenCopy = false;
+bool LLDrawPoolWater::sNeedsReflectionUpdate = true;
+bool LLDrawPoolWater::sNeedsDistortionUpdate = true;
 F32 LLDrawPoolWater::sWaterFogEnd = 0.f;
 
-extern BOOL gCubeSnapshot;
+extern bool gCubeSnapshot;
 
 LLDrawPoolWater::LLDrawPoolWater() : LLFacePool(POOL_WATER)
 {
@@ -256,7 +256,7 @@ void LLDrawPoolWater::renderPostDeferred(S32 pass)
 
         if (mShaderLevel == 1)
         {
-            fog_color.mV[VW] = log(fog_density) / log(2);
+            fog_color.mV[VALPHA] = log(fog_density) / log(2);
         }
 
         F32 water_height = environment.getWaterHeight();
@@ -325,8 +325,8 @@ void LLDrawPoolWater::renderPostDeferred(S32 pass)
                 // Note non-void water being drawn, updates required
                 if (!edge)  // SL-16461 remove !LLPipeline::sUseOcclusion check
                 {
-                    sNeedsReflectionUpdate = TRUE;
-                    sNeedsDistortionUpdate = TRUE;
+                    sNeedsReflectionUpdate = true;
+                    sNeedsDistortionUpdate = true;
                 }
             }
         }