diff options
| author | Julian Eisel <julian@blender.org> | 2020-08-07 14:04:31 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-08-07 14:04:31 +0300 |
| commit | 0d2d4a6d4a75ac38c41f872c88255eab70e88ab7 (patch) | |
| tree | b7a7518af86dddba48e05a98b3c2be55e8804721 /source/blender/makesdna/DNA_customdata_types.h | |
| parent | 9b416c66fb714bdfd15a481489dbf650d0f389ea (diff) | |
| parent | cfc6f9eb18e701f5be601b95c45004e8cf7fbc81 (diff) | |
Merge branch 'master' into temp-ui-button-type-refactortemp-ui-button-type-refactor
Diffstat (limited to 'source/blender/makesdna/DNA_customdata_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_customdata_types.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index c24bbccae1e..2990fa85c27 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -23,8 +23,7 @@ * Used for custom mesh data types (stored per vert/edge/loop/face) */ -#ifndef __DNA_CUSTOMDATA_TYPES_H__ -#define __DNA_CUSTOMDATA_TYPES_H__ +#pragma once #include "DNA_defs.h" @@ -76,7 +75,7 @@ typedef struct CustomData { * MUST be >= CD_NUMTYPES, but we cant use a define here. * Correct size is ensured in CustomData_update_typemap assert(). */ - int typemap[48]; + int typemap[50]; char _pad[4]; /** Number of layers, size of layers array. */ int totlayer, maxlayer; @@ -154,8 +153,10 @@ typedef enum CustomDataType { CD_HAIRMAPPING = 46, CD_PROP_COLOR = 47, + CD_PROP_FLOAT3 = 48, + CD_PROP_FLOAT2 = 49, - CD_NUMTYPES = 48, + CD_NUMTYPES = 50, } CustomDataType; /* Bits for CustomDataMask */ @@ -205,9 +206,13 @@ typedef enum CustomDataType { #define CD_MASK_CUSTOMLOOPNORMAL (1LL << CD_CUSTOMLOOPNORMAL) #define CD_MASK_SCULPT_FACE_SETS (1LL << CD_SCULPT_FACE_SETS) #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. */ -#define CD_MASK_GENERIC_DATA (CD_MASK_PROP_FLOAT | CD_MASK_PROP_INT32 | CD_MASK_PROP_STRING) +#define CD_MASK_GENERIC_DATA \ + (CD_MASK_PROP_FLOAT | CD_MASK_PROP_INT32 | CD_MASK_PROP_STRING | CD_MASK_PROP_FLOAT3 | \ + CD_MASK_PROP_FLOAT2) /** Multires loop data. */ #define CD_MASK_MULTIRES_GRIDS (CD_MASK_MDISPS | CD_GRID_PAINT_MASK) @@ -248,5 +253,3 @@ enum { #ifdef __cplusplus } #endif - -#endif /* __DNA_CUSTOMDATA_TYPES_H__ */ |