DNA: rename SpaceIpo -> SpaceGraph

8 files changed, 39 insertions, 39 deletions

diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c
index d90b571005b..a645dc50722 100644
--- a/source/blender/editors/space_graph/graph_buttons.c
+++ b/source/blender/editors/space_graph/graph_buttons.c
@@ -108,7 +108,7 @@ static bool graph_panel_poll(const bContext *C, PanelType *UNUSED(pt))
 static void graph_panel_view(const bContext *C, Panel *pa)
 {
 	bScreen *sc = CTX_wm_screen(C);
-	SpaceIpo *sipo = CTX_wm_space_graph(C);
+	SpaceGraph *sipo = CTX_wm_space_graph(C);
 	Scene *scene = CTX_data_scene(C);
 	PointerRNA spaceptr, sceneptr;
 	uiLayout *col, *sub, *row;
@@ -576,7 +576,7 @@ static void driver_update_flags_cb(bContext *UNUSED(C), void *fcu_v, void *UNUSE
 /* drivers panel poll */
 static bool graph_panel_drivers_poll(const bContext *C, PanelType *UNUSED(pt))
 {
-	SpaceIpo *sipo = CTX_wm_space_graph(C);
+	SpaceGraph *sipo = CTX_wm_space_graph(C);
 
 	if (sipo->mode != SIPO_MODE_DRIVERS)
 		return 0;
diff --git a/source/blender/editors/space_graph/graph_draw.c b/source/blender/editors/space_graph/graph_draw.c
index 19b905c874f..89ea596ceba 100644
--- a/source/blender/editors/space_graph/graph_draw.c
+++ b/source/blender/editors/space_graph/graph_draw.c
@@ -304,7 +304,7 @@ static void draw_fcurve_vertices(ARegion *ar, FCurve *fcu, bool do_handles, bool
 
 /* Handles ---------------- */
 
-static bool draw_fcurve_handles_check(SpaceIpo *sipo, FCurve *fcu)
+static bool draw_fcurve_handles_check(SpaceGraph *sipo, FCurve *fcu)
 {
 	/* don't draw handle lines if handles are not to be shown */
 	if (
@@ -332,7 +332,7 @@ static bool draw_fcurve_handles_check(SpaceIpo *sipo, FCurve *fcu)
 
 /* draw lines for F-Curve handles only (this is only done in EditMode)
  * note: draw_fcurve_handles_check must be checked before running this. */
-static void draw_fcurve_handles(SpaceIpo *sipo, FCurve *fcu)
+static void draw_fcurve_handles(SpaceGraph *sipo, FCurve *fcu)
 {
 	int sel, b;
 
@@ -446,7 +446,7 @@ static void draw_fcurve_sample_control(float x, float y, float xscale, float ysc
 }
 
 /* helper func - draw keyframe vertices only for an F-Curve */
-static void draw_fcurve_samples(SpaceIpo *sipo, ARegion *ar, FCurve *fcu)
+static void draw_fcurve_samples(SpaceGraph *sipo, ARegion *ar, FCurve *fcu)
 {
 	FPoint *first, *last;
 	float hsize, xscale, yscale;
@@ -485,7 +485,7 @@ static void draw_fcurve_samples(SpaceIpo *sipo, ARegion *ar, FCurve *fcu)
 /* helper func - just draw the F-Curve by sampling the visible region (for drawing curves with modifiers) */
 static void draw_fcurve_curve(bAnimContext *ac, ID *id, FCurve *fcu, View2D *v2d, View2DGrid *grid, unsigned int pos)
 {
-	SpaceIpo *sipo = (SpaceIpo *)ac->sl;
+	SpaceGraph *sipo = (SpaceGraph *)ac->sl;
 	ChannelDriver *driver;
 	float samplefreq;
 	float stime, etime;
@@ -965,7 +965,7 @@ static void graph_draw_driver_debug(bAnimContext *ac, ID *id, FCurve *fcu)
 /* Draw the 'ghost' F-Curves (i.e. snapshots of the curve)
  * NOTE: unit mapping has already been applied to the values, so do not try and apply again
  */
-void graph_draw_ghost_curves(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar)
+void graph_draw_ghost_curves(bAnimContext *ac, SpaceGraph *sipo, ARegion *ar)
 {
 	FCurve *fcu;
 
@@ -1013,7 +1013,7 @@ void graph_draw_ghost_curves(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar)
 /* This is called twice from space_graph.c -> graph_main_region_draw()
  * Unselected then selected F-Curves are drawn so that they do not occlude each other.
  */
-void graph_draw_curves(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGrid *grid, short sel)
+void graph_draw_curves(bAnimContext *ac, SpaceGraph *sipo, ARegion *ar, View2DGrid *grid, short sel)
 {
 	ListBase anim_data = {NULL, NULL};
 	bAnimListElem *ale;
diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c
index 6c7e73ad57d..8beadadd107 100644
--- a/source/blender/editors/space_graph/graph_edit.c
+++ b/source/blender/editors/space_graph/graph_edit.c
@@ -332,7 +332,7 @@ void GRAPH_OT_view_frame(wmOperatorType *ot)
 /* Bake each F-Curve into a set of samples, and store as a ghost curve */
 static void create_ghost_curves(bAnimContext *ac, int start, int end)
 {
-	SpaceIpo *sipo = (SpaceIpo *)ac->sl;
+	SpaceGraph *sipo = (SpaceGraph *)ac->sl;
 	ListBase anim_data = {NULL, NULL};
 	bAnimListElem *ale;
 	int filter;
@@ -448,12 +448,12 @@ void GRAPH_OT_ghost_curves_create(wmOperatorType *ot)
 static int graphkeys_clear_ghostcurves_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	bAnimContext ac;
-	SpaceIpo *sipo;
+	SpaceGraph *sipo;
 
 	/* get editor data */
 	if (ANIM_animdata_get_context(C, &ac) == 0)
 		return OPERATOR_CANCELLED;
-	sipo = (SpaceIpo *)ac.sl;
+	sipo = (SpaceGraph *)ac.sl;
 
 	/* if no ghost curves, don't do anything */
 	if (BLI_listbase_is_empty(&sipo->runtime.ghost_curves)) {
@@ -520,7 +520,7 @@ static void insert_graph_keys(bAnimContext *ac, eGraphKeys_InsertKey_Types mode)
 	size_t num_items;
 
 	ReportList *reports = ac->reports;
-	SpaceIpo *sipo = (SpaceIpo *)ac->sl;
+	SpaceGraph *sipo = (SpaceGraph *)ac->sl;
 	struct Depsgraph *depsgraph = ac->depsgraph;
 	Scene *scene = ac->scene;
 	ToolSettings *ts = scene->toolsettings;
@@ -2030,7 +2030,7 @@ static int graphkeys_framejump_exec(bContext *C, wmOperator *UNUSED(op))
 
 	/* set the new current frame and cursor values, based on the average time and value */
 	if (ked.i1) {
-		SpaceIpo *sipo = (SpaceIpo *)ac.sl;
+		SpaceGraph *sipo = (SpaceGraph *)ac.sl;
 		Scene *scene = ac.scene;
 
 		/* take the average values, rounding to the nearest int as necessary for int results */
@@ -2094,7 +2094,7 @@ static void snap_graph_keys(bAnimContext *ac, short mode)
 	bAnimListElem *ale;
 	int filter;
 
-	SpaceIpo *sipo = (SpaceIpo *)ac->sl;
+	SpaceGraph *sipo = (SpaceGraph *)ac->sl;
 	KeyframeEditData ked;
 	KeyframeEditFunc edit_cb;
 	float cursor_value = 0.0f;
@@ -2221,7 +2221,7 @@ static void mirror_graph_keys(bAnimContext *ac, short mode)
 	bAnimListElem *ale;
 	int filter;
 
-	SpaceIpo *sipo = (SpaceIpo *)ac->sl;
+	SpaceGraph *sipo = (SpaceGraph *)ac->sl;
 	KeyframeEditData ked;
 	KeyframeEditFunc edit_cb;
 	float cursor_value = 0.0f;
diff --git a/source/blender/editors/space_graph/graph_intern.h b/source/blender/editors/space_graph/graph_intern.h
index fe80df38ace..576a34fead6 100644
--- a/source/blender/editors/space_graph/graph_intern.h
+++ b/source/blender/editors/space_graph/graph_intern.h
@@ -26,7 +26,7 @@
 struct ARegion;
 struct ARegionType;
 struct ScrArea;
-struct SpaceIpo;
+struct SpaceGraph;
 struct View2DGrid;
 struct bAnimContext;
 struct bAnimListElem;
@@ -42,8 +42,8 @@ struct ARegion *graph_has_buttons_region(struct ScrArea *sa);
 /* graph_draw.c */
 void graph_draw_channel_names(struct bContext *C, struct bAnimContext *ac, struct ARegion *ar);
 
-void graph_draw_curves(struct bAnimContext *ac, struct SpaceIpo *sipo, struct ARegion *ar, struct View2DGrid *grid, short sel);
-void graph_draw_ghost_curves(struct bAnimContext *ac, struct SpaceIpo *sipo, struct ARegion *ar);
+void graph_draw_curves(struct bAnimContext *ac, struct SpaceGraph *sipo, struct ARegion *ar, struct View2DGrid *grid, short sel);
+void graph_draw_ghost_curves(struct bAnimContext *ac, struct SpaceGraph *sipo, struct ARegion *ar);
 
 /* ***************************************** */
 /* graph_select.c */
diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c
index 0dc3b086dcc..6ab289982a2 100644
--- a/source/blender/editors/space_graph/graph_ops.c
+++ b/source/blender/editors/space_graph/graph_ops.c
@@ -75,7 +75,7 @@ static void graphview_cursor_apply(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	SpaceIpo *sipo = CTX_wm_space_graph(C);
+	SpaceGraph *sipo = CTX_wm_space_graph(C);
 	/* this isn't technically "frame", but it'll do... */
 	float frame = RNA_float_get(op->ptr, "frame");
 
diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c
index b765ed4d8bf..6b7e1f10bb3 100644
--- a/source/blender/editors/space_graph/graph_select.c
+++ b/source/blender/editors/space_graph/graph_select.c
@@ -83,7 +83,7 @@ void deselect_graph_keys(bAnimContext *ac, bool test, short sel, bool do_channel
 	bAnimListElem *ale;
 	int filter;
 
-	SpaceIpo *sipo = (SpaceIpo *)ac->sl;
+	SpaceGraph *sipo = (SpaceGraph *)ac->sl;
 	KeyframeEditData ked = {{NULL}};
 	KeyframeEditFunc test_cb, sel_cb;
 
@@ -235,7 +235,7 @@ static void box_select_graphkeys(
 	bAnimListElem *ale;
 	int filter, mapping_flag;
 
-	SpaceIpo *sipo = (SpaceIpo *)ac->sl;
+	SpaceGraph *sipo = (SpaceGraph *)ac->sl;
 	KeyframeEditData ked;
 	KeyframeEditFunc ok_cb, select_cb;
 	View2D *v2d = &ac->ar->v2d;
@@ -453,7 +453,7 @@ static int graphkeys_lassoselect_exec(bContext *C, wmOperator *op)
 		selectmode = SELECT_SUBTRACT;
 
 	{
-		SpaceIpo *sipo = (SpaceIpo *)ac.sl;
+		SpaceGraph *sipo = (SpaceGraph *)ac.sl;
 		if (selectmode == SELECT_ADD) {
 			incl_handles = ((sipo->flag & SIPO_SELVHANDLESONLY) ||
 			                (sipo->flag & SIPO_NOHANDLES)) == 0;
@@ -530,7 +530,7 @@ static int graph_circle_select_exec(bContext *C, wmOperator *op)
 	rect_fl.ymax = y + radius;
 
 	{
-		SpaceIpo *sipo = (SpaceIpo *)ac.sl;
+		SpaceGraph *sipo = (SpaceGraph *)ac.sl;
 		if (selectmode == SELECT_ADD) {
 			incl_handles = ((sipo->flag & SIPO_SELVHANDLESONLY) ||
 			                (sipo->flag & SIPO_NOHANDLES)) == 0;
@@ -1113,7 +1113,7 @@ typedef enum eGraphVertIndex {
 
 /* check if its ok to select a handle */
 // XXX also need to check for int-values only?
-static bool fcurve_handle_sel_check(SpaceIpo *sipo, BezTriple *bezt)
+static bool fcurve_handle_sel_check(SpaceGraph *sipo, BezTriple *bezt)
 {
 	if (sipo->flag & SIPO_NOHANDLES) return 0;
 	if ((sipo->flag & SIPO_SELVHANDLESONLY) && BEZT_ISSEL_ANY(bezt) == 0) return 0;
@@ -1183,7 +1183,7 @@ static void get_nearest_fcurve_verts_list(bAnimContext *ac, const int mval[2], L
 	bAnimListElem *ale;
 	int filter;
 
-	SpaceIpo *sipo = (SpaceIpo *)ac->sl;
+	SpaceGraph *sipo = (SpaceGraph *)ac->sl;
 	View2D *v2d = &ac->ar->v2d;
 	short mapping_flag = 0;
 
@@ -1307,7 +1307,7 @@ static tNearestVertInfo *find_nearest_fcurve_vert(bAnimContext *ac, const int mv
 /* option 1) select keyframe directly under mouse */
 static void mouse_graph_keys(bAnimContext *ac, const int mval[2], short select_mode, short curves_only)
 {
-	SpaceIpo *sipo = (SpaceIpo *)ac->sl;
+	SpaceGraph *sipo = (SpaceGraph *)ac->sl;
 	tNearestVertInfo *nvi;
 	BezTriple *bezt = NULL;
 
diff --git a/source/blender/editors/space_graph/graph_utils.c b/source/blender/editors/space_graph/graph_utils.c
index cc66d3d8b00..85f5b8d66cb 100644
--- a/source/blender/editors/space_graph/graph_utils.c
+++ b/source/blender/editors/space_graph/graph_utils.c
@@ -56,7 +56,7 @@
 /* NOTE: Currently called from windowmanager (new drivers editor window) and RNA (mode switching) */
 void ED_drivers_editor_init(bContext *C, ScrArea *sa)
 {
-	SpaceIpo *sipo = (SpaceIpo *)sa->spacedata.first;
+	SpaceGraph *sipo = (SpaceGraph *)sa->spacedata.first;
 
 	/* Set mode */
 	sipo->mode = SIPO_MODE_DRIVERS;
diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c
index 620e454a8b7..39047a81211 100644
--- a/source/blender/editors/space_graph/space_graph.c
+++ b/source/blender/editors/space_graph/space_graph.c
@@ -92,10 +92,10 @@ ARegion *graph_has_buttons_region(ScrArea *sa)
 static SpaceLink *graph_new(const ScrArea *UNUSED(sa), const Scene *scene)
 {
 	ARegion *ar;
-	SpaceIpo *sipo;
+	SpaceGraph *sipo;
 
 	/* Graph Editor - general stuff */
-	sipo = MEM_callocN(sizeof(SpaceIpo), "init graphedit");
+	sipo = MEM_callocN(sizeof(SpaceGraph), "init graphedit");
 	sipo->spacetype = SPACE_IPO;
 
 	sipo->autosnap = SACTSNAP_FRAME;
@@ -162,7 +162,7 @@ static SpaceLink *graph_new(const ScrArea *UNUSED(sa), const Scene *scene)
 /* not spacelink itself */
 static void graph_free(SpaceLink *sl)
 {
-	SpaceIpo *si = (SpaceIpo *)sl;
+	SpaceGraph *si = (SpaceGraph *)sl;
 
 	if (si->ads) {
 		BLI_freelistN(&si->ads->chanbase);
@@ -178,7 +178,7 @@ static void graph_free(SpaceLink *sl)
 /* spacetype; init callback */
 static void graph_init(struct wmWindowManager *wm, ScrArea *sa)
 {
-	SpaceIpo *sipo = (SpaceIpo *)sa->spacedata.first;
+	SpaceGraph *sipo = (SpaceGraph *)sa->spacedata.first;
 
 	/* init dopesheet data if non-existent (i.e. for old files) */
 	if (sipo->ads == NULL) {
@@ -196,10 +196,10 @@ static void graph_init(struct wmWindowManager *wm, ScrArea *sa)
 
 static SpaceLink *graph_duplicate(SpaceLink *sl)
 {
-	SpaceIpo *sipon = MEM_dupallocN(sl);
+	SpaceGraph *sipon = MEM_dupallocN(sl);
 
 	/* clear or remove stuff from old */
-	BLI_duplicatelist(&sipon->runtime.ghost_curves, &((SpaceIpo *)sl)->runtime.ghost_curves);
+	BLI_duplicatelist(&sipon->runtime.ghost_curves, &((SpaceGraph *)sl)->runtime.ghost_curves);
 	sipon->ads = MEM_dupallocN(sipon->ads);
 
 	return (SpaceLink *)sipon;
@@ -222,7 +222,7 @@ static void graph_main_region_init(wmWindowManager *wm, ARegion *ar)
 static void graph_main_region_draw(const bContext *C, ARegion *ar)
 {
 	/* draw entirely, view changes should be handled here */
-	SpaceIpo *sipo = CTX_wm_space_graph(C);
+	SpaceGraph *sipo = CTX_wm_space_graph(C);
 	Scene *scene = CTX_data_scene(C);
 	bAnimContext ac;
 	View2D *v2d = &ar->v2d;
@@ -565,7 +565,7 @@ static void graph_region_message_subscribe(
 /* editor level listener */
 static void graph_listener(wmWindow *UNUSED(win), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene))
 {
-	SpaceIpo *sipo = (SpaceIpo *)sa->spacedata.first;
+	SpaceGraph *sipo = (SpaceGraph *)sa->spacedata.first;
 
 	/* context changes */
 	switch (wmn->category) {
@@ -755,7 +755,7 @@ static void graph_refresh_fcurve_colors(const bContext *C)
 
 static void graph_refresh(const bContext *C, ScrArea *sa)
 {
-	SpaceIpo *sipo = (SpaceIpo *)sa->spacedata.first;
+	SpaceGraph *sipo = (SpaceGraph *)sa->spacedata.first;
 
 	/* updates to data needed depends on Graph Editor mode... */
 	switch (sipo->mode) {
@@ -797,7 +797,7 @@ static void graph_refresh(const bContext *C, ScrArea *sa)
 
 static void graph_id_remap(ScrArea *UNUSED(sa), SpaceLink *slink, ID *old_id, ID *new_id)
 {
-	SpaceIpo *sgraph = (SpaceIpo *)slink;
+	SpaceGraph *sgraph = (SpaceGraph *)slink;
 
 	if (sgraph->ads) {
 		if ((ID *)sgraph->ads->filter_grp == old_id) {
@@ -811,13 +811,13 @@ static void graph_id_remap(ScrArea *UNUSED(sa), SpaceLink *slink, ID *old_id, ID
 
 static int graph_space_subtype_get(ScrArea *sa)
 {
-	SpaceIpo *sgraph = sa->spacedata.first;
+	SpaceGraph *sgraph = sa->spacedata.first;
 	return sgraph->mode;
 }
 
 static void graph_space_subtype_set(ScrArea *sa, int value)
 {
-	SpaceIpo *sgraph = sa->spacedata.first;
+	SpaceGraph *sgraph = sa->spacedata.first;
 	sgraph->mode = value;
 }