diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-30 01:49:49 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-30 01:49:49 +0400 |
| commit | 870aa901120fc8db499f9bea3a9a86006ef4cc3a (patch) | |
| tree | b39a0a390179ba117310532545ff146dd3bb8dc5 /source/blender/blenkernel/BKE_customdata.h | |
| parent | de4eeb96946943289ac898525f09fc9c7afd4157 (diff) | |
| parent | b820ec4ae4a62a05fc9ac6ca9c93a17128675407 (diff) | |
svn merge ^/trunk/blender -r43733:43751
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 4af19f7b0e7..b69ad4d1b8b 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -71,7 +71,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)) /* Checks if the layer at physical offset layern (in data->layers) support math * the below operations. |