diff options
author | Amelie Fondevilla <amelie.fondevilla@les-fees-speciales.coop> | 2022-10-07 10:59:34 +0300 |
---|---|---|
committer | Amelie Fondevilla <amelie.fondevilla@les-fees-speciales.coop> | 2022-10-07 12:07:02 +0300 |
commit | 412d670e9c581dcafccd950d661611b6a496299c (patch) | |
tree | c879ac1401d11d49066e29926ee6a0a79ef29772 /source/blender/editors | |
parent | 7eeeaec6da33971ab7805c9a4bfd5f4e186273d1 (diff) |
Refactor: adding function to check if an animation container has grease pencil layer keyframes.
Used in action_select to refactor the selection operators.
No functional changes.
Reviewed By: Sybren A. Stüvel
Differential Revision: http://developer.blender.org/D16168
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/animation/anim_filter.c | 5 | ||||
-rw-r--r-- | source/blender/editors/include/ED_anim_api.h | 5 | ||||
-rw-r--r-- | source/blender/editors/space_action/action_select.c | 16 |
3 files changed, 18 insertions, 8 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index e0df7328c74..302e50e64d7 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -417,6 +417,11 @@ bool ANIM_animdata_get_context(const bContext *C, bAnimContext *ac) return ANIM_animdata_context_getdata(ac); } +bool ANIM_animdata_can_have_greasepencil(const eAnimCont_Types type) +{ + return type == ANIMCONT_GPENCIL; +} + /* ************************************************************ */ /* Blender Data <-- Filter --> Channels to be operated on */ diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index 6079aca0199..8fe2d0ae60f 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -519,6 +519,11 @@ void ANIM_animdata_update(bAnimContext *ac, ListBase *anim_data); void ANIM_animdata_freelist(ListBase *anim_data); +/** + * Check if the given animation container can contain grease pencil layer keyframes. + */ +bool ANIM_animdata_can_have_greasepencil(const eAnimCont_Types type); + /* ************************************************ */ /* ANIMATION CHANNELS LIST */ /* anim_channels_*.c */ diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index 9d45a2a3b89..a425026a1ef 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -322,7 +322,7 @@ static int actkeys_deselectall_exec(bContext *C, wmOperator *op) /* set notifier that keyframe selection have changed */ WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL); - if (ac.datatype == ANIMCONT_GPENCIL) { + if (ANIM_animdata_can_have_greasepencil(ac.datatype)) { WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_SELECTED, NULL); } return OPERATOR_FINISHED; @@ -563,7 +563,7 @@ static int actkeys_box_select_exec(bContext *C, wmOperator *op) /* set notifier that keyframe selection have changed */ WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL); - if (ac.datatype == ANIMCONT_GPENCIL) { + if (ANIM_animdata_can_have_greasepencil(ac.datatype)) { WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_SELECTED, NULL); } return OPERATOR_FINISHED; @@ -800,7 +800,7 @@ static int actkeys_lassoselect_exec(bContext *C, wmOperator *op) /* send notifier that keyframe selection has changed */ WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL); - if (ac.datatype == ANIMCONT_GPENCIL) { + if (ANIM_animdata_can_have_greasepencil(ac.datatype)) { WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_SELECTED, NULL); } return OPERATOR_FINISHED; @@ -868,7 +868,7 @@ static int action_circle_select_exec(bContext *C, wmOperator *op) /* send notifier that keyframe selection has changed */ WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL); - if (ac.datatype == ANIMCONT_GPENCIL) { + if (ANIM_animdata_can_have_greasepencil(ac.datatype)) { WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_SELECTED, NULL); } return OPERATOR_FINISHED; @@ -1107,7 +1107,7 @@ static int actkeys_columnselect_exec(bContext *C, wmOperator *op) /* set notifier that keyframe selection have changed */ WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL); - if (ac.datatype == ANIMCONT_GPENCIL) { + if (ANIM_animdata_can_have_greasepencil(ac.datatype)) { WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_SELECTED, NULL); } return OPERATOR_FINISHED; @@ -1170,7 +1170,7 @@ static int actkeys_select_linked_exec(bContext *C, wmOperator *UNUSED(op)) /* set notifier that keyframe selection has changed */ WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL); - if (ac.datatype == ANIMCONT_GPENCIL) { + if (ANIM_animdata_can_have_greasepencil(ac.datatype)) { WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_SELECTED, NULL); } return OPERATOR_FINISHED; @@ -1256,7 +1256,7 @@ static int actkeys_select_more_exec(bContext *C, wmOperator *UNUSED(op)) /* set notifier that keyframe selection has changed */ WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL); - if (ac.datatype == ANIMCONT_GPENCIL) { + if (ANIM_animdata_can_have_greasepencil(ac.datatype)) { WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_SELECTED, NULL); } return OPERATOR_FINISHED; @@ -1293,7 +1293,7 @@ static int actkeys_select_less_exec(bContext *C, wmOperator *UNUSED(op)) /* set notifier that keyframe selection has changed */ WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL); - if (ac.datatype == ANIMCONT_GPENCIL) { + if (ANIM_animdata_can_have_greasepencil(ac.datatype)) { WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_SELECTED, NULL); } return OPERATOR_FINISHED; |