From 43c7250cfde2d4b79896919833a0435275cb8be3 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zturtleman@gmail.com>
Date: Sat, 2 Nov 2013 02:59:31 -0500
Subject: Remove vertexLightmap from textureBundle_t, it's never qtrue
---
src/renderergl1/tr_local.h | 1 -
src/renderergl1/tr_shade.c | 9 ++-------
2 files changed, 2 insertions(+), 8 deletions(-)
(limited to 'src/renderergl1')
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;
}
--
cgit