From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 2 May 2010 12:34:01 +0000 (+0000)
Subject: get rid of a warning in the shader
X-Git-Tag: xonotic-v0.1.0preview~530
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e587af37eaf05a2e870574ab720238987b98e3d9;p=xonotic%2Fdarkplaces.git

get rid of a warning in the shader

From: Wolfgang (Blub) Bumiller <blub@speed.at>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10118 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=a6064c322ead85b1c7970781a2d045223583781b
---

diff --git a/gl_rmain.c b/gl_rmain.c
index f107146e..d1bcc8da 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -731,7 +731,7 @@ static const char *builtinshaderstring =
 "	gl_FragColor += texture2D(Texture_First, TexCoord1 + PixelSize*UserVec1.x*vec2( 0.707107,  0.707107)) * UserVec1.y;\n"
 "	gl_FragColor += texture2D(Texture_First, TexCoord1 + PixelSize*UserVec1.x*vec2(-0.453990,  0.891007)) * UserVec1.y;\n"
 "	gl_FragColor /= (1.0 + 5.0 * UserVec1.y);\n"
-"	gl_FragColor.rgb = gl_FragColor.rgb * UserVec2.x + vec3(max(0, sobel - UserVec2.z))*UserVec2.y;\n"
+"	gl_FragColor.rgb = gl_FragColor.rgb * UserVec2.x + vec3(max(0.0, sobel - UserVec2.z))*UserVec2.y;\n"
 "#endif\n"
 "\n"
 "#ifdef USESATURATION\n"