diff options
| author | Tim Angus <tim@ngus.net> | 2016-04-09 17:57:28 +0100 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2016-04-09 17:57:28 +0100 |
| commit | f45fbef604e05144057dec8d1dbfc5d4f5a2a822 (patch) | |
| tree | 152d2a428b078f7a89756ea9e156695fc69f1686 /src/renderergl2/tr_surface.c | |
| parent | 7f9e97d611b4b267d9dd913144cb9632f96c90c2 (diff) | |
| parent | 87abdd914988724e164ffb16380ad26be8420b84 (diff) | |
Merge branch 'master' into gpp
Diffstat (limited to 'src/renderergl2/tr_surface.c')
| -rw-r--r-- | src/renderergl2/tr_surface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/renderergl2/tr_surface.c b/src/renderergl2/tr_surface.c index e6146eef..92802f38 100644 --- a/src/renderergl2/tr_surface.c +++ b/src/renderergl2/tr_surface.c @@ -576,7 +576,7 @@ static void RB_SurfaceBeam( void ) VectorAdd( start_points[i], direction, end_points[i] ); } - GL_Bind( tr.whiteImage ); + GL_BindToTMU( tr.whiteImage, TB_COLORMAP ); GL_State( GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE ); @@ -1519,7 +1519,7 @@ Draws x/y/z lines from the origin for orientation debugging static void RB_SurfaceAxis( void ) { // FIXME: implement this #if 0 - GL_Bind( tr.whiteImage ); + GL_BindToTMU( tr.whiteImage, TB_COLORMAP ); GL_State( GLS_DEFAULT ); qglLineWidth( 3 ); qglBegin( GL_LINES ); |