summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/renderergl1/tr_local.h1
-rw-r--r--src/renderergl1/tr_shade.c9
-rw-r--r--src/renderergl2/tr_local.h1
-rw-r--r--src/renderergl2/tr_shade.c9
4 files changed, 4 insertions, 16 deletions
diff --git a/src/renderergl1/tr_local.h b/src/renderergl1/tr_local.h
index fcce54fc..0cba2dfe 100644
--- a/src/renderergl1/tr_local.h
+++ b/src/renderergl1/tr_local.h
@@ -263,7 +263,6 @@ typedef struct {
int videoMapHandle;
qboolean isLightmap;
- qboolean vertexLightmap;
qboolean isVideoMap;
} textureBundle_t;
diff --git a/src/renderergl1/tr_shade.c b/src/renderergl1/tr_shade.c
index 0026df7f..b6d6dbaf 100644
--- a/src/renderergl1/tr_shade.c
+++ b/src/renderergl1/tr_shade.c
@@ -1146,12 +1146,7 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
//
// set state
//
- if ( pStage->bundle[0].vertexLightmap && ( (r_vertexLight->integer && !r_uiFullScreen->integer) || glConfig.hardwareType == GLHW_PERMEDIA2 ) && r_lightmap->integer )
- {
- GL_Bind( tr.whiteImage );
- }
- else
- R_BindAnimatedImage( &pStage->bundle[0] );
+ R_BindAnimatedImage( &pStage->bundle[0] );
GL_State( pStage->stateBits );
@@ -1161,7 +1156,7 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
R_DrawElements( input->numIndexes, input->indexes );
}
// allow skipping out to show just lightmaps during development
- if ( r_lightmap->integer && ( pStage->bundle[0].isLightmap || pStage->bundle[1].isLightmap || pStage->bundle[0].vertexLightmap ) )
+ if ( r_lightmap->integer && ( pStage->bundle[0].isLightmap || pStage->bundle[1].isLightmap ) )
{
break;
}
diff --git a/src/renderergl2/tr_local.h b/src/renderergl2/tr_local.h
index 26ac0339..94659fcc 100644
--- a/src/renderergl2/tr_local.h
+++ b/src/renderergl2/tr_local.h
@@ -351,7 +351,6 @@ typedef struct {
int videoMapHandle;
qboolean isLightmap;
- qboolean vertexLightmap;
qboolean isVideoMap;
} textureBundle_t;
diff --git a/src/renderergl2/tr_shade.c b/src/renderergl2/tr_shade.c
index 35d2b283..06dc94b6 100644
--- a/src/renderergl2/tr_shade.c
+++ b/src/renderergl2/tr_shade.c
@@ -1326,12 +1326,7 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
//
// set state
//
- if ( pStage->bundle[0].vertexLightmap && ( (r_vertexLight->integer && !r_uiFullScreen->integer) || glConfig.hardwareType == GLHW_PERMEDIA2 ) && r_lightmap->integer )
- {
- GL_BindToTMU( tr.whiteImage, 0 );
- }
- else
- R_BindAnimatedImageToTMU( &pStage->bundle[0], 0 );
+ R_BindAnimatedImageToTMU( &pStage->bundle[0], 0 );
GLSL_SetUniformInt(sp, UNIFORM_TEXTURE1ENV, 0);
}
@@ -1355,7 +1350,7 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
}
// allow skipping out to show just lightmaps during development
- if ( r_lightmap->integer && ( pStage->bundle[0].isLightmap || pStage->bundle[1].isLightmap || pStage->bundle[0].vertexLightmap ) )
+ if ( r_lightmap->integer && ( pStage->bundle[0].isLightmap || pStage->bundle[1].isLightmap ) )
{
break;
}