diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-15 12:14:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-15 12:14:33 +0300 |
| commit | e0903e20a7010e70706a062655003aefcfc18687 (patch) | |
| tree | 4013e8365f7a6874282b44fc0b66b6661c4bb908 /source/blender/makesdna/DNA_space_types.h | |
| parent | f1bc8991461fcda33eb34820bd3aa153f6122c5b (diff) | |
| parent | 3eb9cc69f2005755224fcc4ad44aafaa4e7cd40c (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_space_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 292120d1f6e..e3ebdd079ca 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -1292,7 +1292,6 @@ typedef struct SpaceClip { MaskSpaceInfo mask_info; } SpaceClip; - /* SpaceClip->flag */ typedef enum eSpaceClip_Flag { SC_SHOW_MARKER_PATTERN = (1 << 0), @@ -1388,7 +1387,7 @@ typedef enum eSpace_Type { SPACE_CLIP = 20, SPACE_TOPBAR = 21, - SPACEICONMAX = SPACE_TOPBAR + SPACE_TYPE_LAST = SPACE_TOPBAR } eSpace_Type; /* use for function args */ |