diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-08-17 12:30:00 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-08-17 12:30:00 +0300 |
| commit | 3f0e2dba681f04bb70e06328d5c6439ce1290896 (patch) | |
| tree | 0e91d14932d917a0afd3ee12331a9a4b1e4eb5ae /source/blender/makesdna | |
| parent | 8b4f318f92509a9d4b6a20a3b47ae06045c8d007 (diff) | |
| parent | 68651534c26346015a70775aef1fdadab2946fb6 (diff) | |
Merge branch 'master' into greasepencil-edit-curve
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_defaults.h | 1 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_screen_types.h | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_scene_defaults.h b/source/blender/makesdna/DNA_scene_defaults.h index ec64eea0aae..69580da8c5f 100644 --- a/source/blender/makesdna/DNA_scene_defaults.h +++ b/source/blender/makesdna/DNA_scene_defaults.h @@ -364,4 +364,3 @@ } /* clang-format off */ - diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index d5b828c898d..7ff96c5a908 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -635,13 +635,21 @@ 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 /* Region supports panel tabs (categories). */ #define RGN_TYPE_HAS_CATEGORY_MASK (1 << RGN_TYPE_UI) +/* Check for any kind of header region. */ +#define RGN_TYPE_IS_HEADER_ANY(regiontype) \ + (((1 << (regiontype)) & \ + ((1 << RGN_TYPE_HEADER) | 1 << (RGN_TYPE_TOOL_HEADER) | (1 << RGN_TYPE_FOOTER))) != 0) + /** #ARegion.alignment */ enum { RGN_ALIGN_NONE = 0, @@ -661,6 +669,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 { |