blender
/
blender
133
398
Fork 579
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

WIP: Animation: Select Grouped operator #104758

Draft
RedMser wants to merge 9 commits from RedMser/blender:animation-select-grouped into main
pull from: RedMser/blender:animation-select-grouped
merge into: blender:main

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

73
source/blender/editors/space_action/action_select.c
View File

@ -1912,6 +1912,7 @@ void ACTION_OT_clickselect(wmOperatorType *ot)
enum {
ACTKEYS_SELECT_GROUP_CHANNEL_TYPE,
ACTKEYS_SELECT_GROUP_CHANNEL_TYPE_STRICT,
ACTKEYS_SELECT_GROUP_KEY_TYPE,
ACTKEYS_SELECT_GROUP_INTERPOLATION_TYPE,
ACTKEYS_SELECT_GROUP_HANDLE_TYPE,
@ -1925,7 +1926,12 @@ static const EnumPropertyItem actkeys_prop_select_grouped_types[] = {
"CHANNEL_TYPE",
0,
"Channel Type",
"All keyframes of same type of channel (X Location, etc.)"},
"All keyframes with the same RNA path (Location, etc.)"},
{ACTKEYS_SELECT_GROUP_CHANNEL_TYPE_STRICT,
"CHANNEL_TYPE_STRICT",
0,
"Channel Type (Strict)",
"All keyframes with the same RNA path, including array index (X Location, etc.)"},
{ACTKEYS_SELECT_GROUP_KEY_TYPE,
"KEY_TYPE",
0,
@ -1954,6 +1960,43 @@ static const EnumPropertyItem actkeys_prop_select_grouped_types[] = {
{0, NULL, 0, NULL, NULL},
};
/* ACTKEYS_SELECT_GROUP_CHANNEL_TYPE */
static short select_grouped_channel_type(KeyframeEditData *ked, struct BezTriple *bezt)
{
if (BLI_gset_haskey(ked->data, ked->fcu->rna_path)) {
return KEYFRAME_OK_ALL;
}
return 0;
}
static short select_grouped_active_channel_type(KeyframeEditData *ked, struct BezTriple *bezt)
{
BLI_gset_add(ked->data, BLI_strdup(ked->fcu->rna_path));
return 0;
}
/* ACTKEYS_SELECT_GROUP_CHANNEL_TYPE_STRICT */
static short select_grouped_channel_type_strict(KeyframeEditData *ked, struct BezTriple *bezt)
{
char name[256];
BLI_snprintf(name, 256, "%s[%d]", ked->fcu->rna_path, ked->fcu->array_index);
if (BLI_gset_haskey(ked->data, name)) {
return KEYFRAME_OK_ALL;
}
return 0;
}
static short select_grouped_active_channel_type_strict(KeyframeEditData *ked,
struct BezTriple *bezt)
{
char *name = MEM_mallocN(256, __func__);
BLI_snprintf(name, 256, "%s[%d]", ked->fcu->rna_path, ked->fcu->array_index);
BLI_gset_add(ked->data, name);
return 0;
}
/* ACTKEYS_SELECT_GROUP_DATABLOCK */
static short select_grouped_datablock(KeyframeEditData *ked, struct BezTriple *bezt)
@ -2036,6 +2079,10 @@ static KeyframeEditFunc select_grouped_get_filter_callback(ListBase *anim_data,
if (type == ACTKEYS_SELECT_GROUP_DATABLOCK) {
comp_set = BLI_gset_ptr_new(__func__);
}
else if (type == ACTKEYS_SELECT_GROUP_CHANNEL_TYPE ||
type == ACTKEYS_SELECT_GROUP_CHANNEL_TYPE_STRICT) {
comp_set = BLI_gset_str_new(__func__);
}
else {
comp_set = BLI_gset_int_new(__func__);
}
@ -2062,8 +2109,20 @@ static KeyframeEditFunc select_grouped_get_filter_callback(ListBase *anim_data,
/* Find first selected keyframe for context info. */
switch (type) {
case ACTKEYS_SELECT_GROUP_CHANNEL_TYPE: {
/* TODO(redmser): Channel type (by name?). */
BLI_assert(0);
if (ale == NULL) {
return select_grouped_channel_type;
}
ANIM_fcurve_keyframes_loop(ked, fcu, ok_cb, select_grouped_active_channel_type, NULL);
break;
}
case ACTKEYS_SELECT_GROUP_CHANNEL_TYPE_STRICT: {
if (ale == NULL) {
return select_grouped_channel_type_strict;
}
ANIM_fcurve_keyframes_loop(
ked, fcu, ok_cb, select_grouped_active_channel_type_strict, NULL);
break;
}
case ACTKEYS_SELECT_GROUP_HANDLE_TYPE: {
@ -2173,7 +2232,13 @@ static int actkeys_select_grouped_exec(bContext *C, wmOperator *op)
}
ANIM_animdata_freelist(&anim_data);
BLI_gset_free(ked.data, NULL);
if (type == ACTKEYS_SELECT_GROUP_CHANNEL_TYPE ||
type == ACTKEYS_SELECT_GROUP_CHANNEL_TYPE_STRICT) {
BLI_gset_free(ked.data, MEM_freeN);
}
else {
BLI_gset_free(ked.data, NULL);
}
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
return OPERATOR_FINISHED;

73
source/blender/editors/space_graph/graph_select.c
View File

@ -2028,6 +2028,7 @@ void GRAPH_OT_clickselect(wmOperatorType *ot)
enum {
GRAPHKEYS_SELECT_GROUP_CHANNEL_TYPE,
GRAPHKEYS_SELECT_GROUP_CHANNEL_TYPE_STRICT,
GRAPHKEYS_SELECT_GROUP_KEY_TYPE,
GRAPHKEYS_SELECT_GROUP_HANDLE_SIDE,
GRAPHKEYS_SELECT_GROUP_INTERPOLATION_TYPE,
@ -2042,7 +2043,12 @@ static const EnumPropertyItem graphkeys_prop_select_grouped_types[] = {
"CHANNEL_TYPE",
0,
"Channel Type",
"All keyframes of same type of channel (X Location, etc.)"},
"All keyframes with the same RNA path (Location, etc.)"},
{GRAPHKEYS_SELECT_GROUP_CHANNEL_TYPE_STRICT,
"CHANNEL_TYPE_STRICT",
0,
"Channel Type (Strict)",
"All keyframes with the same RNA path, including array index (X Location, etc.)"},
{GRAPHKEYS_SELECT_GROUP_KEY_TYPE,
"KEY_TYPE",
0,
@ -2076,6 +2082,43 @@ static const EnumPropertyItem graphkeys_prop_select_grouped_types[] = {
{0, NULL, 0, NULL, NULL},
};
/* GRAPHKEYS_SELECT_GROUP_CHANNEL_TYPE */
static short select_grouped_channel_type(KeyframeEditData *ked, struct BezTriple *bezt)
{
if (BLI_gset_haskey(ked->data, ked->fcu->rna_path)) {
return KEYFRAME_OK_ALL;
}
return 0;
}
static short select_grouped_active_channel_type(KeyframeEditData *ked, struct BezTriple *bezt)
{
BLI_gset_add(ked->data, BLI_strdup(ked->fcu->rna_path));
return 0;
}
/* GRAPHKEYS_SELECT_GROUP_CHANNEL_TYPE_STRICT */
static short select_grouped_channel_type_strict(KeyframeEditData *ked, struct BezTriple *bezt)
{
char name[256];
BLI_snprintf(name, 256, "%s[%d]", ked->fcu->rna_path, ked->fcu->array_index);
if (BLI_gset_haskey(ked->data, name)) {
return KEYFRAME_OK_ALL;
}
return 0;
}
static short select_grouped_active_channel_type_strict(KeyframeEditData *ked,
struct BezTriple *bezt)
{
char *name = MEM_mallocN(256, __func__);
BLI_snprintf(name, 256, "%s[%d]", ked->fcu->rna_path, ked->fcu->array_index);
BLI_gset_add(ked->data, name);
return 0;
}
/* GRAPHKEYS_SELECT_GROUP_DATABLOCK */
static short select_grouped_datablock(KeyframeEditData *ked, struct BezTriple *bezt)
@ -2191,6 +2234,10 @@ static KeyframeEditFunc select_grouped_get_filter_callback(ListBase *anim_data,
if (type == GRAPHKEYS_SELECT_GROUP_DATABLOCK) {
comp_set = BLI_gset_ptr_new(__func__);
}
else if (type == GRAPHKEYS_SELECT_GROUP_CHANNEL_TYPE ||
type == GRAPHKEYS_SELECT_GROUP_CHANNEL_TYPE_STRICT) {
comp_set = BLI_gset_str_new(__func__);
}
else {
comp_set = BLI_gset_int_new(__func__);
}
@ -2217,8 +2264,20 @@ static KeyframeEditFunc select_grouped_get_filter_callback(ListBase *anim_data,
/* Find first selected keyframe for context info. */
switch (type) {
case GRAPHKEYS_SELECT_GROUP_CHANNEL_TYPE: {
/* TODO(redmser): Channel type (by name?). */
BLI_assert(0);
if (ale == NULL) {
return select_grouped_channel_type;
}
ANIM_fcurve_keyframes_loop(ked, fcu, ok_cb, select_grouped_active_channel_type, NULL);
break;
}
case GRAPHKEYS_SELECT_GROUP_CHANNEL_TYPE_STRICT: {
if (ale == NULL) {
return select_grouped_channel_type_strict;
}
ANIM_fcurve_keyframes_loop(
ked, fcu, ok_cb, select_grouped_active_channel_type_strict, NULL);
break;
}
case GRAPHKEYS_SELECT_GROUP_HANDLE_TYPE: {
@ -2346,7 +2405,13 @@ static int graphkeys_select_grouped_exec(bContext *C, wmOperator *op)
}
ANIM_animdata_freelist(&anim_data);
BLI_gset_free(ked.data, NULL);
if (type == GRAPHKEYS_SELECT_GROUP_CHANNEL_TYPE ||
type == GRAPHKEYS_SELECT_GROUP_CHANNEL_TYPE_STRICT) {
BLI_gset_free(ked.data, MEM_freeN);
}
else {
BLI_gset_free(ked.data, NULL);
}
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
return OPERATOR_FINISHED;