Page MenuHome
Differential D8251 Diff 26636 source/blender/makesdna/DNA_customdata_types.h

Changeset View

Standalone View

View Options

source/blender/makesdna/DNA_customdata_types.h

Show First 20 Lines • Show All 70 Lines • ▼ Show 20 Lines
typedef struct CustomData { typedef struct CustomData {
/** CustomDataLayers, ordered by type. */ /** CustomDataLayers, ordered by type. */
CustomDataLayer *layers; CustomDataLayer *layers;
/** /**
* runtime only! - maps types to indices of first layer of that type, * runtime only! - maps types to indices of first layer of that type,
* MUST be >= CD_NUMTYPES, but we cant use a define here. * MUST be >= CD_NUMTYPES, but we cant use a define here.
* Correct size is ensured in CustomData_update_typemap assert(). * Correct size is ensured in CustomData_update_typemap assert().
*/ */
int typemap[48]; int typemap[50];
char _pad[4]; char _pad[4];
/** Number of layers, size of layers array. */ /** Number of layers, size of layers array. */
int totlayer, maxlayer; int totlayer, maxlayer;
/** In editmode, total size of all data layers. */ /** In editmode, total size of all data layers. */
int totsize; int totsize;
/** (BMesh Only): Memory pool for allocation of blocks. */ /** (BMesh Only): Memory pool for allocation of blocks. */
struct BLI_mempool *pool; struct BLI_mempool *pool;
/** External file storing customdata layers. */ /** External file storing customdata layers. */
▲ Show 20 Lines • Show All 61 Lines • ▼ Show 20 Lines#endif
CD_SCULPT_FACE_SETS = 42, CD_SCULPT_FACE_SETS = 42,
CD_LOCATION = 43, CD_LOCATION = 43,
CD_HAIRCURVE = 45, CD_HAIRCURVE = 45,
CD_RADIUS = 44, CD_RADIUS = 44,
CD_HAIRMAPPING = 46, CD_HAIRMAPPING = 46,
CD_PROP_COLOR = 47, CD_PROP_COLOR = 47,
CD_PROP_FLOAT3 = 48,
CD_PROP_FLOAT2 = 49,
CD_NUMTYPES = 48, CD_NUMTYPES = 50,
} CustomDataType; } CustomDataType;
/* Bits for CustomDataMask */ /* Bits for CustomDataMask */
#define CD_MASK_MVERT (1 << CD_MVERT) #define CD_MASK_MVERT (1 << CD_MVERT)
// #define CD_MASK_MSTICKY (1 << CD_MSTICKY) /* DEPRECATED */ // #define CD_MASK_MSTICKY (1 << CD_MSTICKY) /* DEPRECATED */
#define CD_MASK_MDEFORMVERT (1 << CD_MDEFORMVERT) #define CD_MASK_MDEFORMVERT (1 << CD_MDEFORMVERT)
#define CD_MASK_MEDGE (1 << CD_MEDGE) #define CD_MASK_MEDGE (1 << CD_MEDGE)
#define CD_MASK_MFACE (1 << CD_MFACE) #define CD_MASK_MFACE (1 << CD_MFACE)
Show All 33 Lines
#define CD_MASK_MVERT_SKIN (1LL << CD_MVERT_SKIN) #define CD_MASK_MVERT_SKIN (1LL << CD_MVERT_SKIN)
#define CD_MASK_FREESTYLE_EDGE (1LL << CD_FREESTYLE_EDGE) #define CD_MASK_FREESTYLE_EDGE (1LL << CD_FREESTYLE_EDGE)
#define CD_MASK_FREESTYLE_FACE (1LL << CD_FREESTYLE_FACE) #define CD_MASK_FREESTYLE_FACE (1LL << CD_FREESTYLE_FACE)
#define CD_MASK_MLOOPTANGENT (1LL << CD_MLOOPTANGENT) #define CD_MASK_MLOOPTANGENT (1LL << CD_MLOOPTANGENT)
#define CD_MASK_TESSLOOPNORMAL (1LL << CD_TESSLOOPNORMAL) #define CD_MASK_TESSLOOPNORMAL (1LL << CD_TESSLOOPNORMAL)
#define CD_MASK_CUSTOMLOOPNORMAL (1LL << CD_CUSTOMLOOPNORMAL) #define CD_MASK_CUSTOMLOOPNORMAL (1LL << CD_CUSTOMLOOPNORMAL)
#define CD_MASK_SCULPT_FACE_SETS (1LL << CD_SCULPT_FACE_SETS) #define CD_MASK_SCULPT_FACE_SETS (1LL << CD_SCULPT_FACE_SETS)
#define CD_MASK_PROP_COLOR (1ULL << CD_PROP_COLOR) #define CD_MASK_PROP_COLOR (1ULL << CD_PROP_COLOR)
#define CD_MASK_PROP_FLOAT3 (1ULL << CD_PROP_FLOAT3)
#define CD_MASK_PROP_FLOAT2 (1ULL << CD_PROP_FLOAT2)
/** Data types that may be defined for all mesh elements types. */ /** Data types that may be defined for all mesh elements types. */
#define CD_MASK_GENERIC_DATA (CD_MASK_PROP_FLOAT | CD_MASK_PROP_INT32 | CD_MASK_PROP_STRING) #define CD_MASK_GENERIC_DATA \
lichtwerkUnsubmitted
Not Done
Inline Actions

in D8200, this will be replaced by CD_MASK_PROP_ALL.
(just saying, depends on what will land first)

lichtwerk: in D8200, this will be replaced by `CD_MASK_PROP_ALL`. (just saying, depends on what will land…
(CD_MASK_PROP_FLOAT | CD_MASK_PROP_INT32 | CD_MASK_PROP_STRING | CD_MASK_PROP_FLOAT3 | \
CD_MASK_PROP_FLOAT2)
/** Multires loop data. */ /** Multires loop data. */
#define CD_MASK_MULTIRES_GRIDS (CD_MASK_MDISPS | CD_GRID_PAINT_MASK) #define CD_MASK_MULTIRES_GRIDS (CD_MASK_MDISPS | CD_GRID_PAINT_MASK)
/* All data layers. */ /* All data layers. */
#define CD_MASK_ALL (~0LL) #define CD_MASK_ALL (~0LL)
typedef struct CustomData_MeshMasks { typedef struct CustomData_MeshMasks {
Show All 34 Lines