Merge commit 'ff48e71434a414958e6e56628ccf04284d030784' into master-merge

[xonotic/netradiant.git] / libs / picomodel / pm_ase.c

diff --git a/libs/picomodel/pm_ase.c b/libs/picomodel/pm_ase.c
index 1244eb353d4417569ceac257f0680e4c94130d47..81bb99dbb6c358635a2bb4d1325645d1ca6e79bf 100644 (file)
--- a/libs/picomodel/pm_ase.c
+++ b/libs/picomodel/pm_ase.c
@@ -511,7 +511,7 @@ static picoModel_t *_ase_load( PM_PARAMS_LOAD ){
        PicoSetModelFileName( model, fileName );
 
        /* initialize some stuff */
-       memset( lastNodeName,0,sizeof( lastNodeName ) );
+       memset( lastNodeName, 0, sizeof( lastNodeName ) );
 
        /* parse ase model file */
        while ( 1 )
@@ -540,7 +540,7 @@ static picoModel_t *_ase_load( PM_PARAMS_LOAD ){
                        }
 
                        /* remember node name */
-                       strncpy( lastNodeName,ptr,sizeof( lastNodeName ) );
+                       strncpy( lastNodeName, ptr, sizeof( lastNodeName ) - 1 );
                }
                /* model mesh (originally contained within geomobject) */
                else if ( !_pico_stricmp( p->token,"*mesh" ) ) {
@@ -1041,6 +1041,9 @@ static picoModel_t *_ase_load( PM_PARAMS_LOAD ){
                                                        if ( name == NULL ) {
                                                                _ase_error_return( "Missing material map bitmap name" );
                                                        }
+                                                       else if( !_pico_stricmp( name, "none" ) ){ // standard empty bitmap name
+                                                               name = "";
+                                                       }
                                                        mapname = _pico_alloc( strlen( name ) + 1 );
                                                        strcpy( mapname, name );
                                                        /* skip rest and continue with next token */