diff options
Diffstat (limited to 'source/blender/makesdna/DNA_space_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 47 |
1 files changed, 31 insertions, 16 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 9d5b6bb42b4..266fe5afe17 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -46,6 +46,7 @@ #include "DNA_node_types.h" /* for bNodeInstanceKey */ /* Hum ... Not really nice... but needed for spacebuts. */ #include "DNA_view2d_types.h" +#include "DNA_widget_types.h" struct ID; struct Text; @@ -323,6 +324,11 @@ typedef struct SpaceIpo { ListBase ghostCurves; /* sampled snapshots of F-Curves used as in-session guides */ + struct Object *backdrop_camera; /* the view from this camera is used to draw the backdrop */ + float backdrop_offset[2]; /* offset of the backdrop */ + float backdrop_zoom; /* zoom factor of the backdrop */ + float backdrop_opacity; /* opacity of the backdrop */ + short mode; /* mode for the Graph editor (eGraphEdit_Mode) */ short autosnap; /* time-transform autosnapping settings for Graph editor (eAnimEdit_AutoSnap in DNA_action_types.h) */ int flag; /* settings for Graph editor (eGraphEdit_Flag) */ @@ -367,6 +373,7 @@ typedef enum eGraphEdit_Flag { /* normalize curves on display */ SIPO_NORMALIZE = (1 << 14), SIPO_NORMALIZE_FREEZE = (1 << 15), + SIPO_DRAW_BACKDROP = (1 << 16), } eGraphEdit_Flag; /* SpaceIpo->mode (Graph Editor Mode) */ @@ -498,7 +505,8 @@ typedef struct SpaceSeq { int view; /* see SEQ_VIEW_* below */ int overlay_type; int draw_flag; /* overlay an image of the editing on below the strips */ - int pad; + float overdrop_zoom; + float overdrop_offset[2]; struct bGPdata *gpd; /* grease-pencil data */ @@ -520,7 +528,7 @@ typedef enum eSpaceSeq_RegionType { /* sseq->draw_flag */ typedef enum eSpaceSeq_DrawFlag { - SEQ_DRAW_BACKDROP = (1 << 0), + SEQ_DRAW_OVERDROP = (1 << 0), SEQ_DRAW_OFFSET_EXT = (1 << 1), } eSpaceSeq_DrawFlag; @@ -538,6 +546,7 @@ typedef enum eSpaceSeq_Flag { SEQ_NO_WAVEFORMS = (1 << 8), /* draw no waveforms */ SEQ_SHOW_SAFE_CENTER = (1 << 9), SEQ_SHOW_METADATA = (1 << 10), + SEQ_NO_INFO = (1 << 11), /* do not draw names on strips */ } eSpaceSeq_Flag; /* sseq->view */ @@ -695,17 +704,19 @@ typedef enum eFileSel_Action { /* sfile->params->flag and simasel->flag */ typedef enum eFileSel_Params_Flag { - FILE_SHOWSHORT = (1 << 0), - FILE_RELPATH = (1 << 1), /* was FILE_STRINGCODE */ - FILE_LINK = (1 << 2), - FILE_HIDE_DOT = (1 << 3), - FILE_AUTOSELECT = (1 << 4), - FILE_ACTIVELAY = (1 << 5), -/* FILE_ATCURSOR = (1 << 6), */ /* deprecated */ - FILE_DIRSEL_ONLY = (1 << 7), - FILE_FILTER = (1 << 8), - FILE_BOOKMARKS = (1 << 9), - FILE_GROUP_INSTANCE = (1 << 10), + FILE_SHOWSHORT = (1 << 0), + FILE_RELPATH = (1 << 1), /* was FILE_STRINGCODE */ + FILE_LINK = (1 << 2), + FILE_HIDE_DOT = (1 << 3), + FILE_AUTOSELECT = (1 << 4), + FILE_ACTIVELAY = (1 << 5), +/* FILE_ATCURSOR = (1 << 6), */ /* deprecated */ + FILE_DIRSEL_ONLY = (1 << 7), + FILE_FILTER = (1 << 8), + FILE_BOOKMARKS = (1 << 9), + FILE_GROUP_INSTANCE = (1 << 10), + FILE_COLLAPSE_IMAGES = (1 << 11), + FILE_COLLAPSE_IMAGES_TMP = (1 << 12), } eFileSel_Params_Flag; @@ -733,6 +744,8 @@ typedef enum eDirEntry_SelectFlag { FILE_SEL_HIGHLIGHTED = (1 << 2), FILE_SEL_SELECTED = (1 << 3), FILE_SEL_EDITING = (1 << 4), + FILE_SEL_COLLAPSED = (1 << 5), + FILE_SEL_PLAYING = (1 << 6), } eDirEntry_SelectFlag; /* Image/UV Editor ======================================== */ @@ -965,11 +978,13 @@ typedef struct SpaceNode { struct ID *id, *from; /* context, no need to save in file? well... pinning... */ short flag, pad1; /* menunr: browse id block in header */ - float aspect, pad2; /* internal state variables */ + float aspect; /* internal state variables */ - float xof, yof; /* offset for drawing the backdrop */ - float zoom; /* zoom for backdrop */ float cursor[2]; /* mouse pos for drawing socketless link and adding nodes */ + + float backdrop_offset[2]; + float backdrop_zoom; + float pad; /* XXX nodetree pointer info is all in the path stack now, * remove later on and use bNodeTreePath instead. For now these variables are set when pushing/popping |