NLA SoC: Renamed NLA-Editor operators to be more in line with those in other editors
This commit is contained in:
parent
bc0cd9607e
commit
61e30f0f00
|
@ -381,10 +381,10 @@ static int nla_properties(bContext *C, wmOperator *op)
|
|||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
void NLAEDIT_OT_properties(wmOperatorType *ot)
|
||||
void NLA_OT_properties(wmOperatorType *ot)
|
||||
{
|
||||
ot->name= "Properties";
|
||||
ot->idname= "NLAEDIT_OT_properties";
|
||||
ot->idname= "NLA_OT_properties";
|
||||
|
||||
ot->exec= nla_properties;
|
||||
ot->poll= ED_operator_nla_active;
|
||||
|
|
|
@ -139,11 +139,11 @@ static int nlaedit_enable_tweakmode_exec (bContext *C, wmOperator *op)
|
|||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
void NLAEDIT_OT_tweakmode_enter (wmOperatorType *ot)
|
||||
void NLA_OT_tweakmode_enter (wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name= "Enter Tweak Mode";
|
||||
ot->idname= "NLAEDIT_OT_tweakmode_enter";
|
||||
ot->idname= "NLA_OT_tweakmode_enter";
|
||||
ot->description= "Enter tweaking mode for the action referenced by the active strip.";
|
||||
|
||||
/* api callbacks */
|
||||
|
@ -205,11 +205,11 @@ static int nlaedit_disable_tweakmode_exec (bContext *C, wmOperator *op)
|
|||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
void NLAEDIT_OT_tweakmode_exit (wmOperatorType *ot)
|
||||
void NLA_OT_tweakmode_exit (wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name= "Exit Tweak Mode";
|
||||
ot->idname= "NLAEDIT_OT_tweakmode_exit";
|
||||
ot->idname= "NLA_OT_tweakmode_exit";
|
||||
ot->description= "Exit tweaking mode for the action referenced by the active strip.";
|
||||
|
||||
/* api callbacks */
|
||||
|
@ -239,7 +239,7 @@ static int nlaedit_add_actionclip_invoke (bContext *C, wmOperator *op, wmEvent *
|
|||
|
||||
/* loop through Actions in Main database, adding as items in the menu */
|
||||
for (act= m->action.first; act; act= act->id.next)
|
||||
uiItemStringO(layout, act->id.name+2, 0, "NLAEDIT_OT_add_actionclip", "action", act->id.name);
|
||||
uiItemStringO(layout, act->id.name+2, 0, "NLA_OT_add_actionclip", "action", act->id.name);
|
||||
uiItemS(layout);
|
||||
|
||||
uiPupMenuEnd(C, pup);
|
||||
|
@ -322,11 +322,11 @@ static int nlaedit_add_actionclip_exec (bContext *C, wmOperator *op)
|
|||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
void NLAEDIT_OT_add_actionclip (wmOperatorType *ot)
|
||||
void NLA_OT_add_actionclip (wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name= "Add Action Strip";
|
||||
ot->idname= "NLAEDIT_OT_add_actionclip";
|
||||
ot->idname= "NLA_OT_add_actionclip";
|
||||
ot->description= "Add an Action-Clip strip (i.e. an NLA Strip referencing an Action) to the active track.";
|
||||
|
||||
/* api callbacks */
|
||||
|
@ -431,11 +431,11 @@ static int nlaedit_add_transition_exec (bContext *C, wmOperator *op)
|
|||
}
|
||||
}
|
||||
|
||||
void NLAEDIT_OT_add_transition (wmOperatorType *ot)
|
||||
void NLA_OT_add_transition (wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name= "Add Transition";
|
||||
ot->idname= "NLAEDIT_OT_add_transition";
|
||||
ot->idname= "NLA_OT_add_transition";
|
||||
ot->description= "Add a transition strip between two adjacent selected strips.";
|
||||
|
||||
/* api callbacks */
|
||||
|
@ -529,11 +529,11 @@ static int nlaedit_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *event)
|
|||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
void NLAEDIT_OT_duplicate (wmOperatorType *ot)
|
||||
void NLA_OT_duplicate (wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name= "Duplicate Strips";
|
||||
ot->idname= "NLAEDIT_OT_duplicate";
|
||||
ot->idname= "NLA_OT_duplicate";
|
||||
ot->description= "Duplicate selected NLA-Strips, adding the new strips in new tracks above the originals.";
|
||||
|
||||
/* api callbacks */
|
||||
|
@ -592,11 +592,11 @@ static int nlaedit_delete_exec (bContext *C, wmOperator *op)
|
|||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
void NLAEDIT_OT_delete (wmOperatorType *ot)
|
||||
void NLA_OT_delete (wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name= "Delete Strips";
|
||||
ot->idname= "NLAEDIT_OT_delete";
|
||||
ot->idname= "NLA_OT_delete";
|
||||
ot->description= "Delete selected strips.";
|
||||
|
||||
/* api callbacks */
|
||||
|
@ -688,11 +688,11 @@ static int nlaedit_split_exec (bContext *C, wmOperator *op)
|
|||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
void NLAEDIT_OT_split (wmOperatorType *ot)
|
||||
void NLA_OT_split (wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name= "Split Strips";
|
||||
ot->idname= "NLAEDIT_OT_split";
|
||||
ot->idname= "NLA_OT_split";
|
||||
ot->description= "Split selected strips at their midpoints.";
|
||||
|
||||
/* api callbacks */
|
||||
|
@ -768,11 +768,11 @@ static int nlaedit_move_up_exec (bContext *C, wmOperator *op)
|
|||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
void NLAEDIT_OT_move_up (wmOperatorType *ot)
|
||||
void NLA_OT_move_up (wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name= "Move Strips Up";
|
||||
ot->idname= "NLAEDIT_OT_move_up";
|
||||
ot->idname= "NLA_OT_move_up";
|
||||
ot->description= "Move selected strips up a track if there's room.";
|
||||
|
||||
/* api callbacks */
|
||||
|
@ -845,11 +845,11 @@ static int nlaedit_move_down_exec (bContext *C, wmOperator *op)
|
|||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
void NLAEDIT_OT_move_down (wmOperatorType *ot)
|
||||
void NLA_OT_move_down (wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name= "Move Strips Down";
|
||||
ot->idname= "NLAEDIT_OT_move_down";
|
||||
ot->idname= "NLA_OT_move_down";
|
||||
ot->description= "Move selected strips down a track if there's room.";
|
||||
|
||||
/* api callbacks */
|
||||
|
@ -944,11 +944,11 @@ static int nlaedit_apply_scale_exec (bContext *C, wmOperator *op)
|
|||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
void NLAEDIT_OT_apply_scale (wmOperatorType *ot)
|
||||
void NLA_OT_apply_scale (wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name= "Apply Scale";
|
||||
ot->idname= "NLAEDIT_OT_apply_scale";
|
||||
ot->idname= "NLA_OT_apply_scale";
|
||||
ot->description= "Apply scaling of selected strips to their referenced Actions.";
|
||||
|
||||
/* api callbacks */
|
||||
|
@ -1005,11 +1005,11 @@ static int nlaedit_clear_scale_exec (bContext *C, wmOperator *op)
|
|||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
void NLAEDIT_OT_clear_scale (wmOperatorType *ot)
|
||||
void NLA_OT_clear_scale (wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name= "Clear Scale";
|
||||
ot->idname= "NLAEDIT_OT_clear_scale";
|
||||
ot->idname= "NLA_OT_clear_scale";
|
||||
ot->description= "Reset scaling of selected strips.";
|
||||
|
||||
/* api callbacks */
|
||||
|
|
|
@ -90,7 +90,7 @@ static void nla_viewmenu(bContext *C, uiLayout *layout, void *arg_unused)
|
|||
RNA_pointer_create(&sc->id, &RNA_SpaceNLA, snla, &spaceptr);
|
||||
|
||||
/* create menu */
|
||||
uiItemO(layout, NULL, ICON_MENU_PANEL, "NLAEDIT_OT_properties");
|
||||
uiItemO(layout, NULL, ICON_MENU_PANEL, "NLA_OT_properties");
|
||||
|
||||
uiItemS(layout);
|
||||
|
||||
|
@ -104,9 +104,9 @@ static void nla_viewmenu(bContext *C, uiLayout *layout, void *arg_unused)
|
|||
uiItemS(layout);
|
||||
|
||||
if (scene->flag & SCE_NLA_EDIT_ON)
|
||||
uiItemO(layout, NULL, 0, "NLAEDIT_OT_tweakmode_exit");
|
||||
uiItemO(layout, NULL, 0, "NLA_OT_tweakmode_exit");
|
||||
else
|
||||
uiItemO(layout, NULL, 0, "NLAEDIT_OT_tweakmode_enter");
|
||||
uiItemO(layout, NULL, 0, "NLA_OT_tweakmode_enter");
|
||||
|
||||
uiItemS(layout);
|
||||
|
||||
|
@ -125,13 +125,13 @@ static void nla_viewmenu(bContext *C, uiLayout *layout, void *arg_unused)
|
|||
|
||||
static void nla_selectmenu(bContext *C, uiLayout *layout, void *arg_unused)
|
||||
{
|
||||
uiItemO(layout, NULL, 0, "NLAEDIT_OT_select_all_toggle");
|
||||
uiItemBooleanO(layout, "Invert All", 0, "NLAEDIT_OT_select_all_toggle", "invert", 1);
|
||||
uiItemO(layout, NULL, 0, "NLA_OT_select_all_toggle");
|
||||
uiItemBooleanO(layout, "Invert All", 0, "NLA_OT_select_all_toggle", "invert", 1);
|
||||
|
||||
uiItemS(layout);
|
||||
|
||||
uiItemO(layout, NULL, 0, "NLAEDIT_OT_select_border");
|
||||
uiItemBooleanO(layout, "Border Axis Range", 0, "NLAEDIT_OT_select_border", "axis_range", 1);
|
||||
uiItemO(layout, NULL, 0, "NLA_OT_select_border");
|
||||
uiItemBooleanO(layout, "Border Axis Range", 0, "NLA_OT_select_border", "axis_range", 1);
|
||||
}
|
||||
|
||||
static void nla_edit_transformmenu(bContext *C, uiLayout *layout, void *arg_unused)
|
||||
|
@ -148,28 +148,28 @@ static void nla_editmenu(bContext *C, uiLayout *layout, void *arg_unused)
|
|||
|
||||
uiItemS(layout);
|
||||
|
||||
uiItemO(layout, NULL, 0, "NLAEDIT_OT_duplicate");
|
||||
uiItemO(layout, NULL, 0, "NLAEDIT_OT_split");
|
||||
uiItemO(layout, NULL, 0, "NLA_OT_duplicate");
|
||||
uiItemO(layout, NULL, 0, "NLA_OT_split");
|
||||
|
||||
uiItemS(layout);
|
||||
|
||||
uiItemO(layout, NULL, 0, "NLAEDIT_OT_delete");
|
||||
uiItemO(layout, NULL, 0, "NLA_OT_delete");
|
||||
|
||||
uiItemS(layout);
|
||||
|
||||
uiItemO(layout, NULL, 0, "NLAEDIT_OT_apply_scale");
|
||||
uiItemO(layout, NULL, 0, "NLAEDIT_OT_clear_scale");
|
||||
uiItemO(layout, NULL, 0, "NLA_OT_apply_scale");
|
||||
uiItemO(layout, NULL, 0, "NLA_OT_clear_scale");
|
||||
|
||||
uiItemS(layout);
|
||||
|
||||
uiItemO(layout, NULL, 0, "NLAEDIT_OT_move_up");
|
||||
uiItemO(layout, NULL, 0, "NLAEDIT_OT_move_down");
|
||||
uiItemO(layout, NULL, 0, "NLA_OT_move_up");
|
||||
uiItemO(layout, NULL, 0, "NLA_OT_move_down");
|
||||
}
|
||||
|
||||
static void nla_addmenu(bContext *C, uiLayout *layout, void *arg_unused)
|
||||
{
|
||||
uiItemO(layout, NULL, 0, "NLAEDIT_OT_add_actionclip");
|
||||
uiItemO(layout, NULL, 0, "NLAEDIT_OT_add_transition");
|
||||
uiItemO(layout, NULL, 0, "NLA_OT_add_actionclip");
|
||||
uiItemO(layout, NULL, 0, "NLA_OT_add_transition");
|
||||
|
||||
uiItemS(layout);
|
||||
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
ARegion *nla_has_buttons_region(ScrArea *sa);
|
||||
|
||||
void nla_buttons_register(ARegionType *art);
|
||||
void NLAEDIT_OT_properties(wmOperatorType *ot);
|
||||
void NLA_OT_properties(wmOperatorType *ot);
|
||||
|
||||
/* **************************************** */
|
||||
/* nla_draw.c */
|
||||
|
@ -80,30 +80,30 @@ enum {
|
|||
|
||||
/* --- */
|
||||
|
||||
void NLAEDIT_OT_select_all_toggle(wmOperatorType *ot);
|
||||
void NLAEDIT_OT_select_border(wmOperatorType *ot);
|
||||
void NLAEDIT_OT_click_select(wmOperatorType *ot);
|
||||
void NLA_OT_select_all_toggle(wmOperatorType *ot);
|
||||
void NLA_OT_select_border(wmOperatorType *ot);
|
||||
void NLA_OT_click_select(wmOperatorType *ot);
|
||||
|
||||
/* **************************************** */
|
||||
/* nla_edit.c */
|
||||
|
||||
void NLAEDIT_OT_tweakmode_enter(wmOperatorType *ot);
|
||||
void NLAEDIT_OT_tweakmode_exit(wmOperatorType *ot);
|
||||
void NLA_OT_tweakmode_enter(wmOperatorType *ot);
|
||||
void NLA_OT_tweakmode_exit(wmOperatorType *ot);
|
||||
|
||||
/* --- */
|
||||
|
||||
void NLAEDIT_OT_add_actionclip(wmOperatorType *ot);
|
||||
void NLAEDIT_OT_add_transition(wmOperatorType *ot);
|
||||
void NLA_OT_add_actionclip(wmOperatorType *ot);
|
||||
void NLA_OT_add_transition(wmOperatorType *ot);
|
||||
|
||||
void NLAEDIT_OT_duplicate(wmOperatorType *ot);
|
||||
void NLAEDIT_OT_delete(wmOperatorType *ot);
|
||||
void NLAEDIT_OT_split(wmOperatorType *ot);
|
||||
void NLA_OT_duplicate(wmOperatorType *ot);
|
||||
void NLA_OT_delete(wmOperatorType *ot);
|
||||
void NLA_OT_split(wmOperatorType *ot);
|
||||
|
||||
void NLAEDIT_OT_move_up(wmOperatorType *ot);
|
||||
void NLAEDIT_OT_move_down(wmOperatorType *ot);
|
||||
void NLA_OT_move_up(wmOperatorType *ot);
|
||||
void NLA_OT_move_down(wmOperatorType *ot);
|
||||
|
||||
void NLAEDIT_OT_apply_scale(wmOperatorType *ot);
|
||||
void NLAEDIT_OT_clear_scale(wmOperatorType *ot);
|
||||
void NLA_OT_apply_scale(wmOperatorType *ot);
|
||||
void NLA_OT_clear_scale(wmOperatorType *ot);
|
||||
|
||||
|
||||
/* **************************************** */
|
||||
|
|
|
@ -126,7 +126,7 @@ short nlaedit_is_tweakmode_on (bAnimContext *ac)
|
|||
void nla_operatortypes(void)
|
||||
{
|
||||
/* view */
|
||||
WM_operatortype_append(NLAEDIT_OT_properties);
|
||||
WM_operatortype_append(NLA_OT_properties);
|
||||
|
||||
/* channels */
|
||||
WM_operatortype_append(NLA_OT_channels_click);
|
||||
|
@ -135,26 +135,26 @@ void nla_operatortypes(void)
|
|||
WM_operatortype_append(NLA_OT_delete_tracks);
|
||||
|
||||
/* select */
|
||||
WM_operatortype_append(NLAEDIT_OT_click_select);
|
||||
WM_operatortype_append(NLAEDIT_OT_select_border);
|
||||
WM_operatortype_append(NLAEDIT_OT_select_all_toggle);
|
||||
WM_operatortype_append(NLA_OT_click_select);
|
||||
WM_operatortype_append(NLA_OT_select_border);
|
||||
WM_operatortype_append(NLA_OT_select_all_toggle);
|
||||
|
||||
/* edit */
|
||||
WM_operatortype_append(NLAEDIT_OT_tweakmode_enter);
|
||||
WM_operatortype_append(NLAEDIT_OT_tweakmode_exit);
|
||||
WM_operatortype_append(NLA_OT_tweakmode_enter);
|
||||
WM_operatortype_append(NLA_OT_tweakmode_exit);
|
||||
|
||||
WM_operatortype_append(NLAEDIT_OT_add_actionclip);
|
||||
WM_operatortype_append(NLAEDIT_OT_add_transition);
|
||||
WM_operatortype_append(NLA_OT_add_actionclip);
|
||||
WM_operatortype_append(NLA_OT_add_transition);
|
||||
|
||||
WM_operatortype_append(NLAEDIT_OT_duplicate);
|
||||
WM_operatortype_append(NLAEDIT_OT_delete);
|
||||
WM_operatortype_append(NLAEDIT_OT_split);
|
||||
WM_operatortype_append(NLA_OT_duplicate);
|
||||
WM_operatortype_append(NLA_OT_delete);
|
||||
WM_operatortype_append(NLA_OT_split);
|
||||
|
||||
WM_operatortype_append(NLAEDIT_OT_move_up);
|
||||
WM_operatortype_append(NLAEDIT_OT_move_down);
|
||||
WM_operatortype_append(NLA_OT_move_up);
|
||||
WM_operatortype_append(NLA_OT_move_down);
|
||||
|
||||
WM_operatortype_append(NLAEDIT_OT_apply_scale);
|
||||
WM_operatortype_append(NLAEDIT_OT_clear_scale);
|
||||
WM_operatortype_append(NLA_OT_apply_scale);
|
||||
WM_operatortype_append(NLA_OT_clear_scale);
|
||||
}
|
||||
|
||||
/* ************************** registration - keymaps **********************************/
|
||||
|
@ -208,19 +208,19 @@ static void nla_keymap_main (wmWindowManager *wm, ListBase *keymap)
|
|||
|
||||
/* selection */
|
||||
/* click select */
|
||||
WM_keymap_add_item(keymap, "NLAEDIT_OT_click_select", SELECTMOUSE, KM_PRESS, 0, 0);
|
||||
kmi= WM_keymap_add_item(keymap, "NLAEDIT_OT_click_select", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0);
|
||||
WM_keymap_add_item(keymap, "NLA_OT_click_select", SELECTMOUSE, KM_PRESS, 0, 0);
|
||||
kmi= WM_keymap_add_item(keymap, "NLA_OT_click_select", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0);
|
||||
RNA_boolean_set(kmi->ptr, "extend", 1);
|
||||
kmi= WM_keymap_add_item(keymap, "NLAEDIT_OT_click_select", SELECTMOUSE, KM_PRESS, KM_CTRL, 0);
|
||||
kmi= WM_keymap_add_item(keymap, "NLA_OT_click_select", SELECTMOUSE, KM_PRESS, KM_CTRL, 0);
|
||||
RNA_enum_set(kmi->ptr, "left_right", NLAEDIT_LRSEL_TEST);
|
||||
|
||||
/* deselect all */
|
||||
WM_keymap_add_item(keymap, "NLAEDIT_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0);
|
||||
RNA_boolean_set(WM_keymap_add_item(keymap, "NLAEDIT_OT_select_all_toggle", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "invert", 1);
|
||||
WM_keymap_add_item(keymap, "NLA_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0);
|
||||
RNA_boolean_set(WM_keymap_add_item(keymap, "NLA_OT_select_all_toggle", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "invert", 1);
|
||||
|
||||
/* borderselect */
|
||||
WM_keymap_add_item(keymap, "NLAEDIT_OT_select_border", BKEY, KM_PRESS, 0, 0);
|
||||
RNA_boolean_set(WM_keymap_add_item(keymap, "NLAEDIT_OT_select_border", BKEY, KM_PRESS, KM_ALT, 0)->ptr, "axis_range", 1);
|
||||
WM_keymap_add_item(keymap, "NLA_OT_select_border", BKEY, KM_PRESS, 0, 0);
|
||||
RNA_boolean_set(WM_keymap_add_item(keymap, "NLA_OT_select_border", BKEY, KM_PRESS, KM_ALT, 0)->ptr, "axis_range", 1);
|
||||
|
||||
|
||||
/* editing */
|
||||
|
@ -228,32 +228,32 @@ static void nla_keymap_main (wmWindowManager *wm, ListBase *keymap)
|
|||
* - enter and exit are separate operators with the same hotkey...
|
||||
* This works as they use different poll()'s
|
||||
*/
|
||||
WM_keymap_add_item(keymap, "NLAEDIT_OT_tweakmode_enter", TABKEY, KM_PRESS, 0, 0);
|
||||
WM_keymap_add_item(keymap, "NLAEDIT_OT_tweakmode_exit", TABKEY, KM_PRESS, 0, 0);
|
||||
WM_keymap_add_item(keymap, "NLA_OT_tweakmode_enter", TABKEY, KM_PRESS, 0, 0);
|
||||
WM_keymap_add_item(keymap, "NLA_OT_tweakmode_exit", TABKEY, KM_PRESS, 0, 0);
|
||||
|
||||
/* add strips */
|
||||
WM_keymap_add_item(keymap, "NLAEDIT_OT_add_actionclip", AKEY, KM_PRESS, KM_SHIFT, 0);
|
||||
WM_keymap_add_item(keymap, "NLAEDIT_OT_add_transition", TKEY, KM_PRESS, KM_SHIFT, 0);
|
||||
WM_keymap_add_item(keymap, "NLA_OT_add_actionclip", AKEY, KM_PRESS, KM_SHIFT, 0);
|
||||
WM_keymap_add_item(keymap, "NLA_OT_add_transition", TKEY, KM_PRESS, KM_SHIFT, 0);
|
||||
|
||||
/* duplicate */
|
||||
WM_keymap_add_item(keymap, "NLAEDIT_OT_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0);
|
||||
WM_keymap_add_item(keymap, "NLA_OT_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0);
|
||||
|
||||
/* delete */
|
||||
WM_keymap_add_item(keymap, "NLAEDIT_OT_delete", XKEY, KM_PRESS, 0, 0);
|
||||
WM_keymap_add_item(keymap, "NLAEDIT_OT_delete", DELKEY, KM_PRESS, 0, 0);
|
||||
WM_keymap_add_item(keymap, "NLA_OT_delete", XKEY, KM_PRESS, 0, 0);
|
||||
WM_keymap_add_item(keymap, "NLA_OT_delete", DELKEY, KM_PRESS, 0, 0);
|
||||
|
||||
/* split */
|
||||
WM_keymap_add_item(keymap, "NLAEDIT_OT_split", YKEY, KM_PRESS, 0, 0);
|
||||
WM_keymap_add_item(keymap, "NLA_OT_split", YKEY, KM_PRESS, 0, 0);
|
||||
|
||||
/* move up */
|
||||
WM_keymap_add_item(keymap, "NLAEDIT_OT_move_up", PAGEUPKEY, KM_PRESS, 0, 0);
|
||||
WM_keymap_add_item(keymap, "NLA_OT_move_up", PAGEUPKEY, KM_PRESS, 0, 0);
|
||||
/* move down */
|
||||
WM_keymap_add_item(keymap, "NLAEDIT_OT_move_down", PAGEDOWNKEY, KM_PRESS, 0, 0);
|
||||
WM_keymap_add_item(keymap, "NLA_OT_move_down", PAGEDOWNKEY, KM_PRESS, 0, 0);
|
||||
|
||||
/* apply scale */
|
||||
WM_keymap_add_item(keymap, "NLAEDIT_OT_apply_scale", AKEY, KM_PRESS, KM_CTRL, 0);
|
||||
WM_keymap_add_item(keymap, "NLA_OT_apply_scale", AKEY, KM_PRESS, KM_CTRL, 0);
|
||||
/* clear scale */
|
||||
WM_keymap_add_item(keymap, "NLAEDIT_OT_clear_scale", SKEY, KM_PRESS, KM_ALT, 0);
|
||||
WM_keymap_add_item(keymap, "NLA_OT_clear_scale", SKEY, KM_PRESS, KM_ALT, 0);
|
||||
|
||||
/* transform system */
|
||||
transform_keymap_for_space(wm, keymap, SPACE_NLA);
|
||||
|
@ -267,7 +267,7 @@ void nla_keymap(wmWindowManager *wm)
|
|||
|
||||
/* keymap for all regions */
|
||||
keymap= WM_keymap_listbase(wm, "NLA Generic", SPACE_NLA, 0);
|
||||
WM_keymap_add_item(keymap, "NLAEDIT_OT_properties", NKEY, KM_PRESS, 0, 0);
|
||||
WM_keymap_add_item(keymap, "NLA_OT_properties", NKEY, KM_PRESS, 0, 0);
|
||||
|
||||
/* channels */
|
||||
/* Channels are not directly handled by the NLA Editor module, but are inherited from the Animation module.
|
||||
|
|
|
@ -191,11 +191,11 @@ static int nlaedit_deselectall_exec(bContext *C, wmOperator *op)
|
|||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
void NLAEDIT_OT_select_all_toggle (wmOperatorType *ot)
|
||||
void NLA_OT_select_all_toggle (wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name= "Select All";
|
||||
ot->idname= "NLAEDIT_OT_select_all_toggle";
|
||||
ot->idname= "NLA_OT_select_all_toggle";
|
||||
|
||||
/* api callbacks */
|
||||
ot->exec= nlaedit_deselectall_exec;
|
||||
|
@ -327,11 +327,11 @@ static int nlaedit_borderselect_exec(bContext *C, wmOperator *op)
|
|||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
void NLAEDIT_OT_select_border(wmOperatorType *ot)
|
||||
void NLA_OT_select_border(wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name= "Border Select";
|
||||
ot->idname= "NLAEDIT_OT_select_border";
|
||||
ot->idname= "NLA_OT_select_border";
|
||||
|
||||
/* api callbacks */
|
||||
ot->invoke= WM_border_select_invoke;
|
||||
|
@ -434,7 +434,7 @@ static void mouse_nla_strips (bContext *C, bAnimContext *ac, int mval[2], short
|
|||
* now that we've found our target...
|
||||
*/
|
||||
if (scene->flag & SCE_NLA_EDIT_ON)
|
||||
WM_operator_name_call(C, "NLAEDIT_OT_tweakmode_exit", WM_OP_EXEC_DEFAULT, NULL);
|
||||
WM_operator_name_call(C, "NLA_OT_tweakmode_exit", WM_OP_EXEC_DEFAULT, NULL);
|
||||
|
||||
/* for replacing selection, firstly need to clear existing selection */
|
||||
if (select_mode == SELECT_REPLACE) {
|
||||
|
@ -488,7 +488,7 @@ static void nlaedit_mselect_leftright (bContext *C, bAnimContext *ac, short left
|
|||
|
||||
/* if currently in tweakmode, exit tweakmode first */
|
||||
if (scene->flag & SCE_NLA_EDIT_ON)
|
||||
WM_operator_name_call(C, "NLAEDIT_OT_tweakmode_exit", WM_OP_EXEC_DEFAULT, NULL);
|
||||
WM_operator_name_call(C, "NLA_OT_tweakmode_exit", WM_OP_EXEC_DEFAULT, NULL);
|
||||
|
||||
/* if select mode is replace, deselect all keyframes (and channels) first */
|
||||
if (select_mode==SELECT_REPLACE) {
|
||||
|
@ -589,11 +589,11 @@ static int nlaedit_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *even
|
|||
return OPERATOR_FINISHED|OPERATOR_PASS_THROUGH;
|
||||
}
|
||||
|
||||
void NLAEDIT_OT_click_select (wmOperatorType *ot)
|
||||
void NLA_OT_click_select (wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name= "Mouse Select";
|
||||
ot->idname= "NLAEDIT_OT_click_select";
|
||||
ot->idname= "NLA_OT_click_select";
|
||||
|
||||
/* api callbacks - absolutely no exec() this yet... */
|
||||
ot->invoke= nlaedit_clickselect_invoke;
|
||||
|
|
Loading…
Reference in New Issue