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 --- .../editors/animation/anim_channels_defines.c | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'source/blender/editors/animation/anim_channels_defines.c') 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); -- cgit v1.2.3