blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 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 +4 -13
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9949161edf - Show all commits

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

@ -2035,7 +2035,7 @@ static KeyframeEditFunc select_grouped_get_filter_callback(ListBase *anim_data,
GSet *comp_set; GSet *comp_set;
if (type == ACTKEYS_SELECT_GROUP_DATABLOCK) { if (type == ACTKEYS_SELECT_GROUP_DATABLOCK) {
comp_set = BLI_gset_str_new(__func__); comp_set = BLI_gset_ptr_new(__func__);
} }
else { else {
comp_set = BLI_gset_int_new(__func__); comp_set = BLI_gset_int_new(__func__);
@ -2096,7 +2096,6 @@ static KeyframeEditFunc select_grouped_get_filter_callback(ListBase *anim_data,
break; break;
} }
case ACTKEYS_SELECT_GROUP_DATABLOCK: { case ACTKEYS_SELECT_GROUP_DATABLOCK: {
/* Same datablock, identified by name. */
if (ale == NULL) { if (ale == NULL) {
return select_grouped_datablock; return select_grouped_datablock;
} }
@ -2105,7 +2104,7 @@ static KeyframeEditFunc select_grouped_get_filter_callback(ListBase *anim_data,
ked, fcu, ok_cb, select_grouped_active_datablock, NULL); ked, fcu, ok_cb, select_grouped_active_datablock, NULL);
if (result == 1) { if (result == 1) {
/* Found a selected key in this datablock, add its id. */ /* Found a selected key in this datablock, add its id. */
BLI_gset_add(ked->data, BLI_strdup(ale->id->name)); BLI_gset_add(ked->data, ale->id);
} }
break; break;
} }
@ -2165,9 +2164,7 @@ static int actkeys_select_grouped_exec(bContext *C, wmOperator *op)
} }
/* Filtering by datablock has to be done on anim data level. */ /* Filtering by datablock has to be done on anim data level. */
/* TODO(redmser): This will not work for datablocks from different libraries, since they have if (type == ACTKEYS_SELECT_GROUP_DATABLOCK && !BLI_gset_haskey(ked.data, ale->id)) {
* the same name. */
if (type == ACTKEYS_SELECT_GROUP_DATABLOCK && !BLI_gset_haskey(ked.data, ale->id->name)) {
continue; continue;
} }
@ -2175,13 +2172,7 @@ static int actkeys_select_grouped_exec(bContext *C, wmOperator *op)
} }
ANIM_animdata_freelist(&anim_data); ANIM_animdata_freelist(&anim_data);
BLI_gset_free(ked.data, NULL);
if (type == ACTKEYS_SELECT_GROUP_DATABLOCK) {
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); WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
return OPERATOR_FINISHED; return OPERATOR_FINISHED;