merged q3mtexture_t into texture_t, note that only the name and skin fields are share...

[xonotic/darkplaces.git] / model_shared.h

diff --git a/model_shared.h b/model_shared.h
index 964622fb9067b885b59f3057a8bb4bcd2ff73f2f..a025db8e87768a7e28e4288bf407e25dd877a6be 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -210,6 +210,9 @@ typedef struct model_brush_s
        int num_portalpoints;
        mvertex_t *data_portalpoints;
 
+       int num_textures;
+       texture_t *data_textures;
+
        // pvs
        int num_pvsclusters;
        int num_pvsclusterbytes;
@@ -268,9 +271,6 @@ typedef struct model_brushq1_s
 
        hull_t                  hulls[MAX_MAP_HULLS];
 
-       int                             numtextures;
-       texture_t               *textures;
-
        int                             num_compressedpvs;
        qbyte                   *data_compressedpvs;
 
@@ -300,9 +300,6 @@ model_brushq2_t;
 
 typedef struct model_brushq3_s
 {
-       int num_textures;
-       q3mtexture_t *data_textures;
-
        int num_models;
        q3mmodel_t *data_models;