diff --git a/source/blender/editors/animation/anim_channels_defines.cc b/source/blender/editors/animation/anim_channels_defines.cc index fbaa8dbbabc..604f337d16d 100644 --- a/source/blender/editors/animation/anim_channels_defines.cc +++ b/source/blender/editors/animation/anim_channels_defines.cc @@ -757,7 +757,7 @@ static int acf_object_setting_flag(bAnimContext * /*ac*/, *r_neg = true; return ADT_CURVES_NOT_VISIBLE; - case ACHANNEL_SETTING_ALWAYS_VISIBLE: + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ return ADT_CURVES_ALWAYS_VISIBLE; default: /* unsupported */ @@ -783,9 +783,9 @@ static void *acf_object_setting_ptr(bAnimListElem *ale, case ACHANNEL_SETTING_EXPAND: /* expanded */ return GET_ACF_FLAG_PTR(ob->nlaflag, r_type); /* XXX */ - case ACHANNEL_SETTING_MUTE: /* mute (only in NLA) */ - case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ - case ACHANNEL_SETTING_ALWAYS_VISIBLE: + case ACHANNEL_SETTING_MUTE: /* mute (only in NLA) */ + case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ if (ob->adt) { return GET_ACF_FLAG_PTR(ob->adt->flag, r_type); } @@ -889,7 +889,7 @@ static bool acf_group_setting_valid(bAnimContext *ac, case ACHANNEL_SETTING_VISIBLE: /* Only available in Graph Editor */ return (ac->spacetype == SPACE_GRAPH); - case ACHANNEL_SETTING_ALWAYS_VISIBLE: + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ return ELEM(ac->spacetype, SPACE_ACTION, SPACE_GRAPH); default: /* always supported */ @@ -931,7 +931,7 @@ static int acf_group_setting_flag(bAnimContext *ac, eAnimChannel_Settings settin *r_neg = true; return AGRP_NOTVISIBLE; - case ACHANNEL_SETTING_ALWAYS_VISIBLE: + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ return ADT_CURVES_ALWAYS_VISIBLE; default: @@ -1814,6 +1814,9 @@ static int acf_dslight_setting_flag(bAnimContext * /*ac*/, case ACHANNEL_SETTING_SELECT: /* selected */ return ADT_UI_SELECTED; + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ + return ADT_CURVES_ALWAYS_VISIBLE; + default: /* unsupported */ return 0; } @@ -1833,9 +1836,10 @@ static void *acf_dslight_setting_ptr(bAnimListElem *ale, case ACHANNEL_SETTING_EXPAND: /* expanded */ return GET_ACF_FLAG_PTR(la->flag, r_type); - case ACHANNEL_SETTING_SELECT: /* selected */ - case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ - case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ + case ACHANNEL_SETTING_SELECT: /* selected */ + case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ + case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ if (la->adt) { return GET_ACF_FLAG_PTR(la->adt->flag, r_type); } @@ -2074,7 +2078,7 @@ static int acf_dscam_setting_flag(bAnimContext * /*ac*/, case ACHANNEL_SETTING_SELECT: /* selected */ return ADT_UI_SELECTED; - case ACHANNEL_SETTING_ALWAYS_VISIBLE: + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ return ADT_CURVES_ALWAYS_VISIBLE; default: /* unsupported */ @@ -2096,10 +2100,10 @@ static void *acf_dscam_setting_ptr(bAnimListElem *ale, case ACHANNEL_SETTING_EXPAND: /* expanded */ return GET_ACF_FLAG_PTR(ca->flag, r_type); - case ACHANNEL_SETTING_SELECT: /* selected */ - case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ - case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ - case ACHANNEL_SETTING_ALWAYS_VISIBLE: + case ACHANNEL_SETTING_SELECT: /* selected */ + case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ + case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ if (ca->adt) { return GET_ACF_FLAG_PTR(ca->adt->flag, r_type); } @@ -2169,6 +2173,9 @@ static int acf_dscur_setting_flag(bAnimContext * /*ac*/, case ACHANNEL_SETTING_SELECT: /* selected */ return ADT_UI_SELECTED; + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ + return ADT_CURVES_ALWAYS_VISIBLE; + default: /* unsupported */ return 0; } @@ -2188,9 +2195,10 @@ static void *acf_dscur_setting_ptr(bAnimListElem *ale, case ACHANNEL_SETTING_EXPAND: /* expanded */ return GET_ACF_FLAG_PTR(cu->flag, r_type); - case ACHANNEL_SETTING_SELECT: /* selected */ - case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ - case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ + case ACHANNEL_SETTING_SELECT: /* selected */ + case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ + case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ if (cu->adt) { return GET_ACF_FLAG_PTR(cu->adt->flag, r_type); } @@ -2520,6 +2528,9 @@ static int acf_dsmball_setting_flag(bAnimContext * /*ac*/, case ACHANNEL_SETTING_SELECT: /* selected */ return ADT_UI_SELECTED; + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ + return ADT_CURVES_ALWAYS_VISIBLE; + default: /* unsupported */ return 0; } @@ -2539,9 +2550,10 @@ static void *acf_dsmball_setting_ptr(bAnimListElem *ale, case ACHANNEL_SETTING_EXPAND: /* expanded */ return GET_ACF_FLAG_PTR(mb->flag2, r_type); - case ACHANNEL_SETTING_SELECT: /* selected */ - case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ - case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ + case ACHANNEL_SETTING_SELECT: /* selected */ + case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ + case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ if (mb->adt) { return GET_ACF_FLAG_PTR(mb->adt->flag, r_type); } @@ -2603,6 +2615,9 @@ static int acf_dsarm_setting_flag(bAnimContext * /*ac*/, case ACHANNEL_SETTING_SELECT: /* selected */ return ADT_UI_SELECTED; + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ + return ADT_CURVES_ALWAYS_VISIBLE; + default: /* unsupported */ return 0; } @@ -2622,9 +2637,10 @@ static void *acf_dsarm_setting_ptr(bAnimListElem *ale, case ACHANNEL_SETTING_EXPAND: /* expanded */ return GET_ACF_FLAG_PTR(arm->flag, r_type); - case ACHANNEL_SETTING_SELECT: /* selected */ - case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ - case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ + case ACHANNEL_SETTING_SELECT: /* selected */ + case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ + case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ if (arm->adt) { return GET_ACF_FLAG_PTR(arm->adt->flag, r_type); } @@ -2863,6 +2879,9 @@ static int acf_dsmesh_setting_flag(bAnimContext * /*ac*/, case ACHANNEL_SETTING_SELECT: /* selected */ return ADT_UI_SELECTED; + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ + return ADT_CURVES_ALWAYS_VISIBLE; + default: /* unsupported */ return 0; } @@ -2882,9 +2901,10 @@ static void *acf_dsmesh_setting_ptr(bAnimListElem *ale, case ACHANNEL_SETTING_EXPAND: /* expanded */ return GET_ACF_FLAG_PTR(mesh->flag, r_type); - case ACHANNEL_SETTING_SELECT: /* selected */ - case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ - case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ + case ACHANNEL_SETTING_SELECT: /* selected */ + case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ + case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ if (mesh->adt) { return GET_ACF_FLAG_PTR(mesh->adt->flag, r_type); } @@ -2947,6 +2967,9 @@ static int acf_dslat_setting_flag(bAnimContext * /*ac*/, case ACHANNEL_SETTING_SELECT: /* selected */ return ADT_UI_SELECTED; + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ + return ADT_CURVES_ALWAYS_VISIBLE; + default: /* unsupported */ return 0; } @@ -2966,9 +2989,10 @@ static void *acf_dslat_setting_ptr(bAnimListElem *ale, case ACHANNEL_SETTING_EXPAND: /* expanded */ return GET_ACF_FLAG_PTR(lt->flag, r_type); - case ACHANNEL_SETTING_SELECT: /* selected */ - case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ - case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ + case ACHANNEL_SETTING_SELECT: /* selected */ + case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ + case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ if (lt->adt) { return GET_ACF_FLAG_PTR(lt->adt->flag, r_type); } @@ -3114,6 +3138,9 @@ static int acf_dscurves_setting_flag(bAnimContext * /*ac*/, case ACHANNEL_SETTING_SELECT: /* selected */ return ADT_UI_SELECTED; + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ + return ADT_CURVES_ALWAYS_VISIBLE; + default: /* unsupported */ return 0; } @@ -3133,9 +3160,10 @@ static void *acf_dscurves_setting_ptr(bAnimListElem *ale, case ACHANNEL_SETTING_EXPAND: /* expanded */ return GET_ACF_FLAG_PTR(curves->flag, r_type); - case ACHANNEL_SETTING_SELECT: /* selected */ - case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ - case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ + case ACHANNEL_SETTING_SELECT: /* selected */ + case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ + case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ if (curves->adt) { return GET_ACF_FLAG_PTR(curves->adt->flag, r_type); } @@ -3197,6 +3225,9 @@ static int acf_dspointcloud_setting_flag(bAnimContext * /*ac*/, case ACHANNEL_SETTING_SELECT: /* selected */ return ADT_UI_SELECTED; + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ + return ADT_CURVES_ALWAYS_VISIBLE; + default: /* unsupported */ return 0; } @@ -3216,9 +3247,10 @@ static void *acf_dspointcloud_setting_ptr(bAnimListElem *ale, case ACHANNEL_SETTING_EXPAND: /* expanded */ return GET_ACF_FLAG_PTR(pointcloud->flag, r_type); - case ACHANNEL_SETTING_SELECT: /* selected */ - case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ - case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ + case ACHANNEL_SETTING_SELECT: /* selected */ + case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ + case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ if (pointcloud->adt) { return GET_ACF_FLAG_PTR(pointcloud->adt->flag, r_type); } @@ -3280,6 +3312,9 @@ static int acf_dsvolume_setting_flag(bAnimContext * /*ac*/, case ACHANNEL_SETTING_SELECT: /* selected */ return ADT_UI_SELECTED; + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ + return ADT_CURVES_ALWAYS_VISIBLE; + default: /* unsupported */ return 0; } @@ -3299,9 +3334,10 @@ static void *acf_dsvolume_setting_ptr(bAnimListElem *ale, case ACHANNEL_SETTING_EXPAND: /* expanded */ return GET_ACF_FLAG_PTR(volume->flag, r_type); - case ACHANNEL_SETTING_SELECT: /* selected */ - case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ - case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ + case ACHANNEL_SETTING_SELECT: /* selected */ + case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */ + case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ + case ACHANNEL_SETTING_ALWAYS_VISIBLE: /* pin */ if (volume->adt) { return GET_ACF_FLAG_PTR(volume->adt->flag, r_type); }