diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-16 08:42:11 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-16 08:42:11 +0300 |
commit | 2d1c14f0360a2a8172c7bdb64f6dbe99197f5c3e (patch) | |
tree | f051b0b13013ada82caf581779f7aa7de43ea49c /source/blender/editors | |
parent | 9d09eda0a31027c83430718e5caed3797da51b51 (diff) |
Cleanup: rename SPACE_IPO -> SPACE_GRAPH
Diffstat (limited to 'source/blender/editors')
20 files changed, 74 insertions, 74 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 48af3b82bd5..fb6a4696490 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -166,7 +166,7 @@ static bool acf_show_channel_colors(bAnimContext *ac) break; } - case SPACE_IPO: + case SPACE_GRAPH: { SpaceGraph *sipo = (SpaceGraph *)ac->sl; showGroupColors = !(sipo->flag & SIPO_NODRAWGCOLORS); @@ -533,7 +533,7 @@ static bool acf_scene_setting_valid(bAnimContext *ac, bAnimListElem *UNUSED(ale) /* visible only in Graph Editor */ case ACHANNEL_SETTING_VISIBLE: - return ((ac) && (ac->spacetype == SPACE_IPO)); + return ((ac) && (ac->spacetype == SPACE_GRAPH)); /* only select and expand supported otherwise */ case ACHANNEL_SETTING_SELECT: @@ -693,7 +693,7 @@ static bool acf_object_setting_valid(bAnimContext *ac, bAnimListElem *ale, eAnim /* visible only in Graph Editor */ case ACHANNEL_SETTING_VISIBLE: - return ((ac) && (ac->spacetype == SPACE_IPO) && (ob->adt)); + return ((ac) && (ac->spacetype == SPACE_GRAPH) && (ob->adt)); /* only select and expand supported otherwise */ case ACHANNEL_SETTING_SELECT: @@ -701,7 +701,7 @@ static bool acf_object_setting_valid(bAnimContext *ac, bAnimListElem *ale, eAnim return true; case ACHANNEL_SETTING_ALWAYS_VISIBLE: - return ((ac) && (ac->spacetype == SPACE_IPO) && (ob->adt)); + return ((ac) && (ac->spacetype == SPACE_GRAPH) && (ob->adt)); default: return false; @@ -861,10 +861,10 @@ static bool acf_group_setting_valid(bAnimContext *ac, bAnimListElem *UNUSED(ale) /* conditionally supported */ case ACHANNEL_SETTING_VISIBLE: /* Only available in Graph Editor */ - return (ac->spacetype == SPACE_IPO); + return (ac->spacetype == SPACE_GRAPH); case ACHANNEL_SETTING_ALWAYS_VISIBLE: - return (ac->spacetype == SPACE_IPO); + return (ac->spacetype == SPACE_GRAPH); default: /* always supported */ return true; @@ -887,7 +887,7 @@ static int acf_group_setting_flag(bAnimContext *ac, eAnimChannel_Settings settin * allowing different collapsing of groups there, since sharing the flag * proved to be a hazard for workflows... */ - return (ac->spacetype == SPACE_IPO) ? + return (ac->spacetype == SPACE_GRAPH) ? AGRP_EXPANDED_G : /* Graph Editor case */ AGRP_EXPANDED; /* DopeSheet and elsewhere */ } @@ -993,7 +993,7 @@ static bool acf_fcurve_setting_valid(bAnimContext *ac, bAnimListElem *ale, eAnim return false; // NOTE: in this special case, we need to draw ICON_ZOOMOUT case ACHANNEL_SETTING_VISIBLE: /* Only available in Graph Editor */ - return (ac->spacetype == SPACE_IPO); + return (ac->spacetype == SPACE_GRAPH); case ACHANNEL_SETTING_ALWAYS_VISIBLE: return false; @@ -3856,7 +3856,7 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float * - in Grease Pencil mode, color swatches for layer color */ if (ac->sl) { - if ((ac->spacetype == SPACE_IPO) && + if ((ac->spacetype == SPACE_GRAPH) && (acf->has_setting(ac, ale, ACHANNEL_SETTING_VISIBLE) || acf->has_setting(ac, ale, ACHANNEL_SETTING_ALWAYS_VISIBLE))) { @@ -3956,7 +3956,7 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float immUniformColor3fv(color); /* check if we need to show the sliders */ - if ((ac->sl) && ELEM(ac->spacetype, SPACE_ACTION, SPACE_IPO)) { + if ((ac->sl) && ELEM(ac->spacetype, SPACE_ACTION, SPACE_GRAPH)) { switch (ac->spacetype) { case SPACE_ACTION: { @@ -3964,7 +3964,7 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float draw_sliders = (saction->flag & SACTION_SLIDERS); break; } - case SPACE_IPO: + case SPACE_GRAPH: { SpaceGraph *sipo = (SpaceGraph *)ac->sl; draw_sliders = (sipo->flag & SIPO_SLIDERS); @@ -4466,7 +4466,7 @@ void ANIM_channel_draw_widgets(const bContext *C, bAnimContext *ac, bAnimListEle * - in Grease Pencil mode, color swatches for layer color */ if (ac->sl) { - if ((ac->spacetype == SPACE_IPO) && + if ((ac->spacetype == SPACE_GRAPH) && (acf->has_setting(ac, ale, ACHANNEL_SETTING_VISIBLE) || acf->has_setting(ac, ale, ACHANNEL_SETTING_ALWAYS_VISIBLE))) { @@ -4563,7 +4563,7 @@ void ANIM_channel_draw_widgets(const bContext *C, bAnimContext *ac, bAnimListEle short draw_sliders = 0; /* check if we need to show the sliders */ - if ((ac->sl) && ELEM(ac->spacetype, SPACE_ACTION, SPACE_IPO)) { + if ((ac->sl) && ELEM(ac->spacetype, SPACE_ACTION, SPACE_GRAPH)) { switch (ac->spacetype) { case SPACE_ACTION: { @@ -4571,7 +4571,7 @@ void ANIM_channel_draw_widgets(const bContext *C, bAnimContext *ac, bAnimListEle draw_sliders = (saction->flag & SACTION_SLIDERS); break; } - case SPACE_IPO: + case SPACE_GRAPH: { SpaceGraph *sipo = (SpaceGraph *)ac->sl; draw_sliders = (sipo->flag & SIPO_SLIDERS); diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 032bc778ff7..2fbb6c51216 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -663,7 +663,7 @@ static bool animedit_poll_channels_active(bContext *C) if (ELEM(NULL, sa, CTX_wm_region(C))) return 0; /* animation editor test */ - if (ELEM(sa->spacetype, SPACE_ACTION, SPACE_IPO, SPACE_NLA) == 0) + if (ELEM(sa->spacetype, SPACE_ACTION, SPACE_GRAPH, SPACE_NLA) == 0) return 0; return 1; @@ -680,7 +680,7 @@ static bool animedit_poll_channels_nla_tweakmode_off(bContext *C) if (ELEM(NULL, sa, CTX_wm_region(C))) return 0; /* animation editor test */ - if (ELEM(sa->spacetype, SPACE_ACTION, SPACE_IPO, SPACE_NLA) == 0) + if (ELEM(sa->spacetype, SPACE_ACTION, SPACE_GRAPH, SPACE_NLA) == 0) return 0; /* NLA TweakMode test */ @@ -1437,7 +1437,7 @@ static bool animchannels_grouping_poll(bContext *C) break; } - case SPACE_IPO: + case SPACE_GRAPH: { SpaceGraph *sipo = (SpaceGraph *)sl; @@ -1844,7 +1844,7 @@ static void setflag_anim_channels(bAnimContext *ac, eAnimChannel_Settings settin * - but for Graph Editor, this gets used also from main region * where hierarchy doesn't apply [#21276] */ - if ((ac->spacetype == SPACE_IPO) && (ac->regiontype != RGN_TYPE_CHANNELS)) { + if ((ac->spacetype == SPACE_GRAPH) && (ac->regiontype != RGN_TYPE_CHANNELS)) { /* graph editor (case 2) */ filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_CHANNELS | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS); } @@ -2223,7 +2223,7 @@ static bool animchannels_enable_poll(bContext *C) return 0; /* animation editor test - Action/Dopesheet/etc. and Graph only */ - if (ELEM(sa->spacetype, SPACE_ACTION, SPACE_IPO) == 0) + if (ELEM(sa->spacetype, SPACE_ACTION, SPACE_GRAPH) == 0) return 0; return 1; @@ -2295,7 +2295,7 @@ static bool animchannels_find_poll(bContext *C) return 0; /* animation editor with dopesheet */ - return ELEM(sa->spacetype, SPACE_ACTION, SPACE_IPO, SPACE_NLA); + return ELEM(sa->spacetype, SPACE_ACTION, SPACE_GRAPH, SPACE_NLA); } /* find_invoke() - Get initial channels */ diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c index d6320eb92ff..b196bffe199 100644 --- a/source/blender/editors/animation/anim_draw.c +++ b/source/blender/editors/animation/anim_draw.c @@ -330,7 +330,7 @@ void ANIM_nla_mapping_apply_fcurve(AnimData *adt, FCurve *fcu, bool restore, boo /* Get flags used for normalization in ANIM_unit_mapping_get_factor. */ short ANIM_get_normalization_flags(bAnimContext *ac) { - if (ac->sl->spacetype == SPACE_IPO) { + if (ac->sl->spacetype == SPACE_GRAPH) { SpaceGraph *sipo = (SpaceGraph *) ac->sl; bool use_normalization = (sipo->flag & SIPO_NORMALIZE) != 0; bool freeze_normalization = (sipo->flag & SIPO_NORMALIZE_FREEZE) != 0; diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 06f19b8e6ba..663ba2330d7 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -357,7 +357,7 @@ bool ANIM_animdata_context_getdata(bAnimContext *ac) ok = actedit_get_context(ac, saction); break; } - case SPACE_IPO: + case SPACE_GRAPH: { SpaceGraph *sipo = (SpaceGraph *)sl; ok = graphedit_get_context(ac, sipo); diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index dfce465c01e..365344ba521 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -712,7 +712,7 @@ static bool ed_marker_move_use_time(MarkerMove *mm) { if (((mm->slink->spacetype == SPACE_SEQ) && !(((SpaceSeq *)mm->slink)->flag & SEQ_DRAWFRAMES)) || ((mm->slink->spacetype == SPACE_ACTION) && (((SpaceAction *)mm->slink)->flag & SACTION_DRAWTIME)) || - ((mm->slink->spacetype == SPACE_IPO) && !(((SpaceGraph *)mm->slink)->flag & SIPO_DRAWTIME)) || + ((mm->slink->spacetype == SPACE_GRAPH) && !(((SpaceGraph *)mm->slink)->flag & SIPO_DRAWTIME)) || ((mm->slink->spacetype == SPACE_NLA) && !(((SpaceNla *)mm->slink)->flag & SNLA_DRAWTIME))) { return true; diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c index 86647dbb5e8..3b8e4b3a136 100644 --- a/source/blender/editors/animation/anim_ops.c +++ b/source/blender/editors/animation/anim_ops.c @@ -71,7 +71,7 @@ static bool change_frame_poll(bContext *C) if (ELEM(sa->spacetype, SPACE_ACTION, SPACE_NLA, SPACE_SEQ, SPACE_CLIP)) { return true; } - else if (sa->spacetype == SPACE_IPO) { + else if (sa->spacetype == SPACE_GRAPH) { /* NOTE: Graph Editor has special version which does some extra stuff. * No need to show the generic error message for that case though! */ @@ -286,7 +286,7 @@ static bool anim_set_end_frames_poll(bContext *C) * this shouldn't show up in 3D editor (or others without 2D timeline view) via search */ if (sa) { - if (ELEM(sa->spacetype, SPACE_ACTION, SPACE_IPO, SPACE_NLA, SPACE_SEQ, SPACE_CLIP)) { + if (ELEM(sa->spacetype, SPACE_ACTION, SPACE_GRAPH, SPACE_NLA, SPACE_SEQ, SPACE_CLIP)) { return true; } } diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index ce4e05b493c..12004a1767c 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -359,8 +359,8 @@ typedef enum eAnimFilter_Flags { /* Action Channel Group */ #define EDITABLE_AGRP(agrp) ((agrp->flag & AGRP_PROTECTED) == 0) #define EXPANDED_AGRP(ac, agrp) \ - ( ((!(ac) || ((ac)->spacetype != SPACE_IPO)) && (agrp->flag & AGRP_EXPANDED)) || \ - (( (ac) && ((ac)->spacetype == SPACE_IPO)) && (agrp->flag & AGRP_EXPANDED_G)) ) + ( ((!(ac) || ((ac)->spacetype != SPACE_GRAPH)) && (agrp->flag & AGRP_EXPANDED)) || \ + (( (ac) && ((ac)->spacetype == SPACE_GRAPH)) && (agrp->flag & AGRP_EXPANDED_G)) ) #define SEL_AGRP(agrp) ((agrp->flag & AGRP_SELECTED) || (agrp->flag & AGRP_ACTIVE)) /* F-Curve Channels */ #define EDITABLE_FCU(fcu) ((fcu->flag & FCURVE_PROTECTED) == 0) diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index b13b8a8a8bc..b226fc84584 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -114,7 +114,7 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid) case SPACE_VIEW3D: ts = &btheme->space_view3d; break; - case SPACE_IPO: + case SPACE_GRAPH: ts = &btheme->space_graph; break; case SPACE_FILE: 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); diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index 8beadadd107..65adc18dcb0 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -2815,7 +2815,7 @@ static bool graph_driver_delete_invalid_poll(bContext *C) ScrArea *sa = CTX_wm_area(C); /* firstly, check if in Graph Editor */ - if ((sa == NULL) || (sa->spacetype != SPACE_IPO)) + if ((sa == NULL) || (sa->spacetype != SPACE_GRAPH)) return 0; /* try to init Anim-Context stuff ourselves and check */ diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c index 6ab289982a2..e37925c93dc 100644 --- a/source/blender/editors/space_graph/graph_ops.c +++ b/source/blender/editors/space_graph/graph_ops.c @@ -488,7 +488,7 @@ void ED_operatormacros_graph(void) void graphedit_keymap(wmKeyConfig *keyconf) { /* keymap for all regions */ - WM_keymap_ensure(keyconf, "Graph Editor Generic", SPACE_IPO, 0); + WM_keymap_ensure(keyconf, "Graph Editor Generic", SPACE_GRAPH, 0); /* channels */ /* Channels are not directly handled by the Graph Editor module, but are inherited from the Animation module. @@ -497,5 +497,5 @@ void graphedit_keymap(wmKeyConfig *keyconf) */ /* keyframes */ - WM_keymap_ensure(keyconf, "Graph Editor", SPACE_IPO, 0); + WM_keymap_ensure(keyconf, "Graph Editor", SPACE_GRAPH, 0); } diff --git a/source/blender/editors/space_graph/graph_utils.c b/source/blender/editors/space_graph/graph_utils.c index 85f5b8d66cb..e1fef901677 100644 --- a/source/blender/editors/space_graph/graph_utils.c +++ b/source/blender/editors/space_graph/graph_utils.c @@ -139,7 +139,7 @@ bool graphop_visible_keyframes_poll(bContext *C) /* firstly, check if in Graph Editor */ // TODO: also check for region? - if ((sa == NULL) || (sa->spacetype != SPACE_IPO)) + if ((sa == NULL) || (sa->spacetype != SPACE_GRAPH)) return 0; /* try to init Anim-Context stuff ourselves and check */ @@ -188,7 +188,7 @@ bool graphop_editable_keyframes_poll(bContext *C) /* firstly, check if in Graph Editor */ // TODO: also check for region? - if ((sa == NULL) || (sa->spacetype != SPACE_IPO)) + if ((sa == NULL) || (sa->spacetype != SPACE_GRAPH)) return 0; /* try to init Anim-Context stuff ourselves and check */ @@ -235,7 +235,7 @@ bool graphop_active_fcurve_poll(bContext *C) /* firstly, check if in Graph Editor */ // TODO: also check for region? - if ((sa == NULL) || (sa->spacetype != SPACE_IPO)) + if ((sa == NULL) || (sa->spacetype != SPACE_GRAPH)) return 0; /* try to init Anim-Context stuff ourselves and check */ @@ -276,7 +276,7 @@ bool graphop_selected_fcurve_poll(bContext *C) /* firstly, check if in Graph Editor */ // TODO: also check for region? - if ((sa == NULL) || (sa->spacetype != SPACE_IPO)) + if ((sa == NULL) || (sa->spacetype != SPACE_GRAPH)) return 0; /* try to init Anim-Context stuff ourselves and check */ diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c index 39047a81211..001dd524a3e 100644 --- a/source/blender/editors/space_graph/space_graph.c +++ b/source/blender/editors/space_graph/space_graph.c @@ -96,7 +96,7 @@ static SpaceLink *graph_new(const ScrArea *UNUSED(sa), const Scene *scene) /* Graph Editor - general stuff */ sipo = MEM_callocN(sizeof(SpaceGraph), "init graphedit"); - sipo->spacetype = SPACE_IPO; + sipo->spacetype = SPACE_GRAPH; sipo->autosnap = SACTSNAP_FRAME; @@ -213,9 +213,9 @@ static void graph_main_region_init(wmWindowManager *wm, ARegion *ar) UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_CUSTOM, ar->winx, ar->winy); /* own keymap */ - keymap = WM_keymap_ensure(wm->defaultconf, "Graph Editor", SPACE_IPO, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Graph Editor", SPACE_GRAPH, 0); WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct); - keymap = WM_keymap_ensure(wm->defaultconf, "Graph Editor Generic", SPACE_IPO, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Graph Editor Generic", SPACE_GRAPH, 0); WM_event_add_keymap_handler(&ar->handlers, keymap); } @@ -365,7 +365,7 @@ static void graph_channel_region_init(wmWindowManager *wm, ARegion *ar) /* own keymap */ keymap = WM_keymap_ensure(wm->defaultconf, "Animation Channels", 0, 0); WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct); - keymap = WM_keymap_ensure(wm->defaultconf, "Graph Editor Generic", SPACE_IPO, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Graph Editor Generic", SPACE_GRAPH, 0); WM_event_add_keymap_handler(&ar->handlers, keymap); } @@ -415,7 +415,7 @@ static void graph_buttons_region_init(wmWindowManager *wm, ARegion *ar) ED_region_panels_init(wm, ar); - keymap = WM_keymap_ensure(wm->defaultconf, "Graph Editor Generic", SPACE_IPO, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Graph Editor Generic", SPACE_GRAPH, 0); WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct); } @@ -646,7 +646,7 @@ static void graph_refresh_fcurve_colors(const bContext *C) if (ANIM_animdata_get_context(C, &ac) == false) return; - UI_SetTheme(SPACE_IPO, RGN_TYPE_WINDOW); + UI_SetTheme(SPACE_GRAPH, RGN_TYPE_WINDOW); /* build list of F-Curves which will be visible as channels in channel-region * - we don't include ANIMFILTER_CURVEVISIBLE filter, as that will result in a @@ -833,7 +833,7 @@ void ED_spacetype_ipo(void) SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype ipo"); ARegionType *art; - st->spaceid = SPACE_IPO; + st->spaceid = SPACE_GRAPH; strncpy(st->name, "Graph", BKE_ST_MAXNAME); st->new = graph_new; diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 7e479217997..dc4b535d268 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -213,7 +213,7 @@ static bool transdata_check_local_center(TransInfo *t, short around) (t->flag & (T_OBJECT | T_POSE)) || /* implicit: (t->flag & T_EDIT) */ (ELEM(t->obedit_type, OB_MESH, OB_CURVE, OB_MBALL, OB_ARMATURE, OB_GPENCIL)) || - (t->spacetype == SPACE_IPO) || + (t->spacetype == SPACE_GRAPH) || (t->options & (CTX_MOVIECLIP | CTX_MASK | CTX_PAINT_CURVE))) ); } @@ -276,7 +276,7 @@ void setTransformViewAspect(TransInfo *t, float r_aspect[3]) ED_space_clip_get_aspect(sclip, &r_aspect[0], &r_aspect[1]); } } - else if (t->spacetype == SPACE_IPO) { + else if (t->spacetype == SPACE_GRAPH) { /* depemds on context of usage */ } } @@ -343,7 +343,7 @@ void convertViewVec(TransInfo *t, float r_vec[3], double dx, double dy) r_vec[0] *= t->aspect[0]; r_vec[1] *= t->aspect[1]; } - else if (ELEM(t->spacetype, SPACE_IPO, SPACE_NLA)) { + else if (ELEM(t->spacetype, SPACE_GRAPH, SPACE_NLA)) { convertViewVec2D(t->view, r_vec, dx, dy); } else if (ELEM(t->spacetype, SPACE_NODE, SPACE_SEQ)) { @@ -425,7 +425,7 @@ void projectIntViewEx(TransInfo *t, const float vec[3], int adr[2], const eV3DPr adr[0] = out[0]; adr[1] = out[1]; } - else if (ELEM(t->spacetype, SPACE_IPO, SPACE_NLA)) { + else if (ELEM(t->spacetype, SPACE_GRAPH, SPACE_NLA)) { int out[2] = {0, 0}; UI_view2d_view_to_region((View2D *)t->view, vec[0], vec[1], &out[0], &out[1]); @@ -599,7 +599,7 @@ static void viewRedrawForce(const bContext *C, TransInfo *t) //SpaceAction *saction = (SpaceAction *)t->sa->spacedata.first; WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL); } - else if (t->spacetype == SPACE_IPO) { + else if (t->spacetype == SPACE_GRAPH) { //SpaceGraph *sipo = (SpaceGraph *)t->sa->spacedata.first; WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL); } @@ -683,7 +683,7 @@ static void viewRedrawPost(bContext *C, TransInfo *t) allqueue(REDRAWIMAGE, 0); allqueue(REDRAWVIEW3D, 0); } - else if (ELEM(t->spacetype, SPACE_ACTION, SPACE_NLA, SPACE_IPO)) { + else if (ELEM(t->spacetype, SPACE_ACTION, SPACE_NLA, SPACE_GRAPH)) { allqueue(REDRAWVIEW3D, 0); allqueue(REDRAWACTION, 0); allqueue(REDRAWNLA, 0); @@ -2101,7 +2101,7 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op) if ((prop = RNA_struct_find_property(op->ptr, "proportional")) && !RNA_property_is_set(op->ptr, prop)) { - if (t->spacetype == SPACE_IPO) + if (t->spacetype == SPACE_GRAPH) ts->proportional_fcurve = proportional; else if (t->spacetype == SPACE_ACTION) ts->proportional_action = proportional; @@ -2316,7 +2316,7 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve SPACE_TYPE_ANY, RGN_TYPE_ANY, helpline_poll, drawHelpline, t); } - else if (t->spacetype == SPACE_IPO) { + else if (t->spacetype == SPACE_GRAPH) { t->draw_handle_view = ED_region_draw_cb_activate(t->ar->type, drawTransformView, t, REGION_DRAW_POST_VIEW); //t->draw_handle_pixel = ED_region_draw_cb_activate(t->ar->type, drawTransformPixel, t, REGION_DRAW_POST_PIXEL); t->draw_handle_cursor = WM_paint_cursor_activate( @@ -2522,7 +2522,7 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve /* same as TFM_TIME_EXTEND, but we need the mode info for later * so that duplicate-culling will work properly */ - if (ELEM(t->spacetype, SPACE_IPO, SPACE_NLA)) + if (ELEM(t->spacetype, SPACE_GRAPH, SPACE_NLA)) initTranslation(t); else initTimeTranslate(t); @@ -2534,7 +2534,7 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve * (for Graph/NLA Editors only since they uses 'standard' transforms to get 2D movement) * depending on which editor this was called from */ - if (ELEM(t->spacetype, SPACE_IPO, SPACE_NLA)) + if (ELEM(t->spacetype, SPACE_GRAPH, SPACE_NLA)) initTranslation(t); else initTimeTranslate(t); @@ -4696,7 +4696,7 @@ static void initSnapSpatial(TransInfo *t, float r_snap[3]) r_snap[1] = ED_node_grid_size(); r_snap[2] = ED_node_grid_size(); } - else if (t->spacetype == SPACE_IPO) { + else if (t->spacetype == SPACE_GRAPH) { r_snap[0] = 0.0f; r_snap[1] = 1.0; r_snap[2] = 0.1f; @@ -4740,7 +4740,7 @@ static void initTranslation(TransInfo *t) t->num.unit_type[2] = B_UNIT_LENGTH; } else { - /* SPACE_IPO, SPACE_ACTION, etc. could use some time units, when we have them... */ + /* SPACE_GRAPH, SPACE_ACTION, etc. could use some time units, when we have them... */ t->num.unit_type[0] = B_UNIT_NONE; t->num.unit_type[1] = B_UNIT_NONE; t->num.unit_type[2] = B_UNIT_NONE; @@ -8679,7 +8679,7 @@ static short getAnimEdit_SnapMode(TransInfo *t) if (saction) autosnap = saction->autosnap; } - else if (t->spacetype == SPACE_IPO) { + else if (t->spacetype == SPACE_GRAPH) { SpaceGraph *sipo = (SpaceGraph *)t->sa->spacedata.first; if (sipo) diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index 239b18cba2b..04559c77359 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -804,7 +804,7 @@ void drawPropCircle(const struct bContext *C, TransInfo *t) else if (t->spacetype == SPACE_IMAGE) { GPU_matrix_scale_2f(1.0f / t->aspect[0], 1.0f / t->aspect[1]); } - else if (ELEM(t->spacetype, SPACE_IPO, SPACE_ACTION)) { + else if (ELEM(t->spacetype, SPACE_GRAPH, SPACE_ACTION)) { /* only scale y */ rcti *mask = &t->ar->v2d.mask; rctf *datamask = &t->ar->v2d.cur; diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 26b0a595693..7b7a39d80e8 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -6705,7 +6705,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t) /* clear flag that was set for time-slide drawing */ saction->flag &= ~SACTION_MOVING; } - else if (t->spacetype == SPACE_IPO) { + else if (t->spacetype == SPACE_GRAPH) { SpaceGraph *sipo = (SpaceGraph *)t->sa->spacedata.first; bAnimContext ac; const bool use_handle = (sipo->flag & SIPO_NOHANDLES) == 0; @@ -6962,7 +6962,7 @@ int special_transform_moving(TransInfo *t) if (t->spacetype == SPACE_SEQ) { return G_TRANSFORM_SEQ; } - else if (t->spacetype == SPACE_IPO) { + else if (t->spacetype == SPACE_GRAPH) { return G_TRANSFORM_FCURVES; } else if ((t->flag & T_EDIT) || (t->flag & T_POSE)) { @@ -8716,7 +8716,7 @@ void createTransData(bContext *C, TransInfo *t) createTransSeqData(C, t); countAndCleanTransDataContainer(t); } - else if (t->spacetype == SPACE_IPO) { + else if (t->spacetype == SPACE_GRAPH) { t->flag |= T_POINTS | T_2D_EDIT; t->obedit_type = -1; diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 6e6bd4e13dd..f785ce8f221 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1117,7 +1117,7 @@ void recalcData(TransInfo *t) else if (t->spacetype == SPACE_SEQ) { recalcData_sequencer(t); } - else if (t->spacetype == SPACE_IPO) { + else if (t->spacetype == SPACE_GRAPH) { recalcData_graphedit(t); } else if (t->spacetype == SPACE_NODE) { @@ -1483,7 +1483,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve t->view = &ar->v2d; t->around = V3D_AROUND_CENTER_BOUNDS; } - else if (t->spacetype == SPACE_IPO) { + else if (t->spacetype == SPACE_GRAPH) { SpaceGraph *sipo = sa->spacedata.first; t->view = &ar->v2d; t->around = sipo->around; @@ -1575,7 +1575,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve /* use settings from scene only if modal */ if (t->flag & T_MODAL) { if ((t->options & CTX_NO_PET) == 0) { - if (t->spacetype == SPACE_IPO) { + if (t->spacetype == SPACE_GRAPH) { t->flag |= initTransInfo_edit_pet_to_flag(ts->proportional_fcurve); } else if (t->spacetype == SPACE_ACTION) { @@ -1716,7 +1716,7 @@ void postTrans(bContext *C, TransInfo *t) FOREACH_TRANS_DATA_CONTAINER (t, tc) { /* free data malloced per trans-data */ if (ELEM(t->obedit_type, OB_CURVE, OB_SURF) || - (t->spacetype == SPACE_IPO)) + (t->spacetype == SPACE_GRAPH)) { TransData *td = tc->data; for (int a = 0; a < tc->data_len; a++, td++) { @@ -2058,7 +2058,7 @@ static void calculateCenter_FromAround(TransInfo *t, int around, float r_center[ case V3D_AROUND_CURSOR: if (ELEM(t->spacetype, SPACE_IMAGE, SPACE_CLIP)) calculateCenterCursor2D(t, r_center); - else if (t->spacetype == SPACE_IPO) + else if (t->spacetype == SPACE_GRAPH) calculateCenterCursorGraph2D(t, r_center); else calculateCenterCursor(t, r_center); diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 79b2f1a89d6..bbe1bcca350 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -1517,7 +1517,7 @@ static void applyGridIncrement(TransInfo *t, float *val, int max_index, const fl if (use_aspect) { /* custom aspect for fcurve */ - if (t->spacetype == SPACE_IPO) { + if (t->spacetype == SPACE_GRAPH) { View2D *v2d = &t->ar->v2d; View2DGrid *grid; SpaceGraph *sipo = t->sa->spacedata.first; |