diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-08-16 07:21:04 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-08-16 07:21:04 +0300 |
commit | d5d83b71f75d8f01f3278020147ebd09040558af (patch) | |
tree | 4556c642b16e4a8326ec99ccc252221fefe9c03a /source/blender/makesdna | |
parent | 93304b483a5cdbbef48ce2777a3260ef6440e3ce (diff) | |
parent | 73fb445b8dbe88b1ac8e12acd2515618f9e64ac0 (diff) |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_screen_types.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index d5b828c898d..60d6f85569c 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -635,7 +635,10 @@ typedef enum eRegionType { RGN_TYPE_EXECUTE = 10, RGN_TYPE_FOOTER = 11, RGN_TYPE_TOOL_HEADER = 12, + +#define RGN_TYPE_LEN (RGN_TYPE_TOOL_HEADER + 1) } eRegionType; + /* use for function args */ #define RGN_TYPE_ANY -1 @@ -661,6 +664,7 @@ enum { /** Mask out flags so we can check the alignment. */ #define RGN_ALIGN_ENUM_FROM_MASK(align) ((align) & ((1 << 4) - 1)) +#define RGN_ALIGN_FLAG_FROM_MASK(align) ((align) & ~((1 << 4) - 1)) /** #ARegion.flag */ enum { |