diff options
| author | Julian Eisel <julian@blender.org> | 2020-07-01 18:25:04 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-07-01 18:25:04 +0300 |
| commit | 889c4ca9c26d770af02cedef972d65eb173bdb5e (patch) | |
| tree | 6f46156146db1b3f09d92c6eaa1f44ba8a584ed4 /source/blender/makesdna/DNA_customdata_types.h | |
| parent | 87df15190210eb84ef52e5dccc2932918f912da5 (diff) | |
| parent | 0829cebeb024095c268f190c34daa8ae9a5a224c (diff) | |
Merge branch 'asset-uuid--archived' into asset-engine--archivedasset-engine--archived
Diffstat (limited to 'source/blender/makesdna/DNA_customdata_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_customdata_types.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index e4999fd4464..c24bbccae1e 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -148,10 +148,9 @@ typedef enum CustomDataType { CD_CUSTOMLOOPNORMAL = 41, CD_SCULPT_FACE_SETS = 42, - /* Hair and PointCloud */ CD_LOCATION = 43, - CD_RADIUS = 44, CD_HAIRCURVE = 45, + CD_RADIUS = 44, CD_HAIRMAPPING = 46, CD_PROP_COLOR = 47, @@ -205,7 +204,7 @@ typedef enum CustomDataType { #define CD_MASK_TESSLOOPNORMAL (1LL << CD_TESSLOOPNORMAL) #define CD_MASK_CUSTOMLOOPNORMAL (1LL << CD_CUSTOMLOOPNORMAL) #define CD_MASK_SCULPT_FACE_SETS (1LL << CD_SCULPT_FACE_SETS) -#define CD_MASK_PROP_COLOR (1LL << CD_PROP_COLOR) +#define CD_MASK_PROP_COLOR (1ULL << CD_PROP_COLOR) /** 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) |