diff options
| author | Joshua Leung <aligorith@gmail.com> | 2010-01-01 02:56:45 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2010-01-01 02:56:45 +0300 |
| commit | 3fa927a42e893709ac78f7d9419c22979b05bf3f (patch) | |
| tree | 64a37ed39d94a00def90ee6e4794d5f3371d7e39 | |
| parent | 7c4e51049250f69acc965834c7c64c972881d6ec (diff) | |
DopeSheet/Action Editor: Fixed operator name that did not get correctly during the operator renaming fixes done by Campbell's script
| -rw-r--r-- | release/scripts/ui/space_dopesheet.py | 3 | ||||
| -rw-r--r-- | source/blender/editors/space_action/action_edit.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_action/action_intern.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_action/action_ops.c | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/release/scripts/ui/space_dopesheet.py b/release/scripts/ui/space_dopesheet.py index 4710d9de3aa..d53443a3fb5 100644 --- a/release/scripts/ui/space_dopesheet.py +++ b/release/scripts/ui/space_dopesheet.py @@ -151,8 +151,7 @@ class DOPESHEET_MT_key(bpy.types.Menu): layout.operator_menu_enum("action.mirror", property="type", text="Mirror") layout.separator() - # Inconsistent naming? act/action - layout.operator("act.keyframe_insert") + layout.operator("action.keyframe_insert") layout.separator() layout.operator("action.duplicate") diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index e7b1dcb677d..687e7c53644 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -497,11 +497,11 @@ static int actkeys_insertkey_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_keyframe_insert (wmOperatorType *ot) +void ACTION_OT_keyframe_insert (wmOperatorType *ot) { /* identifiers */ ot->name= "Insert Keyframes"; - ot->idname= "ACT_OT_keyframe_insert"; + ot->idname= "ACTION_OT_keyframe_insert"; ot->description= "Insert keyframes for the specified channels."; /* api callbacks */ diff --git a/source/blender/editors/space_action/action_intern.h b/source/blender/editors/space_action/action_intern.h index e45b2d05fac..166004a5742 100644 --- a/source/blender/editors/space_action/action_intern.h +++ b/source/blender/editors/space_action/action_intern.h @@ -83,7 +83,7 @@ void ACTION_OT_view_all(struct wmOperatorType *ot); void ACTION_OT_copy(struct wmOperatorType *ot); void ACTION_OT_paste(struct wmOperatorType *ot); -void ACT_OT_keyframe_insert(struct wmOperatorType *ot); +void ACTION_OT_keyframe_insert(struct wmOperatorType *ot); void ACTION_OT_duplicate(struct wmOperatorType *ot); void ACTION_OT_delete(struct wmOperatorType *ot); void ACTION_OT_clean(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_action/action_ops.c b/source/blender/editors/space_action/action_ops.c index f02974c2ea4..7792247fe81 100644 --- a/source/blender/editors/space_action/action_ops.c +++ b/source/blender/editors/space_action/action_ops.c @@ -80,7 +80,7 @@ void action_operatortypes(void) WM_operatortype_append(ACTION_OT_clean); WM_operatortype_append(ACTION_OT_delete); WM_operatortype_append(ACTION_OT_duplicate); - WM_operatortype_append(ACT_OT_keyframe_insert); + WM_operatortype_append(ACTION_OT_keyframe_insert); WM_operatortype_append(ACTION_OT_copy); WM_operatortype_append(ACTION_OT_paste); WM_operatortype_append(ACTION_OT_new); @@ -145,7 +145,7 @@ static void action_keymap_keyframes (wmKeyConfig *keyconf, wmKeyMap *keymap) WM_keymap_add_item(keymap, "ACTION_OT_delete", DELKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "ACTION_OT_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "ACT_OT_keyframe_insert", IKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "ACTION_OT_keyframe_insert", IKEY, KM_PRESS, 0, 0); /* copy/paste */ WM_keymap_add_item(keymap, "ACTION_OT_copy", CKEY, KM_PRESS, KM_CTRL, 0); |