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

Merge branch 'master' into sdl2

Browse source
This commit is contained in:
Tim Angus 2013-09-16 22:34:51 +01:00
commit 76e49b668e
31 changed files with 1353 additions and 568 deletions
Download patch file Download diff file Expand all files Collapse all files

5
code/renderergl1/tr_image.c
View file

@ -1602,6 +1602,11 @@ qhandle_t RE_RegisterSkin( const char *name ) {
// parse the shader name
token = CommaParse( &text_p );
if ( skin->numSurfaces >= MD3_MAX_SURFACES ) {
ri.Printf( PRINT_WARNING, "WARNING: Ignoring surfaces in '%s', the max is %d surfaces!\n", name, MD3_MAX_SURFACES );
break;
}
surf = skin->surfaces[ skin->numSurfaces ] = ri.Hunk_Alloc( sizeof( *skin->surfaces[0] ), h_low );
Q_strncpyz( surf->name, surfName, sizeof( surf->name ) );
surf->shader = R_FindShader( token, LIGHTMAP_NONE, qtrue );