From 40013ba1c7fdaa231b0475da00b8cf3b32ba348f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20de=20l=27Hamaide?= <clemaez@hotmail.fr>
Date: Mon, 21 Oct 2013 13:27:35 +0200
Subject: [PATCH] ubershader: restore lightmap feature

---
 Shaders/ubershader-lightfield.frag | 2 +-
 Shaders/ubershader.frag            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Shaders/ubershader-lightfield.frag b/Shaders/ubershader-lightfield.frag
index f62b6f5e3..4646e430d 100644
--- a/Shaders/ubershader-lightfield.frag
+++ b/Shaders/ubershader-lightfield.frag
@@ -341,7 +341,7 @@ void main (void)
             } else {
                 lightmapcolor = lightmapTexel.rgb * lightmap_r_color * lightmapFactor.r;
             }
-        fragColor.rgb = max(fragColor.rgb, lightmapcolor * gl_FrontMaterial.diffuse.rgb * mixedcolor);
+        fragColor.rgb = max(fragColor.rgb, lightmapcolor * gl_FrontMaterial.diffuse.rgb * smoothstep(0.0, 1.0, mixedcolor*.5 + lightmapcolor*.5));
         }
     //////////////////////////////////////////////////////////////////////
     // END lightmap
diff --git a/Shaders/ubershader.frag b/Shaders/ubershader.frag
index c67a5e210..3a8beebae 100644
--- a/Shaders/ubershader.frag
+++ b/Shaders/ubershader.frag
@@ -192,7 +192,7 @@ void main (void)
 		} else {
 			lightmapcolor = lightmapTexel.rgb * lightmap_r_color * lightmapFactor.r;
 		}
-		fragColor.rgb = max(fragColor.rgb, lightmapcolor * gl_FrontMaterial.diffuse.rgb * mixedcolor);
+		fragColor.rgb = max(fragColor.rgb, lightmapcolor * gl_FrontMaterial.diffuse.rgb * smoothstep(0.0, 1.0, mixedcolor*.5 + lightmapcolor*.5));
 	}
 //////////////////////////////////////////////////////////////////////
 // END lightmap
@@ -200,4 +200,4 @@ void main (void)
 
 	fragColor.rgb = fog_Func(fragColor.rgb, fogType);
 	gl_FragColor = fragColor;
-}
\ No newline at end of file
+}