mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2024-11-10 14:42:06 +00:00
Removed a (resolved) conflict in this file that was commented out.
This commit is contained in:
parent
a5a674c53d
commit
8d017e3875
1 changed files with 0 additions and 5 deletions
|
@ -1086,12 +1086,7 @@ r_refdef must be set before the first call
|
|||
*/
|
||||
void R_RenderView (void)
|
||||
{
|
||||
//<<<<<<< gl_rmain.c
|
||||
// double time1, time2;
|
||||
//=======
|
||||
double time1 = 0, time2 = 0;
|
||||
// GLfloat colors[4] = {(GLfloat) 0.0, (GLfloat) 0.0, (GLfloat) 1, (GLfloat) 0.20};
|
||||
//>>>>>>> 1.3
|
||||
|
||||
// Fixme: the last argument should be a cvar... r_fog_gamma
|
||||
GLfloat colors[4] = {(GLfloat) 0.0, (GLfloat) 0.0, (GLfloat) 1, (GLfloat) 0.15};
|
||||
|
|
Loading…
Reference in a new issue