From 2d1c14f0360a2a8172c7bdb64f6dbe99197f5c3e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 16 Feb 2019 16:42:11 +1100 Subject: Cleanup: rename SPACE_IPO -> SPACE_GRAPH --- source/blender/editors/screen/screen_context.c | 4 ++-- source/blender/editors/screen/screen_edit.c | 2 +- source/blender/editors/screen/screen_ops.c | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'source/blender/editors/screen') diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index 6f72d6d75cc..5967ff176fc 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -664,12 +664,12 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult else if (CTX_data_equals(member, "selected_editable_fcurves")) { bAnimContext ac; - if (ANIM_animdata_get_context(C, &ac) && ELEM(ac.spacetype, SPACE_ACTION, SPACE_IPO)) { + if (ANIM_animdata_get_context(C, &ac) && ELEM(ac.spacetype, SPACE_ACTION, SPACE_GRAPH)) { bAnimListElem *ale; ListBase anim_data = {NULL, NULL}; int filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS | ANIMFILTER_SEL) | - (ac.spacetype == SPACE_IPO ? ANIMFILTER_CURVE_VISIBLE : ANIMFILTER_LIST_VISIBLE); + (ac.spacetype == SPACE_GRAPH ? ANIMFILTER_CURVE_VISIBLE : ANIMFILTER_LIST_VISIBLE); ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype); diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 7d76140f741..99e755ba057 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1345,7 +1345,7 @@ void ED_screen_animation_timer(bContext *C, int redraws, int refresh, int sync, if (sa) spacetype = sa->spacetype; - sad->from_anim_edit = (ELEM(spacetype, SPACE_IPO, SPACE_ACTION, SPACE_NLA)); + sad->from_anim_edit = (ELEM(spacetype, SPACE_GRAPH, SPACE_ACTION, SPACE_NLA)); screen->animtimer->customdata = sad; diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index d2e4366b34e..e53c915c47f 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -205,7 +205,7 @@ bool ED_operator_animview_active(bContext *C) { if (ED_operator_areaactive(C)) { SpaceLink *sl = (SpaceLink *)CTX_wm_space_data(C); - if (sl && (ELEM(sl->spacetype, SPACE_SEQ, SPACE_ACTION, SPACE_NLA, SPACE_IPO))) + if (sl && (ELEM(sl->spacetype, SPACE_SEQ, SPACE_ACTION, SPACE_NLA, SPACE_GRAPH))) return true; } @@ -268,7 +268,7 @@ bool ED_operator_node_editable(bContext *C) bool ED_operator_graphedit_active(bContext *C) { - return ed_spacetype_test(C, SPACE_IPO); + return ed_spacetype_test(C, SPACE_GRAPH); } bool ED_operator_sequencer_active(bContext *C) @@ -2528,7 +2528,7 @@ static void areas_do_frame_follow(bContext *C, bool middle) /* do follow here if editor type supports it */ if ((scr->redraws_flag & TIME_FOLLOW)) { if ((ar->regiontype == RGN_TYPE_WINDOW && - ELEM(sa->spacetype, SPACE_SEQ, SPACE_IPO, SPACE_ACTION, SPACE_NLA)) || + ELEM(sa->spacetype, SPACE_SEQ, SPACE_GRAPH, SPACE_ACTION, SPACE_NLA)) || (sa->spacetype == SPACE_CLIP && ar->regiontype == RGN_TYPE_PREVIEW)) { float w = BLI_rctf_size_x(&ar->v2d.cur); @@ -3861,7 +3861,7 @@ static int match_region_with_redraws(int spacetype, int regiontype, int redraws, if ((redraws & TIME_ALL_3D_WIN) || from_anim_edit) return 1; break; - case SPACE_IPO: + case SPACE_GRAPH: case SPACE_NLA: if ((redraws & TIME_ALL_ANIM_WIN) || from_anim_edit) return 1; @@ -3898,7 +3898,7 @@ static int match_region_with_redraws(int spacetype, int regiontype, int redraws, } else if (regiontype == RGN_TYPE_CHANNELS) { switch (spacetype) { - case SPACE_IPO: + case SPACE_GRAPH: case SPACE_ACTION: case SPACE_NLA: if (redraws & TIME_ALL_ANIM_WIN) @@ -4082,7 +4082,7 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), const wmEv /* do follow here if editor type supports it */ if ((sad->redraws & TIME_FOLLOW)) { if ((ar->regiontype == RGN_TYPE_WINDOW && - ELEM(sa->spacetype, SPACE_SEQ, SPACE_IPO, SPACE_ACTION, SPACE_NLA)) || + ELEM(sa->spacetype, SPACE_SEQ, SPACE_GRAPH, SPACE_ACTION, SPACE_NLA)) || (sa->spacetype == SPACE_CLIP && ar->regiontype == RGN_TYPE_PREVIEW)) { float w = BLI_rctf_size_x(&ar->v2d.cur); -- cgit v1.2.3