From 9df2b6da3a718323dbe9431c5a4b43fc309fa4b9 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 10 Dec 2018 11:46:36 +1100
Subject: DNA: add runtime struct to for graph & action editor

Move struct members, no functional change
---
 source/blender/makesdna/DNA_action_types.h | 16 ++++++++++++++--
 source/blender/makesdna/DNA_space_types.h  | 19 +++++++++++++++----
 2 files changed, 29 insertions(+), 6 deletions(-)

(limited to 'source/blender/makesdna')

diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index bcb92cccecd..aa39d53e62b 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -648,6 +648,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;
@@ -665,6 +670,8 @@ typedef struct SpaceAction {
 	char mode, autosnap;        /* mode: editing context; autosnap: automatic keyframe snapping mode   */
 	short flag;                 /* flag: bitmapped settings; */
 	float timeslide;            /* for Time-Slide transform mode drawing - current frame? */
+
+	SpaceAction_Runtime runtime;
 } SpaceAction;
 
 /* SpaceAction flag */
@@ -687,14 +694,19 @@ 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 */
 	SACTION_MARKERS_MOVE = (1 << 11)
 } 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 e94364e8a65..029f7a6fca9 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -327,6 +327,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;
@@ -340,8 +348,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) */
@@ -350,6 +356,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;
 
 
@@ -377,8 +385,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 */
@@ -398,6 +404,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;
+
 /** \} */
 
 /* -------------------------------------------------------------------- */
-- 
cgit v1.2.3