okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Merge unified-sdl to trunk

Browse source 
* Bump Q3_VERSION to 1.35
This commit is contained in:
Tim Angus 2007-09-05 18:17:46 +00:00
parent 39abffeb3b
commit 672cfbf16f
188 changed files with 5071 additions and 41739 deletions
Download patch file Download diff file Expand all files Collapse all files

4
code/renderer/tr_shader.c
View file

@ -2360,7 +2360,7 @@ shader_t *R_FindShaderByName( const char *name ) {
int hash;
shader_t *sh;
if ( (name==NULL) || (name[0] == 0) ) { // bk001205
if ( (name==NULL) || (name[0] == 0) ) {
return tr.defaultShader;
}
@ -2770,7 +2770,7 @@ it and returns a valid (possibly default) shader_t to be used internally.
*/
shader_t *R_GetShaderByHandle( qhandle_t hShader ) {
if ( hShader < 0 ) {
ri.Printf( PRINT_WARNING, "R_GetShaderByHandle: out of range hShader '%d'\n", hShader ); // bk: FIXME name
ri.Printf( PRINT_WARNING, "R_GetShaderByHandle: out of range hShader '%d'\n", hShader );
return tr.defaultShader;
}
if ( hShader >= tr.numShaders ) {