Merge branch 'NateEag-master-patch-12920' into 'master'

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

diff --git a/libs/picomodel/pm_mdc.c b/libs/picomodel/pm_mdc.c
index be93e3382f32c63362843e6f7888993c1c40b9ff..816adebb6ff1c0d35ae4c9ee5f600d6302b06156 100644 (file)
--- a/libs/picomodel/pm_mdc.c
+++ b/libs/picomodel/pm_mdc.c
@@ -45,7 +45,7 @@ const float MDC_MAX_OFS         = 127.0f;
 const float MDC_DIST_SCALE      = 0.05f;
 
 /* mdc decoding normal table */
-double mdcNormals[ 256 ][ 3 ] =
+const double mdcNormals[ 256 ][ 3 ] =
 {
        { 1.000000, 0.000000, 0.000000 },
        { 0.980785, 0.195090, 0.000000 },
@@ -640,7 +640,7 @@ static picoModel_t *_mdc_load( PM_PARAMS_LOAD ){
 
                /* detox and set shader name */
                shader = (mdcShader_t*) ( (picoByte_t*) surface + surface->ofsShaders );
-               _pico_setfext( shader->name, "" );
+               _pico_setfext( shader->name, NULL );
                _pico_unixify( shader->name );
                PicoSetShaderName( picoShader, shader->name );