blender
/
blender
133
398
Fork 578
Code Issues 6.3k Pull Requests 745 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 +247
7 changed files with 247 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 131f8ace45 - Show all commits

1
scripts/presets/keyconfig/keymap_data/blender_default.py
View File

@ -2557,6 +2557,7 @@ def km_nla_editor(params):
("nla.select_leftright", {"type": 'RIGHT_BRACKET', "value": 'PRESS'},
{"properties": [("mode", 'RIGHT')]}),
*_template_items_select_actions(params, "nla.select_all"),
("nla.select_grouped", {"type": 'G', "value": 'PRESS', "shift": True}, None),
("nla.select_box", {"type": 'B', "value": 'PRESS'},
{"properties": [("axis_range", False)]}),
("nla.select_box", {"type": 'B', "value": 'PRESS', "alt": True},

1
scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
View File

@ -1496,6 +1496,7 @@ def km_nla_editor(params):
{"properties": [("mode", 'LEFT'), ("extend", False)]}),
("nla.select_leftright", {"type": 'RIGHT_BRACKET', "value": 'PRESS'},
{"properties": [("mode", 'RIGHT'), ("extend", False)]}),
("nla.select_grouped", {"type": 'G', "value": 'PRESS', "shift": True}, None),
("nla.select_all", {"type": 'A', "value": 'PRESS', "ctrl": True}, {"properties": [("action", 'SELECT')]}),
("nla.select_all", {"type": 'A', "value": 'PRESS', "ctrl": True,
"shift": True}, {"properties": [("action", 'DESELECT')]}),

3
scripts/startup/bl_ui/space_nla.py
View File

@ -138,6 +138,9 @@ class NLA_MT_select(Menu):
props.extend = False
props.mode = 'RIGHT'
layout.separator()
layout.operator_menu_enum("nla.select_grouped", "type", text="Select Grouped")
class NLA_MT_marker(Menu):
bl_label = "Marker"

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

