Move some sprite-related cvars to model_sprite.c.

[xonotic/darkplaces.git] / image.c

diff --git a/image.c b/image.c
index bec68ec591a2036b020eca44826aa4b7303dbd15..e35dd33df11b34fadb5c7592646c145ed1ce6954 100644 (file)
--- a/image.c
+++ b/image.c
@@ -1004,14 +1004,14 @@ unsigned char *loadimagepixelsbgra (const char *filename, qboolean complain, qbo
 }
 
 extern cvar_t gl_picmip;
-rtexture_t *loadtextureimage (rtexturepool_t *pool, const char *filename, qboolean complain, int flags, qboolean allowFixtrans, qboolean convertsRGB)
+rtexture_t *loadtextureimage (rtexturepool_t *pool, const char *filename, qboolean complain, int flags, qboolean allowFixtrans, qboolean sRGB)
 {
        unsigned char *data;
        rtexture_t *rt;
        int miplevel = R_PicmipForFlags(flags);
-       if (!(data = loadimagepixelsbgra (filename, complain, allowFixtrans, convertsRGB, &miplevel)))
+       if (!(data = loadimagepixelsbgra (filename, complain, allowFixtrans, false, &miplevel)))
                return 0;
-       rt = R_LoadTexture2D(pool, filename, image_width, image_height, data, TEXTYPE_BGRA, flags, miplevel, NULL);
+       rt = R_LoadTexture2D(pool, filename, image_width, image_height, data, sRGB ? TEXTYPE_SRGB_BGRA : TEXTYPE_BGRA, flags, miplevel, NULL);
        Mem_Free(data);
        return rt;
 }