kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

action paste properties were assigned to copy operator instead.

Browse Source
This commit is contained in:
Campbell Barton 2011-01-10 17:48:38 +00:00
parent dd69f1968e
commit 795ca28a82
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/space_action/action_edit.c
View File

@ -347,16 +347,11 @@ void ACTION_OT_copy (wmOperatorType *ot)
// ot->invoke= WM_operator_props_popup; // better wait for graph redo panel // ot->invoke= WM_operator_props_popup; // better wait for graph redo panel
ot->exec= actkeys_copy_exec; ot->exec= actkeys_copy_exec;
ot->poll= ED_operator_action_active; ot->poll= ED_operator_action_active;
/* flags */ /* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
RNA_def_enum(ot->srna, "offset", keyframe_paste_offset_items, KEYFRAME_PASTE_OFFSET_CFRA_START, "Offset", "Paste time offset of keys");
RNA_def_enum(ot->srna, "merge", keyframe_paste_merge_items, KEYFRAME_PASTE_MERGE_MIX, "Type", "Method of merking pasted keys and existing");
} }
static int actkeys_paste_exec(bContext *C, wmOperator *op) static int actkeys_paste_exec(bContext *C, wmOperator *op)
{ {
bAnimContext ac; bAnimContext ac;
@ -405,6 +400,9 @@ void ACTION_OT_paste (wmOperatorType *ot)
/* flags */ /* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
RNA_def_enum(ot->srna, "offset", keyframe_paste_offset_items, KEYFRAME_PASTE_OFFSET_CFRA_START, "Offset", "Paste time offset of keys");
RNA_def_enum(ot->srna, "merge", keyframe_paste_merge_items, KEYFRAME_PASTE_MERGE_MIX, "Type", "Method of merking pasted keys and existing");
} }
/* ******************** Insert Keyframes Operator ************************* */ /* ******************** Insert Keyframes Operator ************************* */