@ -2064,6 +2064,7 @@ static KeyframeEditFunc select_grouped_get_filter_callback(ListBase *anim_data,
switch (type) {
case ACTKEYS_SELECT_GROUP_CHANNEL_TYPE: {
/* TODO(redmser): Channel type (by name?). */
BLI_assert(0);
break;
}
case ACTKEYS_SELECT_GROUP_HANDLE_TYPE: {
@ -2093,6 +2094,7 @@ static KeyframeEditFunc select_grouped_get_filter_callback(ListBase *anim_data,
}
case ACTKEYS_SELECT_GROUP_MODIFIERS: {
/* TODO(redmser): Modifier types. */
BLI_assert(0);
break;
}
case ACTKEYS_SELECT_GROUP_DATABLOCK: {

1
source/blender/editors/space_nla/nla_intern.h
View File

@ -44,6 +44,7 @@ enum eNlaEdit_LeftRightSelect_Mode {
void NLA_OT_select_all(wmOperatorType *ot);
void NLA_OT_select_box(wmOperatorType *ot);
void NLA_OT_select_leftright(wmOperatorType *ot);
void NLA_OT_select_grouped(wmOperatorType *ot);
void NLA_OT_click_select(wmOperatorType *ot);
/* **************************************** */

1
source/blender/editors/space_nla/nla_ops.c
View File

@ -97,6 +97,7 @@ void nla_operatortypes(void)
WM_operatortype_append(NLA_OT_select_box);
WM_operatortype_append(NLA_OT_select_all);
WM_operatortype_append(NLA_OT_select_leftright);
WM_operatortype_append(NLA_OT_select_grouped);
/* view */
WM_operatortype_append(NLA_OT_view_all);

238
source/blender/editors/space_nla/nla_select.c
View File

@ -14,6 +14,7 @@
#include "MEM_guardedalloc.h"
#include "BLI_blenlib.h"
#include "BLI_ghash.h"
#include "BLI_math_base.h"
#include "BKE_context.h"
@ -742,3 +743,240 @@ void NLA_OT_click_select(wmOperatorType *ot)
}
/* *********************************************** */
/* Select Grouped Operator */
enum {
NLAEDIT_SELECT_GROUP_BLENDING,
NLAEDIT_SELECT_GROUP_ACTION,
NLAEDIT_SELECT_GROUP_EXTRAPOLATION,
NLAEDIT_SELECT_GROUP_REVERSED,
NLAEDIT_SELECT_GROUP_DATABLOCK,
NLAEDIT_SELECT_GROUP_MUTED,
};
static const EnumPropertyItem nlaedit_prop_select_grouped_types[] = {
{NLAEDIT_SELECT_GROUP_BLENDING,
"BLENDING",
0,
"Blending Mode",
"All strips with the same blending mode (replace, combine, add, etc.)"},
{NLAEDIT_SELECT_GROUP_ACTION,
"ACTION",
0,
"Action",
"All strips that use the same action datablock"},
{NLAEDIT_SELECT_GROUP_EXTRAPOLATION,
"EXTRAPOLATION",
0,
"Extrapolation Mode",
"All strips the use the same extrapolation mode (hold, hold forward, etc.)"},
{NLAEDIT_SELECT_GROUP_REVERSED,
"REVERSED",
0,
"Reversed",
"All strips that have the same value for the reversed option"},
{NLAEDIT_SELECT_GROUP_DATABLOCK,
"DATABLOCK",
0,
"Datablock",
"All strips that are part of the same datablock"},
{NLAEDIT_SELECT_GROUP_MUTED,
"MUTED",
0,
"Muted",
"All strips that have the same value for the muted option"},
{0, NULL, 0, NULL, NULL},
};
static void select_grouped_tag_strips(int type, bAnimListElem *ale, GSet *comp_set)
{
NlaTrack *track = (NlaTrack *)ale->data;
for (NlaStrip *strip = track->strips.first; strip; strip = strip->next) {
if (!(strip->flag & NLASTRIP_FLAG_SELECT)) {
continue;
}
switch (type) {
case NLAEDIT_SELECT_GROUP_ACTION: {
BLI_gset_add(comp_set, strip->act);
break;
}
case NLAEDIT_SELECT_GROUP_BLENDING: {
BLI_gset_add(comp_set, POINTER_FROM_INT(strip->blendmode));
break;
}
case NLAEDIT_SELECT_GROUP_DATABLOCK: {
BLI_gset_add(comp_set, ale->id);
/* No need to check all strips in the track. */
return;
}
case NLAEDIT_SELECT_GROUP_EXTRAPOLATION: {
BLI_gset_add(comp_set, POINTER_FROM_INT(strip->extendmode));
break;
}
case NLAEDIT_SELECT_GROUP_REVERSED: {
BLI_gset_add(comp_set, POINTER_FROM_INT(strip->flag & NLASTRIP_FLAG_REVERSE));
break;
}
case NLAEDIT_SELECT_GROUP_MUTED: {
BLI_gset_add(comp_set, POINTER_FROM_INT(strip->flag & NLASTRIP_FLAG_MUTED));
break;
}
default: {
BLI_assert(0);
break;
}
}
}
}
static void select_grouped_select_matching_strips(int type, bAnimListElem *ale, GSet *comp_set)
{
NlaTrack *track = (NlaTrack *)ale->data;
for (NlaStrip *strip = track->strips.first; strip; strip = strip->next) {
switch (type) {
case NLAEDIT_SELECT_GROUP_ACTION: {
if (!BLI_gset_haskey(comp_set, strip->act)) {
continue;
}
break;
}
case NLAEDIT_SELECT_GROUP_BLENDING: {
if (!BLI_gset_haskey(comp_set, POINTER_FROM_INT(strip->blendmode))) {
continue;
}
break;
}
case NLAEDIT_SELECT_GROUP_DATABLOCK: {
if (!BLI_gset_haskey(comp_set, ale->id)) {
/* No need to check all strips in the track. */
return;
}
break;
}
case NLAEDIT_SELECT_GROUP_EXTRAPOLATION: {
if (!BLI_gset_haskey(comp_set, POINTER_FROM_INT(strip->extendmode))) {
continue;
}
break;
}
case NLAEDIT_SELECT_GROUP_REVERSED: {
if (!BLI_gset_haskey(comp_set, POINTER_FROM_INT(strip->flag & NLASTRIP_FLAG_REVERSE))) {
continue;
}
break;
}
case NLAEDIT_SELECT_GROUP_MUTED: {
if (!BLI_gset_haskey(comp_set, POINTER_FROM_INT(strip->flag & NLASTRIP_FLAG_MUTED))) {
continue;
}
break;
}
default: {
BLI_assert(0);
break;
}
}
ACHANNEL_SET_FLAG(strip, SELECT_ADD, NLASTRIP_FLAG_SELECT);
}
}
static int nlaedit_select_grouped_exec(bContext *C, wmOperator *op)
{
bAnimContext ac;
if (ANIM_animdata_get_context(C, &ac) == 0) {
return OPERATOR_CANCELLED;
}
Scene *scene = ac.scene;
/* If currently in tweak-mode, exit tweak-mode first. */
if (scene->flag & SCE_NLA_EDIT_ON) {
WM_operator_name_call(C, "NLA_OT_tweakmode_exit", WM_OP_EXEC_DEFAULT, NULL, NULL);
}
const int type = RNA_enum_get(op->ptr, "type");
const bool use_selected_tracks = RNA_boolean_get(op->ptr, "use_selected_tracks");
/* Filter data. */
int filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE);
if (use_selected_tracks) {
/* TODO(redmser): Doing it this way means that the strip that we're getting the reference
* value from must also be in a selected track. But not sure if filtering twice is a better
* solution here either. */
filter |= ANIMFILTER_SEL;
}
ListBase anim_data = {NULL, NULL};
ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
/* Collect list of selected strips' properties. */
GSet *comp_set;
if (type == NLAEDIT_SELECT_GROUP_DATABLOCK || type == NLAEDIT_SELECT_GROUP_ACTION) {
comp_set = BLI_gset_ptr_new(__func__);
}
else {
comp_set = BLI_gset_int_new(__func__);
}
for (bAnimListElem *ale = anim_data.first; ale; ale = ale->next) {
select_grouped_tag_strips(type, ale, comp_set);
}
if (!RNA_boolean_get(op->ptr, "extend")) {
/* If not extending, deselect all first. */
/* TODO(redmser): This is acting a bit weirdly... */
deselect_nla_strips(&ac, 0, SELECT_SUBTRACT);
}
/* Select all strips that match. */
for (bAnimListElem *ale = anim_data.first; ale; ale = ale->next) {
select_grouped_select_matching_strips(type, ale, comp_set);
}
ANIM_animdata_freelist(&anim_data);
BLI_gset_free(comp_set, NULL);
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, NULL);
WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_SELECTED, NULL);
return OPERATOR_FINISHED;
}
void NLA_OT_select_grouped(wmOperatorType *ot)
{
/* Identifiers. */
ot->name = "Select Grouped";
ot->idname = "NLA_OT_select_grouped";
ot->description = "Select all strips grouped by various properties";
/* Api callbacks. */
ot->invoke = WM_menu_invoke;
ot->exec = nlaedit_select_grouped_exec;
ot->poll = ED_operator_nla_active;
/* Flags. */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* Properties. */
ot->prop = RNA_def_enum(ot->srna,
"type",
nlaedit_prop_select_grouped_types,
0,
"Type",
"Which criterion to filter selection by");
RNA_def_boolean(ot->srna,
"extend",
false,
"Extend",
"Extend selection instead of deselecting everything first");
RNA_def_boolean(ot->srna,
"use_selected_tracks",
false,
"Use Selected Tracks",
"Only consider strips on the same track as the selected ones");
}