diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-12-10 04:44:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-10 04:44:24 +0300 |
commit | cecd4fe2548c57d3ef11010e039410b793b675dd (patch) | |
tree | b456c5b7328bb85334e7e55378d8c75580317a12 /source/blender/makesdna | |
parent | 168a6a4bfc13cbe5c2fb510607b9565de3eb9472 (diff) | |
parent | 9df2b6da3a718323dbe9431c5a4b43fc309fa4b9 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_action_types.h | 16 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 19 |
2 files changed, 29 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 4d0f4ef1b0f..538604f46d0 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -692,6 +692,11 @@ typedef enum eDopeSheet_Flag { +typedef struct SpaceAction_Runtime { + char flag; + char _pad0[7]; +} SpaceAction_Runtime; + /* Action Editor Space. This is defined here instead of in DNA_space_types.h */ typedef struct SpaceAction { struct SpaceLink *next, *prev; @@ -716,6 +721,8 @@ typedef struct SpaceAction { char autosnap; /* automatic keyframe snapping mode */ char cache_display; /* (eTimeline_Cache_Flag) */ char _pad1[6]; + + SpaceAction_Runtime runtime; } SpaceAction; /* SpaceAction flag */ @@ -738,8 +745,6 @@ typedef enum eSAction_Flag { SACTION_NODRAWGCOLORS = (1 << 7), /* don't draw current frame number beside frame indicator */ SACTION_NODRAWCFRANUM = (1 << 8), - /* temporary flag to force channel selections to be synced with main */ - SACTION_TEMP_NEEDCHANSYNC = (1 << 9), /* don't perform realtime updates */ SACTION_NOREALTIMEUPDATES = (1 << 10), /* move markers as well as keyframes */ @@ -750,6 +755,13 @@ typedef enum eSAction_Flag { SACTION_SHOW_EXTREMES = (1 << 13), } eSAction_Flag; + +/* SpaceAction_Runtime.flag */ +typedef enum eSAction_Runtime_Flag { + /** Temporary flag to force channel selections to be synced with main */ + SACTION_RUNTIME_FLAG_NEED_CHAN_SYNC = (1 << 0), +} eSAction_Runtime_Flag; + /* SpaceAction Mode Settings */ typedef enum eAnimEdit_Context { /* action on the active object */ diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 9c1b999cbd6..1e4e58b7c7e 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -358,6 +358,14 @@ typedef enum eSpaceOutliner_Search_Flags { /** \name Graph Editor * \{ */ +typedef struct SpaceIpo_Runtime { + /** #eGraphEdit_Runtime_Flag */ + char flag; + char _pad[7]; + /** Sampled snapshots of F-Curves used as in-session guides */ + ListBase ghost_curves; +} SpaceIpo_Runtime; + /* 'Graph' Editor (formerly known as the IPO Editor) */ typedef struct SpaceIpo { SpaceLink *next, *prev; @@ -371,8 +379,6 @@ typedef struct SpaceIpo { struct bDopeSheet *ads; /* settings for filtering animation data (NOTE: we use a pointer due to code-linking issues) */ - ListBase ghostCurves; /* sampled snapshots of F-Curves used as in-session guides */ - 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) */ @@ -381,6 +387,8 @@ typedef struct SpaceIpo { float cursorVal; /* cursor value (y-value, x-value is current frame) */ int around; /* pivot point for transforms */ int pad; + + SpaceIpo_Runtime runtime; } SpaceIpo; @@ -408,8 +416,6 @@ typedef enum eGraphEdit_Flag { SIPO_NODRAWCURSOR = (1 << 8), /* only show handles of selected keyframes */ SIPO_SELVHANDLESONLY = (1 << 9), - /* temporary flag to force channel selections to be synced with main */ - SIPO_TEMP_NEEDCHANSYNC = (1 << 10), /* don't perform realtime updates */ SIPO_NOREALTIMEUPDATES = (1 << 11), /* don't draw curves with AA ("beauty-draw") for performance */ @@ -429,6 +435,11 @@ typedef enum eGraphEdit_Mode { SIPO_MODE_DRIVERS = 1, } eGraphEdit_Mode; +typedef enum eGraphEdit_Runtime_Flag { + /** Temporary flag to force channel selections to be synced with main. */ + SIPO_RUNTIME_FLAG_NEED_CHAN_SYNC = (1 << 0), +} eGraphEdit_Runtime_Flag; + /** \} */ /* -------------------------------------------------------------------- */ |