blender
/
blender
137
416
Fork 599
Code Issues 6.3k Pull Requests 772 Projects 19 Wiki Activity

Animation: Default NLA duplucation hot keys to duplicate linked #110316

Merged
Nate Rupsis merged 6 commits from nrupsis/blender:NLA-duplicate-vs-linked into main 2023-07-27 18:14:13 +02:00
Conversation 2 Commits 6 Files Changed 4 +10 -10
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2613,8 +2613,8 @@ def km_nla_editor(params):
("nla.soundclip_add", {"type": 'K', "value": 'PRESS', "shift": True}, None),
("nla.meta_add", {"type": 'G', "value": 'PRESS', "ctrl": True}, None),
("nla.meta_remove", {"type": 'G', "value": 'PRESS', "ctrl": True, "alt": True}, None),
("nla.duplicate_move", {"type": 'D', "value": 'PRESS', "shift": True}, None),
("nla.duplicate_linked_move", {"type": 'D', "value": 'PRESS', "alt": True}, None),
("nla.duplicate_linked_move", {"type": 'D', "value": 'PRESS', "shift": True}, None),
("nla.duplicate_move", {"type": 'D', "value": 'PRESS', "alt": True}, None),
("nla.make_single_user", {"type": 'U', "value": 'PRESS'}, None),
("nla.delete", {"type": 'X', "value": 'PRESS'}, None),
("nla.delete", {"type": 'DEL', "value": 'PRESS'}, None),

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

@ -181,8 +181,8 @@ class NLA_MT_edit(Menu):
layout.separator()
layout.operator("nla.bake", text="Bake Action")
layout.operator("nla.duplicate", text="Duplicate").linked = False
layout.operator("nla.duplicate", text="Linked Duplicate").linked = True
layout.operator("nla.duplicate_move")
layout.operator("nla.duplicate_linked_move")
layout.operator("nla.split")
layout.operator("nla.delete")
layout.operator("nla.tracks_delete")
@ -302,8 +302,8 @@ class NLA_MT_context_menu(Menu):
props = layout.operator("wm.call_panel", text="Rename...")
props.name = "TOPBAR_PT_name"
props.keep_open = False
layout.operator("nla.duplicate", text="Duplicate").linked = False
layout.operator("nla.duplicate", text="Linked Duplicate").linked = True
layout.operator("nla.duplicate_move")
layout.operator("nla.duplicate_linked_move")
layout.separator()

3
source/blender/editors/space_nla/nla_edit.cc
View File

@ -1220,8 +1220,7 @@ void NLA_OT_duplicate(wmOperatorType *ot)
/* identifiers */
ot->name = "Duplicate Strips";
ot->idname = "NLA_OT_duplicate";
ot->description =
"Duplicate selected NLA-Strips, adding the new strips in new tracks above the originals";
ot->description = "Duplicate selected NLA-Strips, adding the new strips to new track(s)";
/* api callbacks */
ot->invoke = nlaedit_duplicate_invoke;

5
source/blender/editors/space_nla/nla_ops.cc
View File

@ -148,7 +148,7 @@ void ED_operatormacros_nla()
ot = WM_operatortype_append_macro("NLA_OT_duplicate_move",
"Duplicate",
"Duplicate selected strips and their Actions and move them",
"Duplicate selected NLA-Strips, adding the new strips to new track(s)",
OPTYPE_UNDO | OPTYPE_REGISTER);
otmacro = WM_operatortype_macro_define(ot, "NLA_OT_duplicate");
RNA_boolean_set(otmacro->ptr, "linked", false);
@ -156,8 +156,9 @@ void ED_operatormacros_nla()
ot = WM_operatortype_append_macro("NLA_OT_duplicate_linked_move",
"Duplicate Linked",
"Duplicate selected strips and move them",
"Duplicate Linked selected NLA-Strips, adding the new strips to new track(s)",
OPTYPE_UNDO | OPTYPE_REGISTER);
otmacro = WM_operatortype_macro_define(ot, "NLA_OT_duplicate");
RNA_boolean_set(otmacro->ptr, "linked", true);
WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");