diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-01-27 12:15:30 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-01-27 12:15:30 +0400 |
| commit | 82300fabb9cc0d55c3044fc1cf039025bd39129a (patch) | |
| tree | 4ec98e8e1c73590dba7bfffd6cf34427f62ef26a /source/blender/blenkernel/BKE_customdata.h | |
| parent | b35446c3fa84ec0b817be1aaf356c3e3a5071285 (diff) | |
Minor fix for CD_TYPE_AS_MASK macro: shift operator uses the left
operand's type for the result, so cast 1 to CustomDataMask.
Diffstat (limited to 'source/blender/blenkernel/BKE_customdata.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_customdata.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index 1af2f014ef4..7ad25ac7e79 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -67,7 +67,7 @@ extern const CustomDataMask CD_MASK_FACECORNERS; #define CD_DUPLICATE 4 /* do a full copy of all layers, only allowed if source has same number of elements */ -#define CD_TYPE_AS_MASK(_type) (CustomDataMask)(1 << (CustomDataMask)(_type)) +#define CD_TYPE_AS_MASK(_type) (CustomDataMask)((CustomDataMask)1 << (CustomDataMask)(_type)) /* initialises a CustomData object with the same layer setup as source. * mask is a bitfield where (mask & (1 << (layer type))) indicates |