From a6c3e06e543bef88f25935d1aeb66ff357550f27 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 15 Dec 2012 20:36:17 +0100
Subject: [PATCH] fixed fog in some cells

---
 files/materials/objects.shader | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/materials/objects.shader b/files/materials/objects.shader
index 5ea076342e..25624351c8 100644
--- a/files/materials/objects.shader
+++ b/files/materials/objects.shader
@@ -227,7 +227,7 @@
     float4 worldNormal = shMatrixMult(worldMatrix, float4(normal.xyz, 0));
     waterEyePos = intercept(worldPos, cameraPos.xyz - worldPos, float3(0,1,0), waterLevel);
     caustics = getCaustics(causticMap, worldPos, waterEyePos.xyz, worldNormal.xyz, lightDirectionWS0.xyz, waterLevel, waterTimer, windDir_windSpeed);
-    if (worldPos.y >= waterLevel || waterEnabled != 1)
+    if (worldPos.y >= waterLevel || waterEnabled != 1.f)
         caustics = float3(1,1,1);
 #endif
 
@@ -269,7 +269,7 @@
         
         #if UNDERWATER
         // regular fog only if fragment is above water
-        if (worldPos.y > waterLevel)
+        if (worldPos.y > waterLevel || waterEnabled != 1.f)
         #endif
         shOutputColour(0).xyz = shLerp (shOutputColour(0).xyz, gammaCorrectRead(fogColour), fogValue);
 #endif