diff options
Diffstat (limited to 'source/blender/makesdna/DNA_customdata_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_customdata_types.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index 0b0ffb42ba8..13a1f4fbe8a 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -29,7 +29,6 @@ * \ingroup DNA */ - #ifndef DNA_CUSTOMDATA_TYPES_H #define DNA_CUSTOMDATA_TYPES_H @@ -48,7 +47,7 @@ typedef struct CustomDataLayer { int active_rnd; /* number of the layer to render*/ int active_clone; /* number of the layer to render*/ int active_mask; /* number of the layer to render*/ - char pad[4]; + int uid; /* shape keyblock unique id reference*/ char name[32]; /* layer name */ void *data; /* layer data */ } CustomDataLayer; @@ -98,8 +97,6 @@ typedef struct CustomData { #define CD_CLOTH_ORCO 23 #define CD_RECAST 24 -#ifdef USE_BMESH_FORWARD_COMPAT - /* BMESH ONLY START */ #define CD_MPOLY 25 #define CD_MLOOP 26 @@ -112,12 +109,6 @@ typedef struct CustomData { #define CD_NUMTYPES 32 -#else - -#define CD_NUMTYPES 25 - -#endif - /* Bits for CustomDataMask */ #define CD_MASK_MVERT (1 << CD_MVERT) #define CD_MASK_MSTICKY (1 << CD_MSTICKY) @@ -143,8 +134,6 @@ typedef struct CustomData { #define CD_MASK_CLOTH_ORCO (1 << CD_CLOTH_ORCO) #define CD_MASK_RECAST (1 << CD_RECAST) -#ifdef USE_BMESH_FORWARD_COMPAT - /* BMESH ONLY START */ #define CD_MASK_MPOLY (1 << CD_MPOLY) #define CD_MASK_MLOOP (1 << CD_MLOOP) @@ -155,8 +144,6 @@ typedef struct CustomData { #define CD_MASK_WEIGHT_MLOOPCOL (1 << CD_WEIGHT_MLOOPCOL) /* BMESH ONLY END */ -#endif - /* CustomData.flag */ /* indicates layer should not be copied by CustomData_from_template or |