merge branch work back into trunk

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

diff --git a/libs/picomodel/pm_lwo.c b/libs/picomodel/pm_lwo.c
index e36bb6f2a4a1752f0d3e1d529fb53f450364916e..d7b3bc8afd489ce0251a99819c31d8de4b2bd15b 100644 (file)
--- a/libs/picomodel/pm_lwo.c
+++ b/libs/picomodel/pm_lwo.c
@@ -108,7 +108,7 @@ static picoModel_t *_lwo_load( PM_PARAMS_LOAD )
        lwPolygon               *pol;
        lwPolVert               *v;
        lwVMapPt                *vm;
-       char                    name[ 256 ];
+       char                    name[ 64 ];
        int                             i, j, k, numverts;
 
        picoModel_t             *picoModel;
@@ -248,7 +248,6 @@ static picoModel_t *_lwo_load( PM_PARAMS_LOAD )
 
                /* detox and set shader name */
                strncpy( name, surface->name, sizeof(name) );
-               _pico_first_token( name );
                _pico_setfext( name, "" );
                _pico_unixify( name );
                PicoSetShaderName( picoShader, name );
@@ -298,23 +297,9 @@ static picoModel_t *_lwo_load( PM_PARAMS_LOAD )
                                xyz[ 1 ] = pt->pos[ 2 ];
                                xyz[ 2 ] = pt->pos[ 1 ];
 
-/* doom3 lwo data doesn't seem to have smoothing-angle information */
-#if 0
-        if(surface->smooth <= 0)
-        {
-          /* use face normals */
-                                 normal[ 0 ] = v->norm[ 0 ];
-                                 normal[ 1 ] = v->norm[ 2 ];
-                                 normal[ 2 ] = v->norm[ 1 ];
-        }
-        else
-#endif
-        {
-          /* smooth normals later */
-                                 normal[ 0 ] = 0;
-                                 normal[ 1 ] = 0;
-                                 normal[ 2 ] = 0;
-        }
+                               normal[ 0 ] = v->norm[ 0 ];
+                               normal[ 1 ] = v->norm[ 2 ];
+                               normal[ 2 ] = v->norm[ 1 ];
 
                                st[ 0 ] = xyz[ defaultSTAxis[ 0 ] ] * defaultXYZtoSTScale[ 0 ];
                                st[ 1 ] = xyz[ defaultSTAxis[ 1 ] ] * defaultXYZtoSTScale[ 1 ];