diff options
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_customdata_types.h | 9 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 8 |
2 files changed, 11 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index b6ae49cad61..d1844b34a0a 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -63,10 +63,9 @@ typedef struct CustomDataExternal { * layers, each with a data type (e.g. MTFace, MDeformVert, etc.). */ typedef struct CustomData { CustomDataLayer *layers; /* CustomDataLayers, ordered by type */ - int typemap[40]; /* runtime only! - maps types to indices of first layer of that type, + int typemap[41]; /* runtime only! - maps types to indices of first layer of that type, * MUST be >= CD_NUMTYPES, but we cant use a define here. * Correct size is ensured in CustomData_update_typemap assert() */ - int pad[1]; int totlayer, maxlayer; /* number of layers, size of layers array */ int totsize; /* in editmode, total size of all data layers */ struct BLI_mempool *pool; /* (BMesh Only): Memory pool for allocation of blocks */ @@ -119,7 +118,8 @@ enum { CD_FREESTYLE_EDGE = 37, CD_FREESTYLE_FACE = 38, CD_MLOOPTANGENT = 39, - CD_NUMTYPES = 40, + CD_TESSLOOPNORMAL = 40, + CD_NUMTYPES = 41, }; /* Bits for CustomDataMask */ @@ -164,7 +164,8 @@ enum { #define CD_MASK_MVERT_SKIN (1LL << CD_MVERT_SKIN) #define CD_MASK_FREESTYLE_EDGE (1LL << CD_FREESTYLE_EDGE) #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) /* CustomData.flag */ enum { diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index b942197e52c..e535e6012b3 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -116,8 +116,9 @@ typedef struct Mesh { float rot[3]; int drawflag; - short texflag, pad2[3]; - short smoothresh, flag; + short texflag, flag; + float smoothresh; + int pad2; /* customdata flag, for bevel-weight and crease, which are now optional */ char cd_flag, pad; @@ -212,6 +213,9 @@ typedef struct TFace { /* draw stats */ #define ME_DRAW_STATVIS (1 << 17) +/* draw loop normals */ +#define ME_DRAW_LNORMALS (1 << 18) + /* Subsurf Type */ #define ME_CC_SUBSURF 0 #define ME_SIMPLE_SUBSURF 1 |