ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2025-01-10 03:51:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix obj crash (#399)

Browse source
This commit is contained in:
Pan7 2017-02-21 18:45:37 +01:00 committed by Jay Dolan
parent 1d0feb0a4a
commit d90ddd6cf8
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libs/picomodel/pm_obj.c
View file

@ -863,12 +863,15 @@ static picoModel_t *_obj_load( PM_PARAMS_LOAD ){
else if ( !_pico_stricmp( p->token, "usemtl" ) ) { else if ( !_pico_stricmp( p->token, "usemtl" ) ) {
char *materialName; char *materialName;
materialName = _pico_parse( p, 0 ); materialName = _pico_parse( p, 0 );
if( materialName || strlen( materialName ) ) { if( materialName && strlen( materialName ) ) {
picoShader_t *shader; picoShader_t *shader;
shader = PicoFindShader( model, materialName, 0 ); shader = PicoFindShader( model, materialName, 0 );
if( !shader ) { if( !shader ) {
shader = PicoNewShader( model ); shader = PicoNewShader( model );
PicoSetShaderName( shader, materialName ); if( shader ) {
PicoSetShaderMapName( shader, materialName );
PicoSetShaderName( shader, materialName );
}
} }
if( shader && curSurface ) { if( shader && curSurface ) {
PicoSetSurfaceShader( curSurface, shader ); PicoSetSurfaceShader( curSurface, shader );