Merge commit '515673c08f8718a237e90c2130a1f5294f966d6a'

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

diff --git a/libs/picomodel/pm_obj.c b/libs/picomodel/pm_obj.c
index d5b15003d8bb10a61dc12caa47d091087de8fcea..1f77eeb1191d7a464b383f0deb8748b839ec264a 100644 (file)
--- a/libs/picomodel/pm_obj.c
+++ b/libs/picomodel/pm_obj.c
@@ -87,7 +87,7 @@ static int _obj_canload( PM_PARAMS_CANLOAD )
        /* appearing at the beginning of wavefront objects */
 
        /* alllocate a new pico parser */
-       p = _pico_new_parser( (picoByte_t *)buffer,bufSize );
+       p = _pico_new_parser( (const picoByte_t *)buffer,bufSize );
        if (p == NULL)
                return PICO_PMV_ERROR_MEMORY;
 
@@ -535,7 +535,7 @@ static picoModel_t *_obj_load( PM_PARAMS_LOAD )
                return NULL; \
        }
        /* alllocate a new pico parser */
-       p = _pico_new_parser( (picoByte_t *)buffer,bufSize );
+       p = _pico_new_parser( (const picoByte_t *)buffer,bufSize );
        if (p == NULL) return NULL;
 
        /* create a new pico model */
@@ -688,13 +688,13 @@ static picoModel_t *_obj_load( PM_PARAMS_LOAD )
                        int ivt[ 4 ], has_vt = 0;
                        int ivn[ 4 ], has_vn = 0;
                        int have_quad = 0;
-                       int slashcount;
-                       int doubleslash;
+                       int slashcount = 0;
+                       int doubleslash = 0;
                        int i;
 
                        if(curSurface == NULL)
                        {
-                               _pico_printf( PICO_ERROR,"No group defined for faces, so creating an autoSurface in OBJ, line %d.",p->curLine);
+                               _pico_printf( PICO_WARNING,"No group defined for faces, so creating an autoSurface in OBJ, line %d.",p->curLine);
                                AUTO_GROUPNAME(autoGroupNameBuf);
                                NEW_SURFACE(autoGroupNameBuf);
                        }
@@ -869,7 +869,7 @@ static picoModel_t *_obj_load( PM_PARAMS_LOAD )
 
                        if(curFace != 0 || curSurface == NULL)
                        {
-                               _pico_printf( PICO_ERROR,"No group defined for usemtl, so creating an autoSurface in OBJ, line %d.",p->curLine);
+                               _pico_printf( PICO_WARNING,"No group defined for usemtl, so creating an autoSurface in OBJ, line %d.",p->curLine);
                                AUTO_GROUPNAME(autoGroupNameBuf);
                                NEW_SURFACE(autoGroupNameBuf);
                        }
@@ -884,7 +884,7 @@ static picoModel_t *_obj_load( PM_PARAMS_LOAD )
                                shader = PicoFindShader( model, name, 1 );
                                if (shader == NULL)
                                {
-                                       _pico_printf( PICO_ERROR,"Undefined material name in OBJ, line %d. Making a default shader.",p->curLine);
+                                       _pico_printf( PICO_WARNING,"Undefined material name in OBJ, line %d. Making a default shader.",p->curLine);
 
                                        /* create a new pico shader */
                                        shader = PicoNewShader( model );