changed R_Mesh_TexCombine to use GL_COMBINE_ARB mode only when necessary

[xonotic/darkplaces.git] / model_shared.h

diff --git a/model_shared.h b/model_shared.h
index 3d14ec913210464e033bf44fb555c9227775a929..b73a2355be09976cd7f5e10d65e2d7a6b9abbc52 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -68,10 +68,19 @@ typedef struct skinframe_s
        // on each level change for the used skinframes, if some are not used they
        // are freed
        int loadsequence;
-       // on 32bit systems this makes the struct 128 bytes long
-       int padding;
+       // indicates whether this texture has transparent pixels
+       qboolean hasalpha;
        // average texture color, if applicable
        float avgcolor[4];
+       // for mdl skins, we actually only upload on first use (many are never used, and they are almost never used in both base+pants+shirt and merged modes)
+       unsigned char *qpixels;
+       int qwidth;
+       int qheight;
+       qboolean qhascolormapping;
+       qboolean qgeneratebase;
+       qboolean qgeneratemerged;
+       qboolean qgeneratenmap;
+       qboolean qgenerateglow;
 }
 skinframe_t;