From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 29 Jan 2008 09:14:13 +0000 (+0000)
Subject: by default, don't define UserVec1 to UserVec4 and ClientTime. People who want to... 
X-Git-Tag: xonotic-v0.1.0preview~2475
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3237a047abd29a3badf8be5049269eb924f1e4cc;p=xonotic%2Fdarkplaces.git

by default, don't define UserVec1 to UserVec4 and ClientTime. People who want to use them shall uncomment their declaration in default.glsl.


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8039 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/gl_rmain.c b/gl_rmain.c
index 13215880..6e107095 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -505,11 +505,12 @@ static const char *builtinshaderstring =
 "#ifdef USEGAMMA\n"
 "uniform float GammaCoeff;\n"
 "#endif\n"
-"uniform vec4 UserVec1;\n"
-"uniform vec4 UserVec2;\n"
-"uniform vec4 UserVec3;\n"
-"uniform vec4 UserVec4;\n"
-"uniform float ClientTime;\n"
+"//uncomment these if you want to use them:\n"
+"// uniform vec4 UserVec1;\n"
+"// uniform vec4 UserVec2;\n"
+"// uniform vec4 UserVec3;\n"
+"// uniform vec4 UserVec4;\n"
+"// uniform float ClientTime;\n"
 "void main(void)\n"
 "{\n"
 "	gl_FragColor = texture2D(Texture_First, gl_TexCoord[0].xy);\n"