diff options
author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-08-26 21:27:46 +0000 |
---|---|---|
committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-08-26 21:27:46 +0000 |
commit | e030ec0ba762165d6ff1c24eca0f692f863daa6e (patch) | |
tree | b016c277887b352e1c90da840cfa98ed0c3369ab /code/renderer/tr_shader.c | |
parent | 8fff917396ba80a670c301e7fd9053cdd3574091 (diff) | |
download | ioquake3-aero-e030ec0ba762165d6ff1c24eca0f692f863daa6e.tar.gz ioquake3-aero-e030ec0ba762165d6ff1c24eca0f692f863daa6e.zip |
* Rewrite of R_LoadImage to make it more generic and data driven
git-svn-id: svn://svn.icculus.org/quake3/trunk@1137 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/renderer/tr_shader.c')
-rw-r--r-- | code/renderer/tr_shader.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c index edcf2bc..3f12269 100644 --- a/code/renderer/tr_shader.c +++ b/code/renderer/tr_shader.c @@ -2416,7 +2416,6 @@ most world construction surfaces. */ shader_t *R_FindShader( const char *name, int lightmapIndex, qboolean mipRawImage ) { char strippedName[MAX_QPATH]; - char fileName[MAX_QPATH]; int i, hash; char *shaderText; image_t *image; @@ -2494,13 +2493,11 @@ shader_t *R_FindShader( const char *name, int lightmapIndex, qboolean mipRawImag // // if not defined in the in-memory shader descriptions, - // look for a single TGA, BMP, or PCX + // look for a single supported image file // - Q_strncpyz( fileName, name, sizeof( fileName ) ); - COM_DefaultExtension( fileName, sizeof( fileName ), ".tga" ); - image = R_FindImageFile( fileName, mipRawImage, mipRawImage, mipRawImage ? GL_REPEAT : GL_CLAMP ); + image = R_FindImageFile( name, mipRawImage, mipRawImage, mipRawImage ? GL_REPEAT : GL_CLAMP ); if ( !image ) { - ri.Printf( PRINT_DEVELOPER, "Couldn't find image for shader %s\n", name ); + ri.Printf( PRINT_DEVELOPER, "Couldn't find image file for shader %s\n", name ); shader.defaultShader = qtrue; return FinishShader(); } |