blender
/
blender
134
425
Fork 606
Code Issues 6.3k Pull Requests 772 Projects 19 Wiki Activity

Anim: Ctrl-shift channel selection. #118429

Open
Pratik Borhade wants to merge 2 commits from PratikPB2123/blender:anim-ctrl-shift-channels into main
pull from: PratikPB2123/blender:anim-ctrl-shift-channels
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 2 Files Changed 2 +43 -32
1 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2a2f99f6cf - Show all commits

75
source/blender/editors/animation/anim_channels_edit.cc
View File

@ -3375,7 +3375,13 @@ static int click_select_channel_object(bContext *C,
return 0;
}
if (selectmode == SELECT_INVERT) {
if (selectmode & SELECT_EXTEND_RANGE) {
if ((selectmode & SELECT_INVERT) == 0) {
ANIM_anim_channels_select_set(ac, ACHANNEL_SETFLAG_EXTEND_RANGE);
}
animchannel_select_range(ac, ale);
}
else if (selectmode & SELECT_INVERT) {
/* swap select */
ED_object_base_select(base, BA_INVERT);
@ -3383,10 +3389,6 @@ static int click_select_channel_object(bContext *C,
adt->flag ^= ADT_UI_SELECTED;
}
}
else if (selectmode == SELECT_EXTEND_RANGE) {
ANIM_anim_channels_select_set(ac, ACHANNEL_SETFLAG_EXTEND_RANGE);
animchannel_select_range(ac, ale);
}
else {
/* deselect all */
ANIM_anim_channels_select_set(ac, ACHANNEL_SETFLAG_CLEAR);
@ -3413,7 +3415,7 @@ static int click_select_channel_object(bContext *C,
ED_object_base_activate_with_mode_exit_if_needed(C, base); /* adds notifier */
/* Similar to outliner, do not change active element when selecting elements in range. */
if ((adt) && (adt->flag & ADT_UI_SELECTED) && (selectmode != SELECT_EXTEND_RANGE)) {
if ((adt) && (adt->flag & ADT_UI_SELECTED) && ((selectmode & SELECT_EXTEND_RANGE) == 0)) {
adt->flag |= ADT_UI_ACTIVE;
}
@ -3429,14 +3431,17 @@ static int click_select_channel_dummy(bAnimContext *ac,
}
/* select/deselect */
if (selectmode == SELECT_INVERT) {
if (selectmode & SELECT_EXTEND_RANGE) {
if ((selectmode & SELECT_INVERT) == 0) {
ANIM_anim_channels_select_set(ac, ACHANNEL_SETFLAG_EXTEND_RANGE);
}
animchannel_select_range(ac, ale);
}
else if (selectmode & SELECT_INVERT) {
/* inverse selection status of this AnimData block only */
ale->adt->flag ^= ADT_UI_SELECTED;
}
else if (selectmode == SELECT_EXTEND_RANGE) {
ANIM_anim_channels_select_set(ac, ACHANNEL_SETFLAG_EXTEND_RANGE);
animchannel_select_range(ac, ale);
}
else {
/* select AnimData block by itself */
ANIM_anim_channels_select_set(ac, ACHANNEL_SETFLAG_CLEAR);
@ -3444,7 +3449,7 @@ static int click_select_channel_dummy(bAnimContext *ac,
}
/* Similar to outliner, do not change active element when selecting elements in range. */
if ((ale->adt->flag & ADT_UI_SELECTED) && (selectmode != SELECT_EXTEND_RANGE)) {
if ((ale->adt->flag & ADT_UI_SELECTED) && ((selectmode & SELECT_EXTEND_RANGE) == 0)) {
ale->adt->flag |= ADT_UI_ACTIVE;
}
@ -3486,14 +3491,16 @@ static int click_select_channel_group(bAnimContext *ac,
}
/* select/deselect group */
if (selectmode == SELECT_INVERT) {
if (selectmode & SELECT_EXTEND_RANGE) {
if ((selectmode & SELECT_INVERT) == 0) {
ANIM_anim_channels_select_set(ac, ACHANNEL_SETFLAG_EXTEND_RANGE);
}
animchannel_select_range(ac, ale);
}
else if (selectmode & SELECT_INVERT) {
/* inverse selection status of this group only */
agrp->flag ^= AGRP_SELECTED;
}
else if (selectmode == SELECT_EXTEND_RANGE) {
ANIM_anim_channels_select_set(ac, ACHANNEL_SETFLAG_EXTEND_RANGE);
animchannel_select_range(ac, ale);
}
else if (selectmode == -1) {
Christoph Lendenfeld commented 2024-02-20 10:31:01 +01:00
Review
Copy Link

This PR also changes the behavior of children_only because this will now only work if no selection flags are set. Because of selectmode |= -1 further down.

This PR also changes the behavior of `children_only` because this will now only work if no selection flags are set. Because of `selectmode |= -1` further down.
/* select all in group (and deselect everything else) */
FCurve *fcu;
@ -3525,7 +3532,7 @@ static int click_select_channel_group(bAnimContext *ac,
/* if group is selected now, make group the 'active' one in the visible list.
* Similar to outliner, do not change active element when selecting elements in range. */
if (agrp->flag & AGRP_SELECTED) {
if (selectmode != SELECT_EXTEND_RANGE) {
if ((selectmode & SELECT_EXTEND_RANGE) == 0) {
ANIM_set_active_channel(ac,
ac->data,
eAnimCont_Types(ac->datatype),
@ -3538,7 +3545,7 @@ static int click_select_channel_group(bAnimContext *ac,
}
}
else {
if (selectmode != SELECT_EXTEND_RANGE) {
if ((selectmode & SELECT_EXTEND_RANGE) == 0) {
ANIM_set_active_channel(ac,
ac->data,
eAnimCont_Types(ac->datatype),
@ -3649,14 +3656,16 @@ static int click_select_channel_gplayer(bContext *C,
bGPDlayer *gpl = (bGPDlayer *)ale->data;
/* select/deselect */
if (selectmode == SELECT_INVERT) {
if (selectmode & SELECT_EXTEND_RANGE) {
if ((selectmode & SELECT_INVERT) == 0) {
ANIM_anim_channels_select_set(ac, ACHANNEL_SETFLAG_EXTEND_RANGE);
}
animchannel_select_range(ac, ale);
}
else if (selectmode & SELECT_INVERT) {
/* invert selection status of this layer only */
gpl->flag ^= GP_LAYER_SELECT;
}
else if (selectmode == SELECT_EXTEND_RANGE) {
ANIM_anim_channels_select_set(ac, ACHANNEL_SETFLAG_EXTEND_RANGE);
animchannel_select_range(ac, ale);
}
else {
/* select layer by itself */
ANIM_anim_channels_select_set(ac, ACHANNEL_SETFLAG_CLEAR);
@ -3665,7 +3674,7 @@ static int click_select_channel_gplayer(bContext *C,
/* change active layer, if this is selected (since we must always have an active layer).
* Similar to outliner, do not change active element when selecting elements in range. */
if ((gpl->flag & GP_LAYER_SELECT) && (selectmode != SELECT_EXTEND_RANGE)) {
if ((gpl->flag & GP_LAYER_SELECT) && ((selectmode & SELECT_EXTEND_RANGE) == 0)) {
ANIM_set_active_channel(ac,
ac->data,
eAnimCont_Types(ac->datatype),
@ -3719,20 +3728,22 @@ static int click_select_channel_grease_pencil_layer(bContext *C,
Layer *layer = static_cast<Layer *>(ale->data);
GreasePencil *grease_pencil = reinterpret_cast<GreasePencil *>(ale->id);
if (selectmode == SELECT_INVERT) {
layer->set_selected(!layer->is_selected());
}
else if (selectmode == SELECT_EXTEND_RANGE) {
ANIM_anim_channels_select_set(ac, ACHANNEL_SETFLAG_EXTEND_RANGE);
if (selectmode & SELECT_EXTEND_RANGE) {
if ((selectmode & SELECT_INVERT) == 0) {
ANIM_anim_channels_select_set(ac, ACHANNEL_SETFLAG_EXTEND_RANGE);
}
animchannel_select_range(ac, ale);
}
else if (selectmode & SELECT_INVERT) {
layer->set_selected(!layer->is_selected());
}
else {
ANIM_anim_channels_select_set(ac, ACHANNEL_SETFLAG_CLEAR);
layer->set_selected(true);
}
/* Active channel is not changed during range select. */
if (layer->is_selected() && (selectmode != SELECT_EXTEND_RANGE)) {
if (layer->is_selected() && ((selectmode & SELECT_EXTEND_RANGE) == 0)) {
grease_pencil->set_active_layer(layer);
}
@ -3816,7 +3827,7 @@ static int mouse_anim_channels(bContext *C,
}
/* Change selection mode to single when no active element is found. */
if ((selectmode == SELECT_EXTEND_RANGE) &&
if ((selectmode & SELECT_EXTEND_RANGE) &&
!animchannel_has_active_of_type(ac, eAnim_ChannelType(ale->type)))
{
selectmode = SELECT_INVERT;