Commit: 0b45d3e3866225d0277cc8af483f0ad1d589420e Author: Amelie Fondevilla Date: Fri Oct 7 09:59:34 2022 +0200 Branches: blender-v3.3-release https://developer.blender.org/rB0b45d3e3866225d0277cc8af483f0ad1d589420e
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 =================================================================== M source/blender/editors/animation/anim_filter.c M source/blender/editors/include/ED_anim_api.h M source/blender/editors/space_action/action_select.c =================================================================== diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index d9eeed94868..e5deb03358f 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -414,6 +414,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 ee87de5774a..f5cdc35c38c 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 d1a8592ae9d..dd8cea6c838 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; @@ -1169,7 +1169,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; @@ -1255,7 +1255,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; @@ -1292,7 +1292,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; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
