Merge branch 'master' of ssh://git.xonotic.org/netradiant

[xonotic/netradiant.git] / tools / quake3 / q3map2 / model.c

diff --git a/tools/quake3/q3map2/model.c b/tools/quake3/q3map2/model.c
index 083e795ff398e51199a9daf0de187102312c943b..cbba5c5d3b29001bf0ab15cbb2727344fb6ef46e 100644 (file)
--- a/tools/quake3/q3map2/model.c
+++ b/tools/quake3/q3map2/model.c
@@ -401,7 +401,7 @@ void InsertModel( char *name, int frame, m4x4_t transform, remap_t *remap, shade
                                        dv->color[ j ][ 0 ] = 255.0f;
                                        dv->color[ j ][ 1 ] = 255.0f;
                                        dv->color[ j ][ 2 ] = 255.0f;
-                                       dv->color[ j ][ 3 ] = color[ 0 ] * 0.3f + color[ 1 ] * 0.59f + color[ 2 ] * 0.11f;
+                                       dv->color[ j ][ 3 ] = RGBTOGRAY( color );
                                }
                                else
                                {
@@ -429,8 +429,7 @@ void InsertModel( char *name, int frame, m4x4_t transform, remap_t *remap, shade
                        
                        
                        /* temp hack */
-                       if( !si->clipModel &&
-                               ((si->compileFlags & C_TRANSLUCENT) || !(si->compileFlags & C_SOLID)) )
+                       if( !si->clipModel && !(si->compileFlags & C_SOLID) )
                                continue;
                        
                        /* walk triangle list */