diff options
Diffstat (limited to 'source/blender/makesdna/DNA_space_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 79 |
1 files changed, 51 insertions, 28 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 06ab01a9730..a3aa79d29e8 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -56,9 +56,8 @@ struct bNodeTree; struct wmOperator; struct wmTimer; -/* TODO 2.8: We don't write the global areas to files currently. Uncomment - * define to enable writing (should become the default in a bit). */ -//#define WITH_GLOBAL_AREA_WRITING +/* Defined in `buttons_intern.h`. */ +typedef struct SpaceProperties_Runtime SpaceProperties_Runtime; /* -------------------------------------------------------------------- */ /** \name SpaceLink (Base) @@ -159,6 +158,9 @@ typedef struct SpaceProperties { ID *pinid; void *texuser; + + /* Doesn't necessarily need to be a pointer, but runtime structs are still written to files. */ + struct SpaceProperties_Runtime *runtime; } SpaceProperties; /* button defines (deprecated) */ @@ -232,6 +234,9 @@ typedef enum eSpaceButtons_Flag { /** \name Outliner * \{ */ +/* Defined in `outliner_intern.h`. */ +typedef struct SpaceOutliner_Runtime SpaceOutliner_Runtime; + /* Outliner */ typedef struct SpaceOutliner { SpaceLink *next, *prev; @@ -274,6 +279,8 @@ typedef struct SpaceOutliner { * Pointers to treestore elements, grouped by (id, type, nr) * in hashtable for faster searching */ void *treehash; + + SpaceOutliner_Runtime *runtime; } SpaceOutliner; /* SpaceOutliner.flag */ @@ -303,11 +310,11 @@ typedef enum eSpaceOutliner_Filter { SO_FILTER_NO_OB_CAMERA = (1 << 10), SO_FILTER_NO_OB_OTHERS = (1 << 11), - SO_FILTER_UNUSED_12 = (1 << 12), /* cleared */ - SO_FILTER_OB_STATE_VISIBLE = (1 << 13), /* Not set via DNA. */ - SO_FILTER_OB_STATE_HIDDEN = (1 << 14), /* Not set via DNA. */ - SO_FILTER_OB_STATE_SELECTED = (1 << 15), /* Not set via DNA. */ - SO_FILTER_OB_STATE_ACTIVE = (1 << 16), /* Not set via DNA. */ + SO_FILTER_OB_STATE_SELECTABLE = (1 << 12), /* Not set via DNA. */ + SO_FILTER_OB_STATE_VISIBLE = (1 << 13), /* Not set via DNA. */ + SO_FILTER_OB_STATE_HIDDEN = (1 << 14), /* Not set via DNA. */ + SO_FILTER_OB_STATE_SELECTED = (1 << 15), /* Not set via DNA. */ + SO_FILTER_OB_STATE_ACTIVE = (1 << 16), /* Not set via DNA. */ SO_FILTER_NO_COLLECTION = (1 << 17), SO_FILTER_ID_TYPE = (1 << 18), @@ -319,7 +326,7 @@ typedef enum eSpaceOutliner_Filter { #define SO_FILTER_OB_STATE \ (SO_FILTER_OB_STATE_VISIBLE | SO_FILTER_OB_STATE_HIDDEN | SO_FILTER_OB_STATE_SELECTED | \ - SO_FILTER_OB_STATE_ACTIVE) + SO_FILTER_OB_STATE_ACTIVE | SO_FILTER_OB_STATE_SELECTABLE) #define SO_FILTER_ANY \ (SO_FILTER_NO_OB_CONTENT | SO_FILTER_NO_CHILDREN | SO_FILTER_OB_TYPE | SO_FILTER_OB_STATE | \ @@ -332,6 +339,7 @@ typedef enum eSpaceOutliner_StateFilter { SO_FILTER_OB_HIDDEN = 2, SO_FILTER_OB_SELECTED = 3, SO_FILTER_OB_ACTIVE = 4, + SO_FILTER_OB_SELECTABLE = 5, } eSpaceOutliner_StateFilter; /* SpaceOutliner.show_restrict_flags */ @@ -462,7 +470,7 @@ typedef enum eGraphEdit_Flag { /* don't draw curves with AA ("beauty-draw") for performance */ SIPO_BEAUTYDRAW_OFF = (1 << 12), /* draw grouped channels with colors set in group */ - SIPO_NODRAWGCOLORS = (1 << 13), + /* SIPO_NODRAWGCOLORS = (1 << 13), DEPRECATED */ /* normalize curves on display */ SIPO_NORMALIZE = (1 << 14), SIPO_NORMALIZE_FREEZE = (1 << 15), @@ -625,13 +633,13 @@ typedef enum eSpaceSeq_Displays { /* SpaceSeq.render_size */ typedef enum eSpaceSeq_Proxy_RenderSize { - SEQ_PROXY_RENDER_SIZE_NONE = -1, - SEQ_PROXY_RENDER_SIZE_SCENE = 0, - SEQ_PROXY_RENDER_SIZE_25 = 25, - SEQ_PROXY_RENDER_SIZE_50 = 50, - SEQ_PROXY_RENDER_SIZE_75 = 75, - SEQ_PROXY_RENDER_SIZE_100 = 99, - SEQ_PROXY_RENDER_SIZE_FULL = 100, + SEQ_RENDER_SIZE_NONE = -1, + SEQ_RENDER_SIZE_SCENE = 0, + SEQ_RENDER_SIZE_PROXY_25 = 25, + SEQ_RENDER_SIZE_PROXY_50 = 50, + SEQ_RENDER_SIZE_PROXY_75 = 75, + SEQ_RENDER_SIZE_PROXY_100 = 99, + SEQ_RENDER_SIZE_FULL = 100, } eSpaceSeq_Proxy_RenderSize; typedef struct MaskSpaceInfo { @@ -758,7 +766,13 @@ typedef struct SpaceFile { /* FileSelectParams.display */ enum eFileDisplayType { + /** Internal (not exposed to users): Keep whatever display type was used during the last File + * Browser use, or the default if no such record is found. Use this unless there's a good reason + * to set a specific display type. */ FILE_DEFAULTDISPLAY = 0, + + /* User selectable choices. */ + FILE_VERTICALDISPLAY = 1, FILE_HORIZONTALDISPLAY = 2, FILE_IMGDISPLAY = 3, @@ -766,7 +780,13 @@ enum eFileDisplayType { /* FileSelectParams.sort */ enum eFileSortType { - FILE_SORT_NONE = 0, + /** Internal (not exposed to users): Sort by whatever was sorted by during the last File Browser + * use, or the default if no such record is found. Use this unless there's a good reason to set a + * specific sort order. */ + FILE_SORT_DEFAULT = 0, + + /* User selectable choices. */ + FILE_SORT_ALPHA = 1, FILE_SORT_EXTENSION = 2, FILE_SORT_TIME = 3, @@ -1027,6 +1047,12 @@ enum { * \{ */ /* Image/UV Editor */ + +typedef struct SpaceImageOverlay { + int flag; + char _pad[4]; +} SpaceImageOverlay; + typedef struct SpaceImage { SpaceLink *next, *prev; /** Storage of regions for inactive spaces. */ @@ -1086,6 +1112,7 @@ typedef struct SpaceImage { int tile_grid_shape[2]; MaskSpaceInfo mask_info; + SpaceImageOverlay overlay; } SpaceImage; /* SpaceImage.dt_uv */ @@ -1148,7 +1175,7 @@ typedef enum eSpaceImage_Flag { SI_PREVSPACE = (1 << 15), SI_FULLWINDOW = (1 << 16), - SI_FLAG_UNUSED_17 = (1 << 17), /* cleared */ + SI_FLAG_UNUSED_17 = (1 << 17), SI_FLAG_UNUSED_18 = (1 << 18), /* cleared */ /** @@ -1156,7 +1183,7 @@ typedef enum eSpaceImage_Flag { * in the image view, it's unrelated to UDIM tiles. */ SI_DRAW_TILE = (1 << 19), - SI_SMOOTH_UV = (1 << 20), + SI_FLAG_UNUSED_20 = (1 << 20), /* cleared */ SI_DRAW_STRETCH = (1 << 21), SI_SHOW_GPENCIL = (1 << 22), SI_FLAG_UNUSED_23 = (1 << 23), /* cleared */ @@ -1171,6 +1198,10 @@ typedef enum eSpaceImage_Flag { SI_SHOW_B = (1 << 29), } eSpaceImage_Flag; +typedef enum eSpaceImageOverlay_Flag { + SI_OVERLAY_SHOW_OVERLAYS = (1 << 0), +} eSpaceImageOverlay_Flag; + /** \} */ /* -------------------------------------------------------------------- */ @@ -1655,10 +1686,6 @@ typedef enum eSpaceClip_GPencil_Source { /** \name Top Bar * \{ */ -/* These two lines with # tell makesdna this struct can be excluded. - * Should be: #ifndef WITH_GLOBAL_AREA_WRITING */ -# -# typedef struct SpaceTopBar { SpaceLink *next, *prev; /** Storage of regions for inactive spaces. */ @@ -1675,10 +1702,6 @@ typedef struct SpaceTopBar { /** \name Status Bar * \{ */ -/* These two lines with # tell makesdna this struct can be excluded. - * Should be: #ifndef WITH_GLOBAL_AREA_WRITING */ -# -# typedef struct SpaceStatusBar { SpaceLink *next, *prev; /** Storage of regions for inactive spaces. */ |