picomodel: white default color of fm, md2 (was one white and rest black)

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

diff --git a/libs/picomodel/pm_ase.c b/libs/picomodel/pm_ase.c
index d73187c6ec706c2131b8282f89ec28a5f1f35eca..21c8e0801a78f8b742e9854fbb292233dce6e0db 100644 (file)
--- a/libs/picomodel/pm_ase.c
+++ b/libs/picomodel/pm_ase.c
@@ -44,9 +44,6 @@
 #include "time.h"
 #endif
 
-/* plain white */
-static picoColor_t white = { 255, 255, 255, 255 };
-
 /* jhefty - multi-subobject material support */
 
 /* Material/SubMaterial management */
@@ -402,7 +399,7 @@ static void _ase_submit_triangles_unshared( picoModel_t* model, aseMaterial_t* m
                                        }
                                        else
                                        {
-                                               PicoSetSurfaceColor( surface, 0, numVertexes, white );
+                                               PicoSetSurfaceColor( surface, 0, numVertexes, picoColor_white );
                                        }
 
                                        PicoSetSurfaceSmoothingGroup( surface, numVertexes, ( vertices[( *i ).indices[j]].id * ( 1 << 16 ) ) + ( *i ).smoothingGroup );
@@ -431,7 +428,7 @@ static void _ase_submit_triangles( picoModel_t* model, aseMaterial_t* materials,
                        picoVec3_t* xyz[3];
                        picoVec3_t* normal[3];
                        picoVec2_t* st[3];
-                       picoColor_t* color[3];
+                       const picoColor_t* color[3];
                        picoIndex_t smooth[3];
                        int j;
                        /* we pull the data from the vertex, color and texcoord arrays using the face index data */
@@ -446,7 +443,7 @@ static void _ase_submit_triangles( picoModel_t* model, aseMaterial_t* materials,
                                }
                                else
                                {
-                                       color[j] = &white;
+                                       color[j] = &picoColor_white;
                                }
 
                                smooth[j] = ( vertices[( *i ).indices[j]].id * ( 1 << 16 ) ) + ( *i ).smoothingGroup; /* don't merge vertices */