diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-06-10 18:46:00 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-06-10 18:46:00 +0300 |
| commit | fcbd53c3b09d2dfae3d249ba06147594d7895b8c (patch) | |
| tree | b5a5482a98eec243108610b97e18859751e21ae8 /source/blender/makesdna | |
| parent | 9e76a641afb1e3a9caf839b479d3ab37e883434d (diff) | |
| parent | 2d695367a7880faac46b583686dfaa4d65f7ec14 (diff) | |
Merge branch 'master' into modifier-panels-ui
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_customdata_types.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index ef3b2015758..e4999fd4464 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -108,9 +108,9 @@ typedef enum CustomDataType { CD_ORIGINDEX = 7, CD_NORMAL = 8, CD_FACEMAP = 9, /* exclusive face group, each face can only be part of one */ - CD_PROP_FLT = 10, - CD_PROP_INT = 11, - CD_PROP_STR = 12, + CD_PROP_FLOAT = 10, + CD_PROP_INT32 = 11, + CD_PROP_STRING = 12, CD_ORIGSPACE = 13, /* for modifier stack face location mapping */ CD_ORCO = 14, /* undeformed vertex coordinates, normalized to 0..1 range */ #ifdef DNA_DEPRECATED_ALLOW @@ -170,9 +170,9 @@ typedef enum CustomDataType { #define CD_MASK_ORIGINDEX (1 << CD_ORIGINDEX) #define CD_MASK_NORMAL (1 << CD_NORMAL) #define CD_MASK_FACEMAP (1 << CD_FACEMAP) -#define CD_MASK_PROP_FLT (1 << CD_PROP_FLT) -#define CD_MASK_PROP_INT (1 << CD_PROP_INT) -#define CD_MASK_PROP_STR (1 << CD_PROP_STR) +#define CD_MASK_PROP_FLOAT (1 << CD_PROP_FLOAT) +#define CD_MASK_PROP_INT32 (1 << CD_PROP_INT32) +#define CD_MASK_PROP_STRING (1 << CD_PROP_STRING) #define CD_MASK_ORIGSPACE (1 << CD_ORIGSPACE) #define CD_MASK_ORCO (1 << CD_ORCO) // #define CD_MASK_MTEXPOLY (1 << CD_MTEXPOLY) /* DEPRECATED */ @@ -208,7 +208,7 @@ typedef enum CustomDataType { #define CD_MASK_PROP_COLOR (1LL << CD_PROP_COLOR) /** Data types that may be defined for all mesh elements types. */ -#define CD_MASK_GENERIC_DATA (CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR) +#define CD_MASK_GENERIC_DATA (CD_MASK_PROP_FLOAT | CD_MASK_PROP_INT32 | CD_MASK_PROP_STRING) /** Multires loop data. */ #define CD_MASK_MULTIRES_GRIDS (CD_MASK_MDISPS | CD_GRID_PAINT_MASK) |