archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Another DNA cleanup (enums instead of defines).

Browse Source
This commit is contained in:
Bastien Montagne
2013-09-10 13:13:04 +00:00
parent 6fc159bcff
commit 17a7c2425c
1 changed files with 95 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

186
source/blender/makesdna/DNA_customdata_types.h
View File

@@ -73,111 +73,115 @@ typedef struct CustomData {
} CustomData; } CustomData;
/* CustomData.type */ /* CustomData.type */
#define CD_MVERT 0 enum {
#define CD_MSTICKY 1 /* DEPRECATED */ CD_MVERT = 0,
#define CD_MDEFORMVERT 2 CD_MSTICKY = 1, /* DEPRECATED */
#define CD_MEDGE 3 CD_MDEFORMVERT = 2,
#define CD_MFACE 4 CD_MEDGE = 3,
#define CD_MTFACE 5 CD_MFACE = 4,
#define CD_MCOL 6 CD_MTFACE = 5,
#define CD_ORIGINDEX 7 CD_MCOL = 6,
#define CD_NORMAL 8 CD_ORIGINDEX = 7,
//#define CD_POLYINDEX 9 CD_NORMAL = 8,
#define CD_PROP_FLT 10 /* CD_POLYINDEX = 9, */
#define CD_PROP_INT 11 CD_PROP_FLT = 10,
#define CD_PROP_STR 12 CD_PROP_INT = 11,
#define CD_ORIGSPACE 13 /* for modifier stack face location mapping */ CD_PROP_STR = 12,
#define CD_ORCO 14 CD_ORIGSPACE = 13, /* for modifier stack face location mapping */
#define CD_MTEXPOLY 15 CD_ORCO = 14,
#define CD_MLOOPUV 16 CD_MTEXPOLY = 15,
#define CD_MLOOPCOL 17 CD_MLOOPUV = 16,
#define CD_TANGENT 18 CD_MLOOPCOL = 17,
#define CD_MDISPS 19 CD_TANGENT = 18,
#define CD_PREVIEW_MCOL 20 /* for displaying weightpaint colors */ CD_MDISPS = 19,
#define CD_ID_MCOL 21 CD_PREVIEW_MCOL = 20, /* for displaying weightpaint colors */
#define CD_TEXTURE_MCOL 22 CD_ID_MCOL = 21,
#define CD_CLOTH_ORCO 23 CD_TEXTURE_MCOL = 22,
#define CD_RECAST 24 CD_CLOTH_ORCO = 23,
CD_RECAST = 24,
/* BMESH ONLY START */ /* BMESH ONLY START */
#define CD_MPOLY 25 CD_MPOLY = 25,
#define CD_MLOOP 26 CD_MLOOP = 26,
#define CD_SHAPE_KEYINDEX 27 CD_SHAPE_KEYINDEX = 27,
#define CD_SHAPEKEY 28 CD_SHAPEKEY = 28,
#define CD_BWEIGHT 29 CD_BWEIGHT = 29,
#define CD_CREASE 30 CD_CREASE = 30,
#define CD_ORIGSPACE_MLOOP 31 CD_ORIGSPACE_MLOOP = 31,
#define CD_PREVIEW_MLOOPCOL 32 CD_PREVIEW_MLOOPCOL = 32,
#define CD_BM_ELEM_PYPTR 33 CD_BM_ELEM_PYPTR = 33,
/* BMESH ONLY END */ /* BMESH ONLY END */
#define CD_PAINT_MASK 34 CD_PAINT_MASK = 34,
#define CD_GRID_PAINT_MASK 35 CD_GRID_PAINT_MASK = 35,
#define CD_MVERT_SKIN 36 CD_MVERT_SKIN = 36,
#define CD_FREESTYLE_EDGE 37 CD_FREESTYLE_EDGE = 37,
#define CD_FREESTYLE_FACE 38 CD_FREESTYLE_FACE = 38,
#define CD_NUMTYPES 39 CD_NUMTYPES = 39,
};
/* Bits for CustomDataMask */ /* Bits for CustomDataMask */
#define CD_MASK_MVERT (1 << CD_MVERT) enum {
#define CD_MASK_MSTICKY (1 << CD_MSTICKY) /* DEPRECATED */ CD_MASK_MVERT = (1LL << CD_MVERT),
#define CD_MASK_MDEFORMVERT (1 << CD_MDEFORMVERT) CD_MASK_MSTICKY = (1LL << CD_MSTICKY), /* DEPRECATED */
#define CD_MASK_MEDGE (1 << CD_MEDGE) CD_MASK_MDEFORMVERT = (1LL << CD_MDEFORMVERT),
#define CD_MASK_MFACE (1 << CD_MFACE) CD_MASK_MEDGE = (1LL << CD_MEDGE),
#define CD_MASK_MTFACE (1 << CD_MTFACE) CD_MASK_MFACE = (1LL << CD_MFACE),
#define CD_MASK_MCOL (1 << CD_MCOL) CD_MASK_MTFACE = (1LL << CD_MTFACE),
#define CD_MASK_ORIGINDEX (1 << CD_ORIGINDEX) CD_MASK_MCOL = (1LL << CD_MCOL),
#define CD_MASK_NORMAL (1 << CD_NORMAL) CD_MASK_ORIGINDEX = (1LL << CD_ORIGINDEX),
// #define CD_MASK_POLYINDEX (1 << CD_POLYINDEX) CD_MASK_NORMAL = (1LL << CD_NORMAL),
#define CD_MASK_PROP_FLT (1 << CD_PROP_FLT) /* CD_MASK_POLYINDEX = (1LL << CD_POLYINDEX), */
#define CD_MASK_PROP_INT (1 << CD_PROP_INT) CD_MASK_PROP_FLT = (1LL << CD_PROP_FLT),
#define CD_MASK_PROP_STR (1 << CD_PROP_STR) CD_MASK_PROP_INT = (1LL << CD_PROP_INT),
#define CD_MASK_ORIGSPACE (1 << CD_ORIGSPACE) CD_MASK_PROP_STR = (1LL << CD_PROP_STR),
#define CD_MASK_ORCO (1 << CD_ORCO) CD_MASK_ORIGSPACE = (1LL << CD_ORIGSPACE),
#define CD_MASK_MTEXPOLY (1 << CD_MTEXPOLY) CD_MASK_ORCO = (1LL << CD_ORCO),
#define CD_MASK_MLOOPUV (1 << CD_MLOOPUV) CD_MASK_MTEXPOLY = (1LL << CD_MTEXPOLY),
#define CD_MASK_MLOOPCOL (1 << CD_MLOOPCOL) CD_MASK_MLOOPUV = (1LL << CD_MLOOPUV),
#define CD_MASK_TANGENT (1 << CD_TANGENT) CD_MASK_MLOOPCOL = (1LL << CD_MLOOPCOL),
#define CD_MASK_MDISPS (1 << CD_MDISPS) CD_MASK_TANGENT = (1LL << CD_TANGENT),
#define CD_MASK_PREVIEW_MCOL (1 << CD_PREVIEW_MCOL) CD_MASK_MDISPS = (1LL << CD_MDISPS),
#define CD_MASK_CLOTH_ORCO (1 << CD_CLOTH_ORCO) CD_MASK_PREVIEW_MCOL = (1LL << CD_PREVIEW_MCOL),
#define CD_MASK_RECAST (1 << CD_RECAST) CD_MASK_CLOTH_ORCO = (1LL << CD_CLOTH_ORCO),
CD_MASK_RECAST = (1LL << CD_RECAST),
/* BMESH ONLY START */ /* BMESH ONLY START */
#define CD_MASK_MPOLY (1 << CD_MPOLY) CD_MASK_MPOLY = (1LL << CD_MPOLY),
#define CD_MASK_MLOOP (1 << CD_MLOOP) CD_MASK_MLOOP = (1LL << CD_MLOOP),
#define CD_MASK_SHAPE_KEYINDEX (1 << CD_SHAPE_KEYINDEX) CD_MASK_SHAPE_KEYINDEX = (1LL << CD_SHAPE_KEYINDEX),
#define CD_MASK_SHAPEKEY (1 << CD_SHAPEKEY) CD_MASK_SHAPEKEY = (1LL << CD_SHAPEKEY),
#define CD_MASK_BWEIGHT (1 << CD_BWEIGHT) CD_MASK_BWEIGHT = (1LL << CD_BWEIGHT),
#define CD_MASK_CREASE (1 << CD_CREASE) CD_MASK_CREASE = (1LL << CD_CREASE),
#define CD_MASK_ORIGSPACE_MLOOP (1LL << CD_ORIGSPACE_MLOOP) CD_MASK_ORIGSPACE_MLOOP = (1LL << CD_ORIGSPACE_MLOOP),
#define CD_MASK_PREVIEW_MLOOPCOL (1LL << CD_PREVIEW_MLOOPCOL) CD_MASK_PREVIEW_MLOOPCOL = (1LL << CD_PREVIEW_MLOOPCOL),
#define CD_MASK_BM_ELEM_PYPTR (1LL << CD_BM_ELEM_PYPTR) CD_MASK_BM_ELEM_PYPTR = (1LL << CD_BM_ELEM_PYPTR),
/* BMESH ONLY END */ /* BMESH ONLY END */
#define CD_MASK_PAINT_MASK (1LL << CD_PAINT_MASK) CD_MASK_PAINT_MASK = (1LL << CD_PAINT_MASK),
#define CD_MASK_GRID_PAINT_MASK (1LL << CD_GRID_PAINT_MASK) CD_MASK_GRID_PAINT_MASK = (1LL << CD_GRID_PAINT_MASK),
#define CD_MASK_MVERT_SKIN (1LL << CD_MVERT_SKIN) CD_MASK_MVERT_SKIN = (1LL << CD_MVERT_SKIN),
#define CD_MASK_FREESTYLE_EDGE (1LL << CD_FREESTYLE_EDGE) CD_MASK_FREESTYLE_EDGE = (1LL << CD_FREESTYLE_EDGE),
#define CD_MASK_FREESTYLE_FACE (1LL << CD_FREESTYLE_FACE) CD_MASK_FREESTYLE_FACE = (1LL << CD_FREESTYLE_FACE),
};
/* CustomData.flag */ /* CustomData.flag */
enum {
/* indicates layer should not be copied by CustomData_from_template or /* Indicates layer should not be copied by CustomData_from_template or CustomData_copy_data */
* CustomData_copy_data */ CD_FLAG_NOCOPY = (1 << 0),
#define CD_FLAG_NOCOPY (1<<0) /* Indicates layer should not be freed (for layers backed by external data) */
/* indicates layer should not be freed (for layers backed by external data) */ CD_FLAG_NOFREE = (1 << 1),
#define CD_FLAG_NOFREE (1<<1) /* Indicates the layer is only temporary, also implies no copy */
/* indicates the layer is only temporary, also implies no copy */ CD_FLAG_TEMPORARY = ((1 << 2) | CD_FLAG_NOCOPY),
#define CD_FLAG_TEMPORARY ((1<<2)|CD_FLAG_NOCOPY) /* Indicates the layer is stored in an external file */
/* indicates the layer is stored in an external file */ CD_FLAG_EXTERNAL = (1 << 3),
#define CD_FLAG_EXTERNAL (1<<3) /* Indicates external data is read into memory */
/* indicates external data is read into memory */ CD_FLAG_IN_MEMORY = (1 << 4),
#define CD_FLAG_IN_MEMORY (1<<4) };
/* Limits */ /* Limits */
#define MAX_MTFACE 8 #define MAX_MTFACE 8
#define MAX_MCOL 8 #define MAX_MCOL 8
#ifdef __cplusplus #ifdef __cplusplus
} }