fix some compile errors

diff --git a/libs/picomodel.h b/libs/picomodel.h
index 1e6f8920d8807d7af3c4e31afbb0d54c51e5d9be..a771e9438d3fae7cba27e58dffb831ffaeee76d7 100644 (file)
--- a/libs/picomodel.h
+++ b/libs/picomodel.h
@@ -258,7 +258,7 @@ void                                                PicoSetShaderShininess( picoShader_t *shader, float value );
 
 void                                           PicoSetSurfaceData( picoSurface_t *surface, void *data );
 void                                           PicoSetSurfaceType( picoSurface_t *surface, picoSurfaceType_t type );
 
 void                                           PicoSetSurfaceData( picoSurface_t *surface, void *data );
 void                                           PicoSetSurfaceType( picoSurface_t *surface, picoSurfaceType_t type );

-void                                           PicoSetSurfaceName( picoSurface_t *surface, char *name );
+void                                           PicoSetSurfaceName( picoSurface_t *surface, const char *name );

 void                                           PicoSetSurfaceShader( picoSurface_t *surface, picoShader_t *shader );
 void                                           PicoSetSurfaceXYZ( picoSurface_t *surface, int num, picoVec3_t xyz );
 void                                           PicoSetSurfaceNormal( picoSurface_t *surface, int num, picoVec3_t normal );
 void                                           PicoSetSurfaceShader( picoSurface_t *surface, picoShader_t *shader );
 void                                           PicoSetSurfaceXYZ( picoSurface_t *surface, int num, picoVec3_t xyz );
 void                                           PicoSetSurfaceNormal( picoSurface_t *surface, int num, picoVec3_t normal );


@@ -341,7 +341,7 @@ void                                                PicoFixSurfaceNormals( picoSurface_t *surface );
 int                                                    PicoRemapModel( picoModel_t *model, char *remapFile );
 
 
 int                                                    PicoRemapModel( picoModel_t *model, char *remapFile );
 
 

-void PicoAddTriangleToModel( picoModel_t *model, picoVec3_t** xyz, picoVec3_t** normals, int numSTs, picoVec2_t **st, int numColors, picoColor_t **colors, picoShader_t* shader, picoIndex_t* smoothingGroup);
+void PicoAddTriangleToModel( picoModel_t *model, picoVec3_t** xyz, picoVec3_t** normals, int numSTs, picoVec2_t **st, int numColors, picoColor_t **colors, picoShader_t* shader, const char *name, picoIndex_t* smoothingGroup);

 
 /* end marker */
 #ifdef __cplusplus
 
 /* end marker */
 #ifdef __cplusplus

diff --git a/libs/picomodel/picomodel.c b/libs/picomodel/picomodel.c
index 261462256192aeb4d2ff1eb0f66afe7acfea9c13..86ec08bde5d001fb2e43caa8e57b3f605b3760ea 100644 (file)
--- a/libs/picomodel/picomodel.c
+++ b/libs/picomodel/picomodel.c
@@ -912,7 +912,7 @@ void PicoSetSurfaceType( picoSurface_t *surface, picoSurfaceType_t type )
 
 
 
 
 
 

-void PicoSetSurfaceName( picoSurface_t *surface, char *name )
+void PicoSetSurfaceName( picoSurface_t *surface, const char *name )

 {
        if( surface == NULL || name == NULL )
                return;
 {
        if( surface == NULL || name == NULL )
                return;