From 71a7c8cf72556eac37a88d289aa418f388897f36 Mon Sep 17 00:00:00 2001
From: "gral@who.net" <gral@who.net>
Date: Sat, 28 Aug 2010 00:38:20 +0200
Subject: [PATCH] Removed different colorstrips, flickering between
 forest/herbtundra

---
 Effects/herbtundra.eff | 2 +-
 Shaders/forest.frag    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Effects/herbtundra.eff b/Effects/herbtundra.eff
index ece1a4817..db4129177 100644
--- a/Effects/herbtundra.eff
+++ b/Effects/herbtundra.eff
@@ -11,7 +11,7 @@
         <internal-format>normalized</internal-format>
     </texture>
     <texture n="3">
-        <image>Textures/Terrain/herbtundra-colors.png</image>
+        <image>Textures/Terrain/forest-colors.png</image>
         <filter>linear-mipmap-linear</filter>
         <wrap-s>mirror</wrap-s>
         <internal-format>normalized</internal-format>
diff --git a/Shaders/forest.frag b/Shaders/forest.frag
index 0dc6c620e..de5a60a3d 100644
--- a/Shaders/forest.frag
+++ b/Shaders/forest.frag
@@ -187,5 +187,5 @@ void main (void)
 	if(gl_Fog.density == 1.0)
 		fogFactor=1.0;
 
-	gl_FragColor = mix(gl_Fog.color ,finalColor, fogFactor);
+	gl_FragColor = mix(gl_Fog.color,finalColor, fogFactor);
 }