From 510c0facdf809bcf2023d9f09630cf948e3f2e62 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 28 Nov 2009 14:37:21 +0000 Subject: operator renaming for more consistent word ordering (_add/_remmove shold be last, ACT_OT_* --> ACTION_OT_*) ACT_OT_clean --> ACTION_OT_clean ACT_OT_clickselect --> ACTION_OT_clickselect ACT_OT_copy --> ACTION_OT_copy ACT_OT_delete --> ACTION_OT_delete ACT_OT_duplicate --> ACTION_OT_duplicate ACT_OT_extrapolation_type --> ACTION_OT_extrapolation_type ACT_OT_frame_jump --> ACTION_OT_frame_jump ACT_OT_handle_type --> ACTION_OT_handle_type ACT_OT_insert_keyframe --> ACTION_OT_insert_keyframe ACT_OT_insert_keyframe --> ACT_OT_keyframe_insert ACT_OT_interpolation_type --> ACTION_OT_interpolation_type ACT_OT_keyframe_type --> ACTION_OT_keyframe_type ACT_OT_mirror --> ACTION_OT_mirror ACT_OT_new --> ACTION_OT_new ACT_OT_paste --> ACTION_OT_paste ACT_OT_previewrange_set --> ACTION_OT_previewrange_set ACT_OT_properties --> ACTION_OT_properties ACT_OT_sample --> ACTION_OT_sample ACT_OT_select_all_toggle --> ACTION_OT_select_all_toggle ACT_OT_select_border --> ACTION_OT_select_border ACT_OT_select_column --> ACTION_OT_select_column ACT_OT_snap --> ACTION_OT_snap ACT_OT_test --> ACTION_OT_test ACT_OT_unlink --> ACTION_OT_unlink ACT_OT_view_all --> ACTION_OT_view_all ANIM_OT_add_driver_button --> ANIM_OT_driver_button_add ANIM_OT_add_keyingset_button --> ANIM_OT_keyingset_button_add ANIM_OT_delete_keyframe --> ANIM_OT_keyframe_delete ANIM_OT_delete_keyframe_button --> ANIM_OT_keyframe_delete_button ANIM_OT_delete_keyframe_v3d --> ANIM_OT_keyframe_delete_v3d ANIM_OT_insert_keyframe --> ANIM_OT_keyframe_insert ANIM_OT_insert_keyframe_button --> ANIM_OT_keyframe_insert_button ANIM_OT_insert_keyframe_menu --> ANIM_OT_keyframe_insert_menu ANIM_OT_remove_driver_button --> ANIM_OT_driver_button_remove ANIM_OT_remove_keyingset_button --> ANIM_OT_keyingset_button_remove FILE_OT_add_bookmark --> FILE_OT_bookmark_add GRAPH_OT_insert_keyframe --> GRAPH_OT_keyframe_insert NLA_OT_add_actionclip --> NLA_OT_actionclip_add NLA_OT_add_meta --> NLA_OT_meta_add NLA_OT_add_tracks --> NLA_OT_tracks_add NLA_OT_add_transition --> NLA_OT_transition_add NLA_OT_remove_meta --> NLA_OT_meta_remove PARTICLE_OT_remove_target --> PARTICLE_OT_target_remove PTCACHE_OT_add_new --> PTCACHE_OT_add --- release/scripts/io/import_anim_bvh.py | 6 +- release/scripts/ui/properties_particle.py | 2 +- release/scripts/ui/properties_physics_common.py | 2 +- release/scripts/ui/space_outliner.py | 4 +- release/scripts/ui/space_time.py | 4 +- release/scripts/ui/space_view3d.py | 8 +- release/scripts/ui/space_view3d_toolbar.py | 8 +- source/blender/editors/animation/anim_intern.h | 20 ++-- source/blender/editors/animation/anim_ops.c | 20 ++-- source/blender/editors/animation/drivers.c | 8 +- source/blender/editors/animation/keyframing.c | 30 +++--- source/blender/editors/animation/keyingsets.c | 8 +- source/blender/editors/armature/armature_ops.c | 4 +- source/blender/editors/interface/interface_anim.c | 12 +-- .../blender/editors/interface/interface_handlers.c | 40 ++++---- source/blender/editors/object/object_ops.c | 4 +- source/blender/editors/physics/particle_object.c | 4 +- source/blender/editors/physics/physics_intern.h | 4 +- source/blender/editors/physics/physics_ops.c | 4 +- .../blender/editors/physics/physics_pointcache.c | 4 +- source/blender/editors/space_action/action_edit.c | 68 ++++++------- .../blender/editors/space_action/action_header.c | 56 +++++------ .../blender/editors/space_action/action_intern.h | 42 ++++---- source/blender/editors/space_action/action_ops.c | 106 ++++++++++----------- .../blender/editors/space_action/action_select.c | 16 ++-- source/blender/editors/space_file/file_intern.h | 2 +- source/blender/editors/space_file/file_ops.c | 4 +- source/blender/editors/space_file/file_panels.c | 2 +- source/blender/editors/space_file/space_file.c | 4 +- source/blender/editors/space_graph/graph_edit.c | 4 +- source/blender/editors/space_graph/graph_header.c | 2 +- source/blender/editors/space_graph/graph_intern.h | 2 +- source/blender/editors/space_graph/graph_ops.c | 4 +- source/blender/editors/space_nla/nla_buttons.c | 2 +- source/blender/editors/space_nla/nla_channels.c | 4 +- source/blender/editors/space_nla/nla_edit.c | 18 ++-- source/blender/editors/space_nla/nla_header.c | 12 +-- source/blender/editors/space_nla/nla_intern.h | 10 +- source/blender/editors/space_nla/nla_ops.c | 22 ++--- .../blender/editors/space_outliner/outliner_ops.c | 4 +- source/blender/windowmanager/intern/wm_operators.c | 2 +- 41 files changed, 291 insertions(+), 291 deletions(-) diff --git a/release/scripts/io/import_anim_bvh.py b/release/scripts/io/import_anim_bvh.py index 0eff15f9ba1..9f7063b24cf 100644 --- a/release/scripts/io/import_anim_bvh.py +++ b/release/scripts/io/import_anim_bvh.py @@ -485,7 +485,7 @@ def bvh_node_dict2armature(context, bvh_nodes, IMPORT_START_FRAME= 1, IMPORT_LOO bpy.ops.pose.select_all_toggle() # set - bpy.ops.anim.insert_keyframe_menu(type=-4) # XXX - -4 ??? + bpy.ops.anim.keyframe_insert_menu(type=-4) # XXX - -4 ??? @@ -498,7 +498,7 @@ def bvh_node_dict2armature(context, bvh_nodes, IMPORT_START_FRAME= 1, IMPORT_LOO #XXX action = Blender.Armature.NLA.NewAction("Action") #XXX action.setActive(arm_ob) - #bpy.ops.act.new() + #bpy.ops.action.new() #action = bpy.data.actions[-1] # arm_ob.animation_data.action = action @@ -617,7 +617,7 @@ def bvh_node_dict2armature(context, bvh_nodes, IMPORT_START_FRAME= 1, IMPORT_LOO - # bpy.ops.anim.insert_keyframe_menu(type=-4) # XXX - -4 ??? + # bpy.ops.anim.keyframe_insert_menu(type=-4) # XXX - -4 ??? bpy.ops.screen.frame_offset(delta=1) # First time, set the IPO's to linear diff --git a/release/scripts/ui/properties_particle.py b/release/scripts/ui/properties_particle.py index 1b4ba95f540..d95455f7c10 100644 --- a/release/scripts/ui/properties_particle.py +++ b/release/scripts/ui/properties_particle.py @@ -454,7 +454,7 @@ class PARTICLE_PT_physics(ParticleButtonsPanel): sub = col.row() subsub = sub.column(align=True) subsub.operator("particle.new_target", icon='ICON_ZOOMIN', text="") - subsub.operator("particle.remove_target", icon='ICON_ZOOMOUT', text="") + subsub.operator("particle.target_remove", icon='ICON_ZOOMOUT', text="") sub = col.row() subsub = sub.column(align=True) subsub.operator("particle.target_move_up", icon='VICON_MOVE_UP', text="") diff --git a/release/scripts/ui/properties_physics_common.py b/release/scripts/ui/properties_physics_common.py index d1720a2c323..7c1d71302ec 100644 --- a/release/scripts/ui/properties_physics_common.py +++ b/release/scripts/ui/properties_physics_common.py @@ -30,7 +30,7 @@ def point_cache_ui(self, context, cache, enabled, particles, smoke): row = layout.row() row.template_list(cache, "point_cache_list", cache, "active_point_cache_index", rows=2) col = row.column(align=True) - col.operator("ptcache.add_new", icon='ICON_ZOOMIN', text="") + col.operator("ptcache.add", icon='ICON_ZOOMIN', text="") col.operator("ptcache.remove", icon='ICON_ZOOMOUT', text="") row = layout.row() diff --git a/release/scripts/ui/space_outliner.py b/release/scripts/ui/space_outliner.py index 5cb8721603d..a398bc66f45 100644 --- a/release/scripts/ui/space_outliner.py +++ b/release/scripts/ui/space_outliner.py @@ -53,8 +53,8 @@ class OUTLINER_HT_header(bpy.types.Header): row.prop_object(scene, "active_keying_set", scene, "keying_sets", text="") row = layout.row(align=True) - row.operator("anim.insert_keyframe", text="", icon='ICON_KEY_HLT') - row.operator("anim.delete_keyframe", text="", icon='ICON_KEY_DEHLT') + row.operator("anim.keyframe_insert", text="", icon='ICON_KEY_HLT') + row.operator("anim.keyframe_delete", text="", icon='ICON_KEY_DEHLT') else: row = layout.row(align=False) row.label(text="No Keying Set active") diff --git a/release/scripts/ui/space_time.py b/release/scripts/ui/space_time.py index de8d1eb96ab..938a365ed3a 100644 --- a/release/scripts/ui/space_time.py +++ b/release/scripts/ui/space_time.py @@ -78,8 +78,8 @@ class TIME_HT_header(bpy.types.Header): row = layout.row(align=True) row.prop_object(scene, "active_keying_set", scene, "keying_sets", text="") - row.operator("anim.insert_keyframe", text="", icon='ICON_KEY_HLT') - row.operator("anim.delete_keyframe", text="", icon='ICON_KEY_DEHLT') + row.operator("anim.keyframe_insert", text="", icon='ICON_KEY_HLT') + row.operator("anim.keyframe_delete", text="", icon='ICON_KEY_DEHLT') class TIME_MT_view(bpy.types.Menu): diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index 03bb635d5b0..de186f4b8a7 100644 --- a/release/scripts/ui/space_view3d.py +++ b/release/scripts/ui/space_view3d.py @@ -580,8 +580,8 @@ class VIEW3D_MT_object(bpy.types.Menu): layout.separator() - layout.operator("anim.insert_keyframe_menu", text="Insert Keyframe...") - layout.operator("anim.delete_keyframe_v3d", text="Delete Keyframe...") + layout.operator("anim.keyframe_insert_menu", text="Insert Keyframe...") + layout.operator("anim.keyframe_delete_v3d", text="Delete Keyframe...") layout.separator() @@ -873,8 +873,8 @@ class VIEW3D_MT_pose(bpy.types.Menu): layout.separator() - layout.operator("anim.insert_keyframe_menu", text="Insert Keyframe...") - layout.operator("anim.delete_keyframe_v3d", text="Delete Keyframe...") + layout.operator("anim.keyframe_insert_menu", text="Insert Keyframe...") + layout.operator("anim.keyframe_delete_v3d", text="Delete Keyframe...") layout.separator() diff --git a/release/scripts/ui/space_view3d_toolbar.py b/release/scripts/ui/space_view3d_toolbar.py index 012a4a18fdd..533ff496c08 100644 --- a/release/scripts/ui/space_view3d_toolbar.py +++ b/release/scripts/ui/space_view3d_toolbar.py @@ -57,8 +57,8 @@ class VIEW3D_PT_tools_objectmode(View3DPanel): col = layout.column(align=True) col.label(text="Keyframes:") - col.operator("anim.insert_keyframe_menu", text="Insert") - col.operator("anim.delete_keyframe_v3d", text="Remove") + col.operator("anim.keyframe_insert_menu", text="Insert") + col.operator("anim.keyframe_delete_v3d", text="Remove") col = layout.column(align=True) col.label(text="Repeat:") @@ -430,8 +430,8 @@ class VIEW3D_PT_tools_posemode(View3DPanel): col = layout.column(align=True) col.label(text="Keyframes:") - col.operator("anim.insert_keyframe_menu", text="Insert") - col.operator("anim.delete_keyframe_v3d", text="Remove") + col.operator("anim.keyframe_insert_menu", text="Insert") + col.operator("anim.keyframe_delete_v3d", text="Remove") col = layout.column(align=True) col.label(text="Repeat:") diff --git a/source/blender/editors/animation/anim_intern.h b/source/blender/editors/animation/anim_intern.h index 0101e3d0ef7..bc4f528d43f 100644 --- a/source/blender/editors/animation/anim_intern.h +++ b/source/blender/editors/animation/anim_intern.h @@ -45,25 +45,25 @@ short modifykey_get_context_data (bContext *C, ListBase *dsources, KeyingSet *ks * These handle keyframes management from various spaces. They only make use of * Keying Sets. */ -void ANIM_OT_insert_keyframe(struct wmOperatorType *ot); -void ANIM_OT_delete_keyframe(struct wmOperatorType *ot); +void ANIM_OT_keyframe_insert(struct wmOperatorType *ot); +void ANIM_OT_keyframe_delete(struct wmOperatorType *ot); /* Main Keyframe Management operators: * These handle keyframes management from various spaces. They will handle the menus * required for each space. */ -void ANIM_OT_insert_keyframe_menu(struct wmOperatorType *ot); -void ANIM_OT_delete_keyframe_v3d(struct wmOperatorType *ot); +void ANIM_OT_keyframe_insert_menu(struct wmOperatorType *ot); +void ANIM_OT_keyframe_delete_v3d(struct wmOperatorType *ot); /* Keyframe managment operators for UI buttons (RMB menu). */ -void ANIM_OT_insert_keyframe_button(struct wmOperatorType *ot); -void ANIM_OT_delete_keyframe_button(struct wmOperatorType *ot); +void ANIM_OT_keyframe_insert_button(struct wmOperatorType *ot); +void ANIM_OT_keyframe_delete_button(struct wmOperatorType *ot); /* .......... */ /* KeyingSet managment operators for UI buttons (RMB menu) */ -void ANIM_OT_add_keyingset_button(struct wmOperatorType *ot); -void ANIM_OT_remove_keyingset_button(struct wmOperatorType *ot); +void ANIM_OT_keyingset_button_add(struct wmOperatorType *ot); +void ANIM_OT_keyingset_button_remove(struct wmOperatorType *ot); /* KeyingSet management operators for RNA collections/UI buttons */ void ANIM_OT_keying_set_add(struct wmOperatorType *ot); @@ -74,8 +74,8 @@ void ANIM_OT_keying_set_path_remove(struct wmOperatorType *ot); /* .......... */ /* Driver management operators for UI buttons (RMB menu) */ -void ANIM_OT_add_driver_button(struct wmOperatorType *ot); -void ANIM_OT_remove_driver_button(struct wmOperatorType *ot); +void ANIM_OT_driver_button_add(struct wmOperatorType *ot); +void ANIM_OT_driver_button_remove(struct wmOperatorType *ot); void ANIM_OT_copy_driver_button(struct wmOperatorType *ot); void ANIM_OT_paste_driver_button(struct wmOperatorType *ot); diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c index 0f9b2939260..6c8a982b323 100644 --- a/source/blender/editors/animation/anim_ops.c +++ b/source/blender/editors/animation/anim_ops.c @@ -402,24 +402,24 @@ void ED_operatortypes_anim(void) WM_operatortype_append(ANIM_OT_previewrange_clear); /* Entire UI --------------------------------------- */ - WM_operatortype_append(ANIM_OT_insert_keyframe); - WM_operatortype_append(ANIM_OT_delete_keyframe); - WM_operatortype_append(ANIM_OT_insert_keyframe_menu); - WM_operatortype_append(ANIM_OT_delete_keyframe_v3d); - WM_operatortype_append(ANIM_OT_insert_keyframe_button); - WM_operatortype_append(ANIM_OT_delete_keyframe_button); + WM_operatortype_append(ANIM_OT_keyframe_insert); + WM_operatortype_append(ANIM_OT_keyframe_delete); + WM_operatortype_append(ANIM_OT_keyframe_insert_menu); + WM_operatortype_append(ANIM_OT_keyframe_delete_v3d); + WM_operatortype_append(ANIM_OT_keyframe_insert_button); + WM_operatortype_append(ANIM_OT_keyframe_delete_button); - WM_operatortype_append(ANIM_OT_add_driver_button); - WM_operatortype_append(ANIM_OT_remove_driver_button); + WM_operatortype_append(ANIM_OT_driver_button_add); + WM_operatortype_append(ANIM_OT_driver_button_remove); WM_operatortype_append(ANIM_OT_copy_driver_button); WM_operatortype_append(ANIM_OT_paste_driver_button); WM_operatortype_append(ANIM_OT_copy_clipboard_button); - WM_operatortype_append(ANIM_OT_add_keyingset_button); - WM_operatortype_append(ANIM_OT_remove_keyingset_button); + WM_operatortype_append(ANIM_OT_keyingset_button_add); + WM_operatortype_append(ANIM_OT_keyingset_button_remove); WM_operatortype_append(ANIM_OT_keying_set_add); WM_operatortype_append(ANIM_OT_keying_set_remove); diff --git a/source/blender/editors/animation/drivers.c b/source/blender/editors/animation/drivers.c index d7d3c21607f..bc7005b82c4 100644 --- a/source/blender/editors/animation/drivers.c +++ b/source/blender/editors/animation/drivers.c @@ -411,11 +411,11 @@ static int add_driver_button_exec (bContext *C, wmOperator *op) return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED; } -void ANIM_OT_add_driver_button (wmOperatorType *ot) +void ANIM_OT_driver_button_add (wmOperatorType *ot) { /* identifiers */ ot->name= "Add Driver"; - ot->idname= "ANIM_OT_add_driver_button"; + ot->idname= "ANIM_OT_driver_button_add"; ot->description= "Add driver(s) for the property(s) connected represented by the highlighted button."; /* callbacks */ @@ -475,11 +475,11 @@ static int remove_driver_button_exec (bContext *C, wmOperator *op) return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED; } -void ANIM_OT_remove_driver_button (wmOperatorType *ot) +void ANIM_OT_driver_button_remove (wmOperatorType *ot) { /* identifiers */ ot->name= "Remove Driver"; - ot->idname= "ANIM_OT_remove_driver_button"; + ot->idname= "ANIM_OT_driver_button_remove"; ot->description= "Remove the driver(s) for the property(s) connected represented by the highlighted button."; /* callbacks */ diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index e8d78d2ea8e..8628e2c506a 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -1029,11 +1029,11 @@ static int insert_key_exec (bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ANIM_OT_insert_keyframe (wmOperatorType *ot) +void ANIM_OT_keyframe_insert (wmOperatorType *ot) { /* identifiers */ ot->name= "Insert Keyframe"; - ot->idname= "ANIM_OT_insert_keyframe"; + ot->idname= "ANIM_OT_keyframe_insert"; ot->description= "Insert keyframes on the current frame for all properties in the specified Keying Set."; /* callbacks */ @@ -1073,7 +1073,7 @@ static void insert_key_menu_prompt (bContext *C) * - only include entry if it exists */ if (scene->active_keyingset) { - uiItemIntO(layout, "Active Keying Set", 0, "ANIM_OT_insert_keyframe_menu", "type", i++); + uiItemIntO(layout, "Active Keying Set", 0, "ANIM_OT_keyframe_insert_menu", "type", i++); uiItemS(layout); } else @@ -1084,7 +1084,7 @@ static void insert_key_menu_prompt (bContext *C) */ if (scene->keyingsets.first) { for (ks= scene->keyingsets.first; ks; ks= ks->next) - uiItemIntO(layout, ks->name, 0, "ANIM_OT_insert_keyframe_menu", "type", i++); + uiItemIntO(layout, ks->name, 0, "ANIM_OT_keyframe_insert_menu", "type", i++); uiItemS(layout); } @@ -1093,7 +1093,7 @@ static void insert_key_menu_prompt (bContext *C) for (ks= builtin_keyingsets.first; ks; ks= ks->next) { /* only show KeyingSet if context is suitable */ if (keyingset_context_ok_poll(C, ks)) { - uiItemIntO(layout, ks->name, 0, "ANIM_OT_insert_keyframe_menu", "type", i--); + uiItemIntO(layout, ks->name, 0, "ANIM_OT_keyframe_insert_menu", "type", i--); } } @@ -1119,11 +1119,11 @@ static int insert_key_menu_invoke (bContext *C, wmOperator *op, wmEvent *event) } } -void ANIM_OT_insert_keyframe_menu (wmOperatorType *ot) +void ANIM_OT_keyframe_insert_menu (wmOperatorType *ot) { /* identifiers */ ot->name= "Insert Keyframe Menu"; - ot->idname= "ANIM_OT_insert_keyframe_menu"; + ot->idname= "ANIM_OT_keyframe_insert_menu"; /* callbacks */ ot->invoke= insert_key_menu_invoke; @@ -1216,11 +1216,11 @@ static int delete_key_exec (bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ANIM_OT_delete_keyframe (wmOperatorType *ot) +void ANIM_OT_keyframe_delete (wmOperatorType *ot) { /* identifiers */ ot->name= "Delete Keyframe"; - ot->idname= "ANIM_OT_delete_keyframe"; + ot->idname= "ANIM_OT_keyframe_delete"; ot->description= "Delete keyframes on the current frame for all properties in the specified Keying Set."; /* callbacks */ @@ -1285,11 +1285,11 @@ static int delete_key_v3d_exec (bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ANIM_OT_delete_keyframe_v3d (wmOperatorType *ot) +void ANIM_OT_keyframe_delete_v3d (wmOperatorType *ot) { /* identifiers */ ot->name= "Delete Keyframe"; - ot->idname= "ANIM_OT_delete_keyframe_v3d"; + ot->idname= "ANIM_OT_keyframe_delete_v3d"; /* callbacks */ ot->invoke= WM_operator_confirm; @@ -1377,11 +1377,11 @@ static int insert_key_button_exec (bContext *C, wmOperator *op) return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED; } -void ANIM_OT_insert_keyframe_button (wmOperatorType *ot) +void ANIM_OT_keyframe_insert_button (wmOperatorType *ot) { /* identifiers */ ot->name= "Insert Keyframe (Buttons)"; - ot->idname= "ANIM_OT_insert_keyframe_button"; + ot->idname= "ANIM_OT_keyframe_insert_button"; /* callbacks */ ot->exec= insert_key_button_exec; @@ -1447,11 +1447,11 @@ static int delete_key_button_exec (bContext *C, wmOperator *op) return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED; } -void ANIM_OT_delete_keyframe_button (wmOperatorType *ot) +void ANIM_OT_keyframe_delete_button (wmOperatorType *ot) { /* identifiers */ ot->name= "Delete Keyframe (Buttons)"; - ot->idname= "ANIM_OT_delete_keyframe_button"; + ot->idname= "ANIM_OT_keyframe_delete_button"; /* callbacks */ ot->exec= delete_key_button_exec; diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index d39e52ab4f4..c3606a03d1e 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -376,11 +376,11 @@ static int add_keyingset_button_exec (bContext *C, wmOperator *op) return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED; } -void ANIM_OT_add_keyingset_button (wmOperatorType *ot) +void ANIM_OT_keyingset_button_add (wmOperatorType *ot) { /* identifiers */ ot->name= "Add to Keying Set"; - ot->idname= "ANIM_OT_add_keyingset_button"; + ot->idname= "ANIM_OT_keyingset_button_add"; /* callbacks */ ot->exec= add_keyingset_button_exec; @@ -454,11 +454,11 @@ static int remove_keyingset_button_exec (bContext *C, wmOperator *op) return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED; } -void ANIM_OT_remove_keyingset_button (wmOperatorType *ot) +void ANIM_OT_keyingset_button_remove (wmOperatorType *ot) { /* identifiers */ ot->name= "Remove from Keying Set"; - ot->idname= "ANIM_OT_remove_keyingset_button"; + ot->idname= "ANIM_OT_keyingset_button_remove"; /* callbacks */ ot->exec= remove_keyingset_button_exec; diff --git a/source/blender/editors/armature/armature_ops.c b/source/blender/editors/armature/armature_ops.c index 57eab530310..e3c823283d1 100644 --- a/source/blender/editors/armature/armature_ops.c +++ b/source/blender/editors/armature/armature_ops.c @@ -339,8 +339,8 @@ void ED_keymap_armature(wmKeyConfig *keyconf) RNA_enum_set(kmi->ptr, "mode", TFM_BONESIZE); // XXX this should probably be in screen instead... here for testing purposes in the meantime... - Aligorith - WM_keymap_verify_item(keymap, "ANIM_OT_insert_keyframe_menu", IKEY, KM_PRESS, 0, 0); - WM_keymap_verify_item(keymap, "ANIM_OT_delete_keyframe_v3d", IKEY, KM_PRESS, KM_ALT, 0); + WM_keymap_verify_item(keymap, "ANIM_OT_keyframe_insert_menu", IKEY, KM_PRESS, 0, 0); + WM_keymap_verify_item(keymap, "ANIM_OT_keyframe_delete_v3d", IKEY, KM_PRESS, KM_ALT, 0); /* Pose -> PoseLib ------------- */ /* only set in posemode, by space_view3d listener */ diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c index d2948852346..0925598cc99 100644 --- a/source/blender/editors/interface/interface_anim.c +++ b/source/blender/editors/interface/interface_anim.c @@ -189,25 +189,25 @@ void uiAnimContextProperty(const bContext *C, struct PointerRNA *ptr, struct Pro void ui_but_anim_insert_keyframe(bContext *C) { /* this operator calls uiAnimContextProperty above */ - WM_operator_name_call(C, "ANIM_OT_insert_keyframe_button", WM_OP_INVOKE_DEFAULT, NULL); + WM_operator_name_call(C, "ANIM_OT_keyframe_insert_button", WM_OP_INVOKE_DEFAULT, NULL); } void ui_but_anim_delete_keyframe(bContext *C) { /* this operator calls uiAnimContextProperty above */ - WM_operator_name_call(C, "ANIM_OT_delete_keyframe_button", WM_OP_INVOKE_DEFAULT, NULL); + WM_operator_name_call(C, "ANIM_OT_keyframe_delete_button", WM_OP_INVOKE_DEFAULT, NULL); } void ui_but_anim_add_driver(bContext *C) { /* this operator calls uiAnimContextProperty above */ - WM_operator_name_call(C, "ANIM_OT_add_driver_button", WM_OP_INVOKE_DEFAULT, NULL); + WM_operator_name_call(C, "ANIM_OT_driver_button_add", WM_OP_INVOKE_DEFAULT, NULL); } void ui_but_anim_remove_driver(bContext *C) { /* this operator calls uiAnimContextProperty above */ - WM_operator_name_call(C, "ANIM_OT_remove_driver_button", WM_OP_INVOKE_DEFAULT, NULL); + WM_operator_name_call(C, "ANIM_OT_driver_button_remove", WM_OP_INVOKE_DEFAULT, NULL); } void ui_but_anim_copy_driver(bContext *C) @@ -225,11 +225,11 @@ void ui_but_anim_paste_driver(bContext *C) void ui_but_anim_add_keyingset(bContext *C) { /* this operator calls uiAnimContextProperty above */ - WM_operator_name_call(C, "ANIM_OT_add_keyingset_button", WM_OP_INVOKE_DEFAULT, NULL); + WM_operator_name_call(C, "ANIM_OT_keyingset_button_add", WM_OP_INVOKE_DEFAULT, NULL); } void ui_but_anim_remove_keyingset(bContext *C) { /* this operator calls uiAnimContextProperty above */ - WM_operator_name_call(C, "ANIM_OT_remove_keyingset_button", WM_OP_INVOKE_DEFAULT, NULL); + WM_operator_name_call(C, "ANIM_OT_keyingset_button_remove", WM_OP_INVOKE_DEFAULT, NULL); } diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index fafa8047a00..fdd751a8fd8 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -3409,24 +3409,24 @@ static int ui_but_menu(bContext *C, uiBut *but) /* Keyframes */ if(but->flag & UI_BUT_ANIMATED_KEY) { if(length) { - uiItemBooleanO(layout, "Replace Keyframes", 0, "ANIM_OT_insert_keyframe_button", "all", 1); - uiItemBooleanO(layout, "Replace Single Keyframe", 0, "ANIM_OT_insert_keyframe_button", "all", 0); - uiItemBooleanO(layout, "Delete Keyframes", 0, "ANIM_OT_delete_keyframe_button", "all", 1); - uiItemBooleanO(layout, "Delete Single Keyframe", 0, "ANIM_OT_delete_keyframe_button", "all", 0); + uiItemBooleanO(layout, "Replace Keyframes", 0, "ANIM_OT_keyframe_insert_button", "all", 1); + uiItemBooleanO(layout, "Replace Single Keyframe", 0, "ANIM_OT_keyframe_insert_button", "all", 0); + uiItemBooleanO(layout, "Delete Keyframes", 0, "ANIM_OT_keyframe_delete_button", "all", 1); + uiItemBooleanO(layout, "Delete Single Keyframe", 0, "ANIM_OT_keyframe_delete_button", "all", 0); } else { - uiItemBooleanO(layout, "Replace Keyframe", 0, "ANIM_OT_insert_keyframe_button", "all", 0); - uiItemBooleanO(layout, "Delete Keyframe", 0, "ANIM_OT_delete_keyframe_button", "all", 0); + uiItemBooleanO(layout, "Replace Keyframe", 0, "ANIM_OT_keyframe_insert_button", "all", 0); + uiItemBooleanO(layout, "Delete Keyframe", 0, "ANIM_OT_keyframe_delete_button", "all", 0); } } else if(but->flag & UI_BUT_DRIVEN); else if(RNA_property_animateable(&but->rnapoin, but->rnaprop)) { if(length) { - uiItemBooleanO(layout, "Insert Keyframes", 0, "ANIM_OT_insert_keyframe_button", "all", 1); - uiItemBooleanO(layout, "Insert Single Keyframe", 0, "ANIM_OT_insert_keyframe_button", "all", 0); + uiItemBooleanO(layout, "Insert Keyframes", 0, "ANIM_OT_keyframe_insert_button", "all", 1); + uiItemBooleanO(layout, "Insert Single Keyframe", 0, "ANIM_OT_keyframe_insert_button", "all", 0); } else - uiItemBooleanO(layout, "Insert Keyframe", 0, "ANIM_OT_insert_keyframe_button", "all", 0); + uiItemBooleanO(layout, "Insert Keyframe", 0, "ANIM_OT_keyframe_insert_button", "all", 0); } /* Drivers */ @@ -3434,11 +3434,11 @@ static int ui_but_menu(bContext *C, uiBut *but) uiItemS(layout); if(length) { - uiItemBooleanO(layout, "Delete Drivers", 0, "ANIM_OT_remove_driver_button", "all", 1); - uiItemBooleanO(layout, "Delete Single Driver", 0, "ANIM_OT_remove_driver_button", "all", 0); + uiItemBooleanO(layout, "Delete Drivers", 0, "ANIM_OT_driver_button_remove", "all", 1); + uiItemBooleanO(layout, "Delete Single Driver", 0, "ANIM_OT_driver_button_remove", "all", 0); } else - uiItemBooleanO(layout, "Delete Driver", 0, "ANIM_OT_remove_driver_button", "all", 0); + uiItemBooleanO(layout, "Delete Driver", 0, "ANIM_OT_driver_button_remove", "all", 0); uiItemO(layout, "Copy Driver", 0, "ANIM_OT_copy_driver_button"); if (ANIM_driver_can_paste()) @@ -3449,11 +3449,11 @@ static int ui_but_menu(bContext *C, uiBut *but) uiItemS(layout); if(length) { - uiItemBooleanO(layout, "Add Drivers", 0, "ANIM_OT_add_driver_button", "all", 1); - uiItemBooleanO(layout, "Add Single Driver", 0, "ANIM_OT_add_driver_button", "all", 0); + uiItemBooleanO(layout, "Add Drivers", 0, "ANIM_OT_driver_button_add", "all", 1); + uiItemBooleanO(layout, "Add Single Driver", 0, "ANIM_OT_driver_button_add", "all", 0); } else - uiItemBooleanO(layout, "Add Driver", 0, "ANIM_OT_add_driver_button", "all", 0); + uiItemBooleanO(layout, "Add Driver", 0, "ANIM_OT_driver_button_add", "all", 0); if (ANIM_driver_can_paste()) uiItemO(layout, "Paste Driver", 0, "ANIM_OT_paste_driver_button"); @@ -3464,13 +3464,13 @@ static int ui_but_menu(bContext *C, uiBut *but) uiItemS(layout); if(length) { - uiItemBooleanO(layout, "Add All to Keying Set", 0, "ANIM_OT_add_keyingset_button", "all", 1); - uiItemBooleanO(layout, "Add Single to Keying Set", 0, "ANIM_OT_add_keyingset_button", "all", 0); - uiItemO(layout, "Remove from Keying Set", 0, "ANIM_OT_remove_keyingset_button"); + uiItemBooleanO(layout, "Add All to Keying Set", 0, "ANIM_OT_keyingset_button_add", "all", 1); + uiItemBooleanO(layout, "Add Single to Keying Set", 0, "ANIM_OT_keyingset_button_add", "all", 0); + uiItemO(layout, "Remove from Keying Set", 0, "ANIM_OT_keyingset_button_remove"); } else { - uiItemBooleanO(layout, "Add to Keying Set", 0, "ANIM_OT_add_keyingset_button", "all", 0); - uiItemO(layout, "Remove from Keying Set", 0, "ANIM_OT_remove_keyingset_button"); + uiItemBooleanO(layout, "Add to Keying Set", 0, "ANIM_OT_keyingset_button_add", "all", 0); + uiItemO(layout, "Remove from Keying Set", 0, "ANIM_OT_keyingset_button_remove"); } } diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index edcd15492e8..4dcecc92880 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -306,8 +306,8 @@ void ED_keymap_object(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "OBJECT_OT_make_local", LKEY, KM_PRESS, 0, 0); // XXX this should probably be in screen instead... here for testing purposes in the meantime... - Aligorith - WM_keymap_verify_item(keymap, "ANIM_OT_insert_keyframe_menu", IKEY, KM_PRESS, 0, 0); - WM_keymap_verify_item(keymap, "ANIM_OT_delete_keyframe_v3d", IKEY, KM_PRESS, KM_ALT, 0); + WM_keymap_verify_item(keymap, "ANIM_OT_keyframe_insert_menu", IKEY, KM_PRESS, 0, 0); + WM_keymap_verify_item(keymap, "ANIM_OT_keyframe_delete_v3d", IKEY, KM_PRESS, KM_ALT, 0); WM_keymap_verify_item(keymap, "GROUP_OT_create", GKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_verify_item(keymap, "GROUP_OT_objects_remove", GKEY, KM_PRESS, KM_CTRL|KM_ALT, 0); diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index d29280876d0..ce740a53db8 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -266,11 +266,11 @@ static int remove_particle_target_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void PARTICLE_OT_remove_target(wmOperatorType *ot) +void PARTICLE_OT_target_remove(wmOperatorType *ot) { /* identifiers */ ot->name= "Remove Particle Target"; - ot->idname= "PARTICLE_OT_remove_target"; + ot->idname= "PARTICLE_OT_target_remove"; ot->description="Remove the selected particle target."; /* api callbacks */ diff --git a/source/blender/editors/physics/physics_intern.h b/source/blender/editors/physics/physics_intern.h index e8169adc8dc..e7543cbb83e 100644 --- a/source/blender/editors/physics/physics_intern.h +++ b/source/blender/editors/physics/physics_intern.h @@ -68,7 +68,7 @@ void OBJECT_OT_particle_system_remove(struct wmOperatorType *ot); void PARTICLE_OT_new(struct wmOperatorType *ot); void PARTICLE_OT_new_target(struct wmOperatorType *ot); -void PARTICLE_OT_remove_target(struct wmOperatorType *ot); +void PARTICLE_OT_target_remove(struct wmOperatorType *ot); void PARTICLE_OT_target_move_up(struct wmOperatorType *ot); void PARTICLE_OT_target_move_down(struct wmOperatorType *ot); void PARTICLE_OT_connect_hair(struct wmOperatorType *ot); @@ -99,7 +99,7 @@ void PTCACHE_OT_free_bake_all(struct wmOperatorType *ot); void PTCACHE_OT_bake(struct wmOperatorType *ot); void PTCACHE_OT_free_bake(struct wmOperatorType *ot); void PTCACHE_OT_bake_from_cache(struct wmOperatorType *ot); -void PTCACHE_OT_add_new(struct wmOperatorType *ot); +void PTCACHE_OT_add(struct wmOperatorType *ot); void PTCACHE_OT_remove(struct wmOperatorType *ot); #endif /* ED_PHYSICS_INTERN_H */ diff --git a/source/blender/editors/physics/physics_ops.c b/source/blender/editors/physics/physics_ops.c index af269dc8ed0..b0d804da457 100644 --- a/source/blender/editors/physics/physics_ops.c +++ b/source/blender/editors/physics/physics_ops.c @@ -75,7 +75,7 @@ static void operatortypes_particle(void) WM_operatortype_append(PARTICLE_OT_new); WM_operatortype_append(PARTICLE_OT_new_target); - WM_operatortype_append(PARTICLE_OT_remove_target); + WM_operatortype_append(PARTICLE_OT_target_remove); WM_operatortype_append(PARTICLE_OT_target_move_up); WM_operatortype_append(PARTICLE_OT_target_move_down); WM_operatortype_append(PARTICLE_OT_connect_hair); @@ -149,7 +149,7 @@ static void operatortypes_pointcache(void) WM_operatortype_append(PTCACHE_OT_bake); WM_operatortype_append(PTCACHE_OT_free_bake); WM_operatortype_append(PTCACHE_OT_bake_from_cache); - WM_operatortype_append(PTCACHE_OT_add_new); + WM_operatortype_append(PTCACHE_OT_add); WM_operatortype_append(PTCACHE_OT_remove); } diff --git a/source/blender/editors/physics/physics_pointcache.c b/source/blender/editors/physics/physics_pointcache.c index 26099a18966..78728ae9eb0 100644 --- a/source/blender/editors/physics/physics_pointcache.c +++ b/source/blender/editors/physics/physics_pointcache.c @@ -308,11 +308,11 @@ static int ptcache_remove_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void PTCACHE_OT_add_new(wmOperatorType *ot) +void PTCACHE_OT_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add new cache"; - ot->idname= "PTCACHE_OT_add_new"; + ot->idname= "PTCACHE_OT_add"; /* api callbacks */ ot->exec= ptcache_add_new_exec; diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index a7c012fc654..1ba837afba3 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -123,11 +123,11 @@ static int act_new_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_new (wmOperatorType *ot) +void ACTION_OT_new (wmOperatorType *ot) { /* identifiers */ ot->name= "New"; - ot->idname= "ACT_OT_new"; + ot->idname= "ACTION_OT_new"; ot->description= "Create new action."; /* api callbacks */ @@ -224,11 +224,11 @@ static int actkeys_previewrange_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_previewrange_set (wmOperatorType *ot) +void ACTION_OT_previewrange_set (wmOperatorType *ot) { /* identifiers */ ot->name= "Auto-Set Preview Range"; - ot->idname= "ACT_OT_previewrange_set"; + ot->idname= "ACTION_OT_previewrange_set"; ot->description= "Set Preview Range based on extents of selected Keyframes."; /* api callbacks */ @@ -272,11 +272,11 @@ static int actkeys_viewall_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_view_all (wmOperatorType *ot) +void ACTION_OT_view_all (wmOperatorType *ot) { /* identifiers */ ot->name= "View All"; - ot->idname= "ACT_OT_view_all"; + ot->idname= "ACTION_OT_view_all"; ot->description= "Reset viewable area to show full keyframe range."; /* api callbacks */ @@ -357,11 +357,11 @@ static int actkeys_copy_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_copy (wmOperatorType *ot) +void ACTION_OT_copy (wmOperatorType *ot) { /* identifiers */ ot->name= "Copy Keyframes"; - ot->idname= "ACT_OT_copy"; + ot->idname= "ACTION_OT_copy"; ot->description= "Copy selected keyframes to the copy/paste buffer."; /* api callbacks */ @@ -402,11 +402,11 @@ static int actkeys_paste_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_paste (wmOperatorType *ot) +void ACTION_OT_paste (wmOperatorType *ot) { /* identifiers */ ot->name= "Paste Keyframes"; - ot->idname= "ACT_OT_paste"; + ot->idname= "ACTION_OT_paste"; ot->description= "Paste keyframes from copy/paste buffer for the selected channels, starting on the current frame."; /* api callbacks */ @@ -499,11 +499,11 @@ static int actkeys_insertkey_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_insert_keyframe (wmOperatorType *ot) +void ACT_OT_keyframe_insert (wmOperatorType *ot) { /* identifiers */ ot->name= "Insert Keyframes"; - ot->idname= "ACT_OT_insert_keyframe"; + ot->idname= "ACT_OT_keyframe_insert"; ot->description= "Insert keyframes for the specified channels."; /* api callbacks */ @@ -577,11 +577,11 @@ static int actkeys_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *event) return OPERATOR_FINISHED; } -void ACT_OT_duplicate (wmOperatorType *ot) +void ACTION_OT_duplicate (wmOperatorType *ot) { /* identifiers */ ot->name= "Duplicate Keyframes"; - ot->idname= "ACT_OT_duplicate"; + ot->idname= "ACTION_OT_duplicate"; ot->description= "Make a copy of all selected keyframes."; /* api callbacks */ @@ -645,11 +645,11 @@ static int actkeys_delete_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_delete (wmOperatorType *ot) +void ACTION_OT_delete (wmOperatorType *ot) { /* identifiers */ ot->name= "Delete Keyframes"; - ot->idname= "ACT_OT_delete"; + ot->idname= "ACTION_OT_delete"; ot->description= "Remove all selected keyframes."; /* api callbacks */ @@ -709,11 +709,11 @@ static int actkeys_clean_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_clean (wmOperatorType *ot) +void ACTION_OT_clean (wmOperatorType *ot) { /* identifiers */ ot->name= "Clean Keyframes"; - ot->idname= "ACT_OT_clean"; + ot->idname= "ACTION_OT_clean"; ot->description= "Simplify F-Curves by removing closely spaced keyframes."; /* api callbacks */ @@ -773,11 +773,11 @@ static int actkeys_sample_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_sample (wmOperatorType *ot) +void ACTION_OT_sample (wmOperatorType *ot) { /* identifiers */ ot->name= "Sample Keyframes"; - ot->idname= "ACT_OT_sample"; + ot->idname= "ACTION_OT_sample"; ot->description= "Add keyframes on every frame between the selected keyframes."; /* api callbacks */ @@ -849,11 +849,11 @@ static int actkeys_expo_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_extrapolation_type (wmOperatorType *ot) +void ACTION_OT_extrapolation_type (wmOperatorType *ot) { /* identifiers */ ot->name= "Set Keyframe Extrapolation"; - ot->idname= "ACT_OT_extrapolation_type"; + ot->idname= "ACTION_OT_extrapolation_type"; ot->description= "Set extrapolation mode for selected F-Curves."; /* api callbacks */ @@ -920,11 +920,11 @@ static int actkeys_ipo_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_interpolation_type (wmOperatorType *ot) +void ACTION_OT_interpolation_type (wmOperatorType *ot) { /* identifiers */ ot->name= "Set Keyframe Interpolation"; - ot->idname= "ACT_OT_interpolation_type"; + ot->idname= "ACTION_OT_interpolation_type"; ot->description= "Set interpolation mode for the F-Curve segments starting from the selected keyframes."; /* api callbacks */ @@ -1009,11 +1009,11 @@ static int actkeys_handletype_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_handle_type (wmOperatorType *ot) +void ACTION_OT_handle_type (wmOperatorType *ot) { /* identifiers */ ot->name= "Set Keyframe Handle Type"; - ot->idname= "ACT_OT_handle_type"; + ot->idname= "ACTION_OT_handle_type"; ot->description= "Set type of handle for selected keyframes."; /* api callbacks */ @@ -1080,11 +1080,11 @@ static int actkeys_keytype_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_keyframe_type (wmOperatorType *ot) +void ACTION_OT_keyframe_type (wmOperatorType *ot) { /* identifiers */ ot->name= "Set Keyframe Type"; - ot->idname= "ACT_OT_keyframe_type"; + ot->idname= "ACTION_OT_keyframe_type"; ot->description= "Set type of keyframe for the seleced keyframes."; /* api callbacks */ @@ -1150,11 +1150,11 @@ static int actkeys_framejump_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_frame_jump (wmOperatorType *ot) +void ACTION_OT_frame_jump (wmOperatorType *ot) { /* identifiers */ ot->name= "Jump to Frame"; - ot->idname= "ACT_OT_frame_jump"; + ot->idname= "ACTION_OT_frame_jump"; ot->description= "Set the current frame to the average frame of the selected keyframes."; /* api callbacks */ @@ -1246,11 +1246,11 @@ static int actkeys_snap_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_snap (wmOperatorType *ot) +void ACTION_OT_snap (wmOperatorType *ot) { /* identifiers */ ot->name= "Snap Keys"; - ot->idname= "ACT_OT_snap"; + ot->idname= "ACTION_OT_snap"; ot->description= "Snap selected keyframes to the times specified."; /* api callbacks */ @@ -1363,11 +1363,11 @@ static int actkeys_mirror_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_mirror (wmOperatorType *ot) +void ACTION_OT_mirror (wmOperatorType *ot) { /* identifiers */ ot->name= "Mirror Keys"; - ot->idname= "ACT_OT_mirror"; + ot->idname= "ACTION_OT_mirror"; ot->description= "Flip selected keyframes over the selected mirror line."; /* api callbacks */ diff --git a/source/blender/editors/space_action/action_header.c b/source/blender/editors/space_action/action_header.c index 6ec106077f7..d2dbb5fe3b0 100644 --- a/source/blender/editors/space_action/action_header.c +++ b/source/blender/editors/space_action/action_header.c @@ -86,7 +86,7 @@ static void act_viewmenu(bContext *C, uiLayout *layout, void *arg_unused) RNA_pointer_create(&sc->id, &RNA_SpaceDopeSheetEditor, sact, &spaceptr); /* create menu */ - //uiItemO(layout, NULL, ICON_MENU_PANEL, "ACT_OT_properties"); + //uiItemO(layout, NULL, ICON_MENU_PANEL, "ACTION_OT_properties"); //uiItemS(layout); @@ -104,13 +104,13 @@ static void act_viewmenu(bContext *C, uiLayout *layout, void *arg_unused) uiItemO(layout, NULL, 0, "ANIM_OT_previewrange_set"); uiItemO(layout, NULL, 0, "ANIM_OT_previewrange_clear"); - uiItemO(layout, NULL, 0, "ACT_OT_previewrange_set"); + uiItemO(layout, NULL, 0, "ACTION_OT_previewrange_set"); uiItemS(layout); - uiItemO(layout, NULL, 0, "ACT_OT_frame_jump"); + uiItemO(layout, NULL, 0, "ACTION_OT_frame_jump"); - uiItemO(layout, NULL, 0, "ACT_OT_view_all"); + uiItemO(layout, NULL, 0, "ACTION_OT_view_all"); if (sa->full) uiItemO(layout, NULL, 0, "SCREEN_OT_screen_full_area"); // "Tile Window", Ctrl UpArrow @@ -120,21 +120,21 @@ static void act_viewmenu(bContext *C, uiLayout *layout, void *arg_unused) static void act_selectmenu(bContext *C, uiLayout *layout, void *arg_unused) { - uiItemO(layout, NULL, 0, "ACT_OT_select_all_toggle"); - uiItemBooleanO(layout, "Invert All", 0, "ACT_OT_select_all_toggle", "invert", 1); + uiItemO(layout, NULL, 0, "ACTION_OT_select_all_toggle"); + uiItemBooleanO(layout, "Invert All", 0, "ACTION_OT_select_all_toggle", "invert", 1); uiItemS(layout); - uiItemO(layout, NULL, 0, "ACT_OT_select_border"); - uiItemBooleanO(layout, "Border Axis Range", 0, "ACT_OT_select_border", "axis_range", 1); + uiItemO(layout, NULL, 0, "ACTION_OT_select_border"); + uiItemBooleanO(layout, "Border Axis Range", 0, "ACTION_OT_select_border", "axis_range", 1); uiItemS(layout); - uiItemEnumO(layout, "Columns on Selected Keys", 0, "ACT_OT_select_column", "mode", ACTKEYS_COLUMNSEL_KEYS); - uiItemEnumO(layout, "Column on Current Frame", 0, "ACT_OT_select_column", "mode", ACTKEYS_COLUMNSEL_CFRA); + uiItemEnumO(layout, "Columns on Selected Keys", 0, "ACTION_OT_select_column", "mode", ACTKEYS_COLUMNSEL_KEYS); + uiItemEnumO(layout, "Column on Current Frame", 0, "ACTION_OT_select_column", "mode", ACTKEYS_COLUMNSEL_CFRA); - uiItemEnumO(layout, "Columns on Selected Markers", 0, "ACT_OT_select_column", "mode", ACTKEYS_COLUMNSEL_MARKERS_COLUMN); - uiItemEnumO(layout, "Between Selected Markers", 0, "ACT_OT_select_column", "mode", ACTKEYS_COLUMNSEL_MARKERS_BETWEEN); + uiItemEnumO(layout, "Columns on Selected Markers", 0, "ACTION_OT_select_column", "mode", ACTKEYS_COLUMNSEL_MARKERS_COLUMN); + uiItemEnumO(layout, "Between Selected Markers", 0, "ACTION_OT_select_column", "mode", ACTKEYS_COLUMNSEL_MARKERS_BETWEEN); } static void act_channelmenu(bContext *C, uiLayout *layout, void *arg_unused) @@ -170,34 +170,34 @@ static void act_edit_transformmenu(bContext *C, uiLayout *layout, void *arg_unus static void act_editmenu(bContext *C, uiLayout *layout, void *arg_unused) { uiItemMenuF(layout, "Transform", 0, act_edit_transformmenu, NULL); - uiItemMenuEnumO(layout, "Snap", 0, "ACT_OT_snap", "type"); - uiItemMenuEnumO(layout, "Mirror", 0, "ACT_OT_mirror", "type"); + uiItemMenuEnumO(layout, "Snap", 0, "ACTION_OT_snap", "type"); + uiItemMenuEnumO(layout, "Mirror", 0, "ACTION_OT_mirror", "type"); uiItemS(layout); - uiItemO(layout, NULL, 0, "ACT_OT_insert_keyframe"); + uiItemO(layout, NULL, 0, "ACT_OT_keyframe_insert"); uiItemS(layout); - uiItemO(layout, NULL, 0, "ACT_OT_duplicate"); - uiItemO(layout, NULL, 0, "ACT_OT_delete"); + uiItemO(layout, NULL, 0, "ACTION_OT_duplicate"); + uiItemO(layout, NULL, 0, "ACTION_OT_delete"); uiItemS(layout); - uiItemMenuEnumO(layout, "Keyframe Type", 0, "ACT_OT_keyframe_type", "type"); - uiItemMenuEnumO(layout, "Handle Type", 0, "ACT_OT_handle_type", "type"); - uiItemMenuEnumO(layout, "Interpolation Type", 0, "ACT_OT_interpolation_type", "type"); - uiItemMenuEnumO(layout, "Extrapolation Type", 0, "ACT_OT_extrapolation_type", "type"); + uiItemMenuEnumO(layout, "Keyframe Type", 0, "ACTION_OT_keyframe_type", "type"); + uiItemMenuEnumO(layout, "Handle Type", 0, "ACTION_OT_handle_type", "type"); + uiItemMenuEnumO(layout, "Interpolation Type", 0, "ACTION_OT_interpolation_type", "type"); + uiItemMenuEnumO(layout, "Extrapolation Type", 0, "ACTION_OT_extrapolation_type", "type"); uiItemS(layout); - uiItemO(layout, NULL, 0, "ACT_OT_clean"); - uiItemO(layout, NULL, 0, "ACT_OT_sample"); + uiItemO(layout, NULL, 0, "ACTION_OT_clean"); + uiItemO(layout, NULL, 0, "ACTION_OT_sample"); uiItemS(layout); - uiItemO(layout, NULL, 0, "ACT_OT_copy"); - uiItemO(layout, NULL, 0, "ACT_OT_paste"); + uiItemO(layout, NULL, 0, "ACTION_OT_copy"); + uiItemO(layout, NULL, 0, "ACTION_OT_paste"); } /* ************************ header area region *********************** */ @@ -305,7 +305,7 @@ void action_header_buttons(const bContext *C, ARegion *ar) RNA_pointer_create(&sc->id, &RNA_SpaceDopeSheetEditor, saction, &ptr); layout= uiBlockLayout(block, UI_LAYOUT_HORIZONTAL, UI_LAYOUT_HEADER, xco, 20+3, 20, 1, U.uistyles.first); - uiTemplateID(layout, (bContext*)C, &ptr, "action", "ACT_OT_new", NULL, NULL); + uiTemplateID(layout, (bContext*)C, &ptr, "action", "ACTION_OT_new", NULL, NULL); uiBlockLayoutResolve(block, &xco, NULL); xco += 8; @@ -331,9 +331,9 @@ void action_header_buttons(const bContext *C, ARegion *ar) /* COPY PASTE */ uiBlockBeginAlign(block); - uiDefIconButO(block, BUT, "ACT_OT_copy", WM_OP_INVOKE_REGION_WIN, ICON_COPYDOWN, xco,yco,XIC,YIC, "Copies the selected keyframes to the buffer."); + uiDefIconButO(block, BUT, "ACTION_OT_copy", WM_OP_INVOKE_REGION_WIN, ICON_COPYDOWN, xco,yco,XIC,YIC, "Copies the selected keyframes to the buffer."); xco += XIC; - uiDefIconButO(block, BUT, "ACT_OT_paste", WM_OP_INVOKE_REGION_WIN, ICON_PASTEDOWN, xco,yco,XIC,YIC, "Pastes the keyframes from the buffer into the selected channels."); + uiDefIconButO(block, BUT, "ACTION_OT_paste", WM_OP_INVOKE_REGION_WIN, ICON_PASTEDOWN, xco,yco,XIC,YIC, "Pastes the keyframes from the buffer into the selected channels."); uiBlockEndAlign(block); xco += (XIC + 8); } diff --git a/source/blender/editors/space_action/action_intern.h b/source/blender/editors/space_action/action_intern.h index c436475b537..e45b2d05fac 100644 --- a/source/blender/editors/space_action/action_intern.h +++ b/source/blender/editors/space_action/action_intern.h @@ -53,10 +53,10 @@ void action_header_buttons(const struct bContext *C, struct ARegion *ar); /* ***************************************** */ /* action_select.c */ -void ACT_OT_select_all_toggle(struct wmOperatorType *ot); -void ACT_OT_select_border(struct wmOperatorType *ot); -void ACT_OT_select_column(struct wmOperatorType *ot); -void ACT_OT_clickselect(struct wmOperatorType *ot); +void ACTION_OT_select_all_toggle(struct wmOperatorType *ot); +void ACTION_OT_select_border(struct wmOperatorType *ot); +void ACTION_OT_select_column(struct wmOperatorType *ot); +void ACTION_OT_clickselect(struct wmOperatorType *ot); /* defines for left-right select tool */ enum { @@ -77,29 +77,29 @@ enum { /* ***************************************** */ /* action_edit.c */ -void ACT_OT_previewrange_set(struct wmOperatorType *ot); -void ACT_OT_view_all(struct wmOperatorType *ot); +void ACTION_OT_previewrange_set(struct wmOperatorType *ot); +void ACTION_OT_view_all(struct wmOperatorType *ot); -void ACT_OT_copy(struct wmOperatorType *ot); -void ACT_OT_paste(struct wmOperatorType *ot); +void ACTION_OT_copy(struct wmOperatorType *ot); +void ACTION_OT_paste(struct wmOperatorType *ot); -void ACT_OT_insert_keyframe(struct wmOperatorType *ot); -void ACT_OT_duplicate(struct wmOperatorType *ot); -void ACT_OT_delete(struct wmOperatorType *ot); -void ACT_OT_clean(struct wmOperatorType *ot); -void ACT_OT_sample(struct wmOperatorType *ot); +void ACT_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); +void ACTION_OT_sample(struct wmOperatorType *ot); -void ACT_OT_keyframe_type(struct wmOperatorType *ot); -void ACT_OT_handle_type(struct wmOperatorType *ot); -void ACT_OT_interpolation_type(struct wmOperatorType *ot); -void ACT_OT_extrapolation_type(struct wmOperatorType *ot); +void ACTION_OT_keyframe_type(struct wmOperatorType *ot); +void ACTION_OT_handle_type(struct wmOperatorType *ot); +void ACTION_OT_interpolation_type(struct wmOperatorType *ot); +void ACTION_OT_extrapolation_type(struct wmOperatorType *ot); -void ACT_OT_frame_jump(struct wmOperatorType *ot); +void ACTION_OT_frame_jump(struct wmOperatorType *ot); -void ACT_OT_snap(struct wmOperatorType *ot); -void ACT_OT_mirror(struct wmOperatorType *ot); +void ACTION_OT_snap(struct wmOperatorType *ot); +void ACTION_OT_mirror(struct wmOperatorType *ot); -void ACT_OT_new(struct wmOperatorType *ot); +void ACTION_OT_new(struct wmOperatorType *ot); /* defines for snap keyframes * NOTE: keep in sync with eEditKeyframes_Snap (in ED_keyframes_edit.h) diff --git a/source/blender/editors/space_action/action_ops.c b/source/blender/editors/space_action/action_ops.c index ba504fa8a69..b4c9fee8469 100644 --- a/source/blender/editors/space_action/action_ops.c +++ b/source/blender/editors/space_action/action_ops.c @@ -63,30 +63,30 @@ void action_operatortypes(void) { /* keyframes */ /* selection */ - WM_operatortype_append(ACT_OT_clickselect); - WM_operatortype_append(ACT_OT_select_all_toggle); - WM_operatortype_append(ACT_OT_select_border); - WM_operatortype_append(ACT_OT_select_column); + WM_operatortype_append(ACTION_OT_clickselect); + WM_operatortype_append(ACTION_OT_select_all_toggle); + WM_operatortype_append(ACTION_OT_select_border); + WM_operatortype_append(ACTION_OT_select_column); /* editing */ - WM_operatortype_append(ACT_OT_snap); - WM_operatortype_append(ACT_OT_mirror); - WM_operatortype_append(ACT_OT_frame_jump); - WM_operatortype_append(ACT_OT_handle_type); - WM_operatortype_append(ACT_OT_interpolation_type); - WM_operatortype_append(ACT_OT_extrapolation_type); - WM_operatortype_append(ACT_OT_keyframe_type); - WM_operatortype_append(ACT_OT_sample); - WM_operatortype_append(ACT_OT_clean); - WM_operatortype_append(ACT_OT_delete); - WM_operatortype_append(ACT_OT_duplicate); - WM_operatortype_append(ACT_OT_insert_keyframe); - WM_operatortype_append(ACT_OT_copy); - WM_operatortype_append(ACT_OT_paste); - WM_operatortype_append(ACT_OT_new); - - WM_operatortype_append(ACT_OT_previewrange_set); - WM_operatortype_append(ACT_OT_view_all); + WM_operatortype_append(ACTION_OT_snap); + WM_operatortype_append(ACTION_OT_mirror); + WM_operatortype_append(ACTION_OT_frame_jump); + WM_operatortype_append(ACTION_OT_handle_type); + WM_operatortype_append(ACTION_OT_interpolation_type); + WM_operatortype_append(ACTION_OT_extrapolation_type); + WM_operatortype_append(ACTION_OT_keyframe_type); + WM_operatortype_append(ACTION_OT_sample); + 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_copy); + WM_operatortype_append(ACTION_OT_paste); + WM_operatortype_append(ACTION_OT_new); + + WM_operatortype_append(ACTION_OT_previewrange_set); + WM_operatortype_append(ACTION_OT_view_all); } /* ************************** registration - keymaps **********************************/ @@ -97,69 +97,69 @@ static void action_keymap_keyframes (wmKeyConfig *keyconf, wmKeyMap *keymap) /* action_select.c - selection tools */ /* click-select */ - WM_keymap_add_item(keymap, "ACT_OT_clickselect", SELECTMOUSE, KM_PRESS, 0, 0); - kmi= WM_keymap_add_item(keymap, "ACT_OT_clickselect", SELECTMOUSE, KM_PRESS, KM_ALT, 0); + WM_keymap_add_item(keymap, "ACTION_OT_clickselect", SELECTMOUSE, KM_PRESS, 0, 0); + kmi= WM_keymap_add_item(keymap, "ACTION_OT_clickselect", SELECTMOUSE, KM_PRESS, KM_ALT, 0); RNA_boolean_set(kmi->ptr, "column", 1); - kmi= WM_keymap_add_item(keymap, "ACT_OT_clickselect", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0); + kmi= WM_keymap_add_item(keymap, "ACTION_OT_clickselect", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0); RNA_boolean_set(kmi->ptr, "extend", 1); - kmi= WM_keymap_add_item(keymap, "ACT_OT_clickselect", SELECTMOUSE, KM_PRESS, KM_ALT|KM_SHIFT, 0); + kmi= WM_keymap_add_item(keymap, "ACTION_OT_clickselect", SELECTMOUSE, KM_PRESS, KM_ALT|KM_SHIFT, 0); RNA_boolean_set(kmi->ptr, "extend", 1); RNA_boolean_set(kmi->ptr, "column", 1); - kmi= WM_keymap_add_item(keymap, "ACT_OT_clickselect", SELECTMOUSE, KM_PRESS, KM_CTRL, 0); + kmi= WM_keymap_add_item(keymap, "ACTION_OT_clickselect", SELECTMOUSE, KM_PRESS, KM_CTRL, 0); RNA_enum_set(kmi->ptr, "left_right", ACTKEYS_LRSEL_TEST); /* deselect all */ - WM_keymap_add_item(keymap, "ACT_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "ACT_OT_select_all_toggle", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "invert", 1); + WM_keymap_add_item(keymap, "ACTION_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0); + RNA_boolean_set(WM_keymap_add_item(keymap, "ACTION_OT_select_all_toggle", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "invert", 1); /* borderselect */ - WM_keymap_add_item(keymap, "ACT_OT_select_border", BKEY, KM_PRESS, 0, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "ACT_OT_select_border", BKEY, KM_PRESS, KM_ALT, 0)->ptr, "axis_range", 1); + WM_keymap_add_item(keymap, "ACTION_OT_select_border", BKEY, KM_PRESS, 0, 0); + RNA_boolean_set(WM_keymap_add_item(keymap, "ACTION_OT_select_border", BKEY, KM_PRESS, KM_ALT, 0)->ptr, "axis_range", 1); /* column select */ - RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_select_column", KKEY, KM_PRESS, 0, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_KEYS); - RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_select_column", KKEY, KM_PRESS, KM_CTRL, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_CFRA); - RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_select_column", KKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_MARKERS_COLUMN); - RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_select_column", KKEY, KM_PRESS, KM_ALT, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_MARKERS_BETWEEN); + RNA_enum_set(WM_keymap_add_item(keymap, "ACTION_OT_select_column", KKEY, KM_PRESS, 0, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_KEYS); + RNA_enum_set(WM_keymap_add_item(keymap, "ACTION_OT_select_column", KKEY, KM_PRESS, KM_CTRL, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_CFRA); + RNA_enum_set(WM_keymap_add_item(keymap, "ACTION_OT_select_column", KKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_MARKERS_COLUMN); + RNA_enum_set(WM_keymap_add_item(keymap, "ACTION_OT_select_column", KKEY, KM_PRESS, KM_ALT, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_MARKERS_BETWEEN); /* action_edit.c */ /* snap - current frame to selected keys */ // TODO: maybe since this is called jump, we're better to have it on -J? - WM_keymap_add_item(keymap, "ACT_OT_frame_jump", SKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0); + WM_keymap_add_item(keymap, "ACTION_OT_frame_jump", SKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0); /* menu + single-step transform */ - WM_keymap_add_item(keymap, "ACT_OT_snap", SKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "ACT_OT_mirror", MKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "ACTION_OT_snap", SKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "ACTION_OT_mirror", MKEY, KM_PRESS, KM_SHIFT, 0); /* menu + set setting */ - WM_keymap_add_item(keymap, "ACT_OT_handle_type", HKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "ACT_OT_interpolation_type", TKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "ACT_OT_extrapolation_type", EKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "ACT_OT_keyframe_type", RKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "ACTION_OT_handle_type", HKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "ACTION_OT_interpolation_type", TKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "ACTION_OT_extrapolation_type", EKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "ACTION_OT_keyframe_type", RKEY, KM_PRESS, 0, 0); /* destructive */ - WM_keymap_add_item(keymap, "ACT_OT_clean", OKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "ACT_OT_sample", OKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "ACTION_OT_clean", OKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "ACTION_OT_sample", OKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "ACT_OT_delete", XKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "ACT_OT_delete", DELKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "ACTION_OT_delete", XKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "ACTION_OT_delete", DELKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "ACT_OT_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "ACT_OT_insert_keyframe", IKEY, 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); /* copy/paste */ - WM_keymap_add_item(keymap, "ACT_OT_copy", CKEY, KM_PRESS, KM_CTRL, 0); - WM_keymap_add_item(keymap, "ACT_OT_paste", VKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "ACTION_OT_copy", CKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "ACTION_OT_paste", VKEY, KM_PRESS, KM_CTRL, 0); /* auto-set range */ - WM_keymap_add_item(keymap, "ACT_OT_previewrange_set", PKEY, KM_PRESS, KM_CTRL|KM_ALT, 0); - WM_keymap_add_item(keymap, "ACT_OT_view_all", HOMEKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "ACTION_OT_previewrange_set", PKEY, KM_PRESS, KM_CTRL|KM_ALT, 0); + WM_keymap_add_item(keymap, "ACTION_OT_view_all", HOMEKEY, KM_PRESS, 0, 0); /* transform system */ transform_keymap_for_space(keyconf, keymap, SPACE_ACTION); /* test */ - /* WM_keymap_add_item(keymap, "ACT_OT_test", QKEY, KM_PRESS, 0, 0); */ + /* WM_keymap_add_item(keymap, "ACTION_OT_test", QKEY, KM_PRESS, 0, 0); */ } /* --------------- */ diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index c4f2e40e958..8eeed6da100 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -181,11 +181,11 @@ static int actkeys_deselectall_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_select_all_toggle (wmOperatorType *ot) +void ACTION_OT_select_all_toggle (wmOperatorType *ot) { /* identifiers */ ot->name= "Select All"; - ot->idname= "ACT_OT_select_all_toggle"; + ot->idname= "ACTION_OT_select_all_toggle"; ot->description= "Toggle selection of all keyframes."; /* api callbacks */ @@ -342,11 +342,11 @@ static int actkeys_borderselect_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_select_border(wmOperatorType *ot) +void ACTION_OT_select_border(wmOperatorType *ot) { /* identifiers */ ot->name= "Border Select"; - ot->idname= "ACT_OT_select_border"; + ot->idname= "ACTION_OT_select_border"; ot->description= "Select all keyframes within the specified region."; /* api callbacks */ @@ -556,11 +556,11 @@ static int actkeys_columnselect_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ACT_OT_select_column (wmOperatorType *ot) +void ACTION_OT_select_column (wmOperatorType *ot) { /* identifiers */ ot->name= "Select All"; - ot->idname= "ACT_OT_select_column"; + ot->idname= "ACTION_OT_select_column"; ot->description= "Select all keyframes on the specified frame(s)."; /* api callbacks */ @@ -979,11 +979,11 @@ static int actkeys_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *even return OPERATOR_FINISHED|OPERATOR_PASS_THROUGH; } -void ACT_OT_clickselect (wmOperatorType *ot) +void ACTION_OT_clickselect (wmOperatorType *ot) { /* identifiers */ ot->name= "Mouse Select Keys"; - ot->idname= "ACT_OT_clickselect"; + ot->idname= "ACTION_OT_clickselect"; ot->description= "Select keyframes by clicking on them."; /* api callbacks - absolutely no exec() this yet... */ diff --git a/source/blender/editors/space_file/file_intern.h b/source/blender/editors/space_file/file_intern.h index d07ffd4b964..fa99dc6e1ee 100644 --- a/source/blender/editors/space_file/file_intern.h +++ b/source/blender/editors/space_file/file_intern.h @@ -55,7 +55,7 @@ void FILE_OT_select(struct wmOperatorType *ot); void FILE_OT_select_all_toggle(struct wmOperatorType *ot); void FILE_OT_select_border(struct wmOperatorType *ot); void FILE_OT_select_bookmark(struct wmOperatorType *ot); -void FILE_OT_add_bookmark(struct wmOperatorType *ot); +void FILE_OT_bookmark_add(struct wmOperatorType *ot); void FILE_OT_delete_bookmark(struct wmOperatorType *ot); void FILE_OT_hidedot(struct wmOperatorType *ot); void FILE_OT_loadimages(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 7aa56158304..2d4185e871a 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -386,12 +386,12 @@ static int bookmark_add_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void FILE_OT_add_bookmark(wmOperatorType *ot) +void FILE_OT_bookmark_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add Bookmark"; ot->description= "Add a bookmark for the selected/active directory."; - ot->idname= "FILE_OT_add_bookmark"; + ot->idname= "FILE_OT_bookmark_add"; /* api callbacks */ ot->exec= bookmark_add_exec; diff --git a/source/blender/editors/space_file/file_panels.c b/source/blender/editors/space_file/file_panels.c index afdb0d24917..b6f37000afa 100644 --- a/source/blender/editors/space_file/file_panels.c +++ b/source/blender/editors/space_file/file_panels.c @@ -138,7 +138,7 @@ static void file_panel_bookmarks(const bContext *C, Panel *pa) if(sfile) { row= uiLayoutRow(pa->layout, 0); - uiItemO(row, "Add", ICON_ZOOMIN, "file.add_bookmark"); + uiItemO(row, "Add", ICON_ZOOMIN, "file.bookmark_add"); uiItemL(row, NULL, 0); file_panel_category(C, pa, FS_CATEGORY_BOOKMARKS, &sfile->bookmarknr, ICON_BOOKMARKS, 1, 0); diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c index cadb5767508..8bbdbbeb4fb 100644 --- a/source/blender/editors/space_file/space_file.c +++ b/source/blender/editors/space_file/space_file.c @@ -354,7 +354,7 @@ void file_operatortypes(void) WM_operatortype_append(FILE_OT_next); WM_operatortype_append(FILE_OT_refresh); WM_operatortype_append(FILE_OT_bookmark_toggle); - WM_operatortype_append(FILE_OT_add_bookmark); + WM_operatortype_append(FILE_OT_bookmark_add); WM_operatortype_append(FILE_OT_delete_bookmark); WM_operatortype_append(FILE_OT_hidedot); WM_operatortype_append(FILE_OT_filenum); @@ -371,7 +371,7 @@ void file_keymap(struct wmKeyConfig *keyconf) wmKeyMap *keymap= WM_keymap_find(keyconf, "File", SPACE_FILE, 0); WM_keymap_add_item(keymap, "FILE_OT_bookmark_toggle", NKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "FILE_OT_parent", PKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "FILE_OT_add_bookmark", BKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "FILE_OT_bookmark_add", BKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "FILE_OT_hidedot", HKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "FILE_OT_previous", BACKSPACEKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "FILE_OT_next", BACKSPACEKEY, KM_PRESS, KM_SHIFT, 0); diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index 2088ee4030c..381d5becb1e 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -481,11 +481,11 @@ static int graphkeys_insertkey_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void GRAPH_OT_insert_keyframe (wmOperatorType *ot) +void GRAPH_OT_keyframe_insert (wmOperatorType *ot) { /* identifiers */ ot->name= "Insert Keyframes"; - ot->idname= "GRAPH_OT_insert_keyframe"; + ot->idname= "GRAPH_OT_keyframe_insert"; ot->description= "Insert keyframes for the specified channels."; /* api callbacks */ diff --git a/source/blender/editors/space_graph/graph_header.c b/source/blender/editors/space_graph/graph_header.c index 63c95b18e2d..a5f9cb23555 100644 --- a/source/blender/editors/space_graph/graph_header.c +++ b/source/blender/editors/space_graph/graph_header.c @@ -167,7 +167,7 @@ static void graph_editmenu(bContext *C, uiLayout *layout, void *arg_unused) uiItemS(layout); - uiItemO(layout, NULL, 0, "GRAPH_OT_insert_keyframe"); + uiItemO(layout, NULL, 0, "GRAPH_OT_keyframe_insert"); uiItemO(layout, NULL, 0, "GRAPH_OT_fmodifier_add"); uiItemS(layout); diff --git a/source/blender/editors/space_graph/graph_intern.h b/source/blender/editors/space_graph/graph_intern.h index 1e0f66751f0..87e03247353 100644 --- a/source/blender/editors/space_graph/graph_intern.h +++ b/source/blender/editors/space_graph/graph_intern.h @@ -90,7 +90,7 @@ void GRAPH_OT_previewrange_set(struct wmOperatorType *ot); void GRAPH_OT_view_all(struct wmOperatorType *ot); void GRAPH_OT_click_insert(struct wmOperatorType *ot); -void GRAPH_OT_insert_keyframe(struct wmOperatorType *ot); +void GRAPH_OT_keyframe_insert(struct wmOperatorType *ot); void GRAPH_OT_copy(struct wmOperatorType *ot); void GRAPH_OT_paste(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c index 1780942a123..cddb1965964 100644 --- a/source/blender/editors/space_graph/graph_ops.c +++ b/source/blender/editors/space_graph/graph_ops.c @@ -255,7 +255,7 @@ void graphedit_operatortypes(void) WM_operatortype_append(GRAPH_OT_copy); WM_operatortype_append(GRAPH_OT_paste); - WM_operatortype_append(GRAPH_OT_insert_keyframe); + WM_operatortype_append(GRAPH_OT_keyframe_insert); WM_operatortype_append(GRAPH_OT_click_insert); /* F-Curve Modifiers */ @@ -337,7 +337,7 @@ static void graphedit_keymap_keyframes (wmKeyConfig *keyconf, wmKeyMap *keymap) WM_keymap_add_item(keymap, "GRAPH_OT_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0); /* insertkey */ - WM_keymap_add_item(keymap, "GRAPH_OT_insert_keyframe", IKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "GRAPH_OT_keyframe_insert", IKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "GRAPH_OT_click_insert", LEFTMOUSE, KM_PRESS, KM_CTRL, 0); /* copy/paste */ diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 205aff27be7..e8eca9de281 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -247,7 +247,7 @@ static void nla_panel_animdata (const bContext *C, Panel *pa) /* Active Action Properties ------------------------------------- */ /* action */ row= uiLayoutRow(layout, 1); - uiTemplateID(row, (bContext *)C, &adt_ptr, "action", "ACT_OT_new", NULL, NULL /*"ACT_OT_unlink"*/); // XXX: need to make these operators + uiTemplateID(row, (bContext *)C, &adt_ptr, "action", "ACTION_OT_new", NULL, NULL /*"ACTION_OT_unlink"*/); // XXX: need to make these operators /* extrapolation */ row= uiLayoutRow(layout, 1); diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index ab447dd974a..5f9d6b03efc 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -429,11 +429,11 @@ static int nlaedit_add_tracks_exec (bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void NLA_OT_add_tracks (wmOperatorType *ot) +void NLA_OT_tracks_add (wmOperatorType *ot) { /* identifiers */ ot->name= "Add Track(s)"; - ot->idname= "NLA_OT_add_tracks"; + ot->idname= "NLA_OT_tracks_add"; ot->description= "Add NLA-Tracks above/after the selected tracks."; /* api callbacks */ diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index 12e43465a29..0ae3a347872 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/source/blender/editors/space_nla/nla_edit.c @@ -259,7 +259,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, "NLA_OT_add_actionclip", "action", act->id.name); + uiItemStringO(layout, act->id.name+2, 0, "NLA_OT_actionclip_add", "action", act->id.name); uiItemS(layout); uiPupMenuEnd(C, pup); @@ -347,11 +347,11 @@ static int nlaedit_add_actionclip_exec (bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void NLA_OT_add_actionclip (wmOperatorType *ot) +void NLA_OT_actionclip_add (wmOperatorType *ot) { /* identifiers */ ot->name= "Add Action Strip"; - ot->idname= "NLA_OT_add_actionclip"; + ot->idname= "NLA_OT_actionclip_add"; ot->description= "Add an Action-Clip strip (i.e. an NLA Strip referencing an Action) to the active track."; /* api callbacks */ @@ -467,11 +467,11 @@ static int nlaedit_add_transition_exec (bContext *C, wmOperator *op) } } -void NLA_OT_add_transition (wmOperatorType *ot) +void NLA_OT_transition_add (wmOperatorType *ot) { /* identifiers */ ot->name= "Add Transition"; - ot->idname= "NLA_OT_add_transition"; + ot->idname= "NLA_OT_transition_add"; ot->description= "Add a transition strip between two adjacent selected strips."; /* api callbacks */ @@ -529,11 +529,11 @@ static int nlaedit_add_meta_exec (bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void NLA_OT_add_meta (wmOperatorType *ot) +void NLA_OT_meta_add (wmOperatorType *ot) { /* identifiers */ ot->name= "Add Meta-Strips"; - ot->idname= "NLA_OT_add_meta"; + ot->idname= "NLA_OT_meta_add"; ot->description= "Add new meta-strips incorporating the selected strips."; /* api callbacks */ @@ -581,11 +581,11 @@ static int nlaedit_remove_meta_exec (bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void NLA_OT_remove_meta (wmOperatorType *ot) +void NLA_OT_meta_remove (wmOperatorType *ot) { /* identifiers */ ot->name= "Remove Meta-Strips"; - ot->idname= "NLA_OT_remove_meta"; + ot->idname= "NLA_OT_meta_remove"; ot->description= "Separate out the strips held by the selected meta-strips."; /* api callbacks */ diff --git a/source/blender/editors/space_nla/nla_header.c b/source/blender/editors/space_nla/nla_header.c index 0c0deaf75ef..2624e7a9255 100644 --- a/source/blender/editors/space_nla/nla_header.c +++ b/source/blender/editors/space_nla/nla_header.c @@ -177,18 +177,18 @@ static void nla_editmenu(bContext *C, uiLayout *layout, void *arg_unused) static void nla_addmenu(bContext *C, uiLayout *layout, void *arg_unused) { - uiItemO(layout, NULL, 0, "NLA_OT_add_actionclip"); - uiItemO(layout, NULL, 0, "NLA_OT_add_transition"); + uiItemO(layout, NULL, 0, "NLA_OT_actionclip_add"); + uiItemO(layout, NULL, 0, "NLA_OT_transition_add"); uiItemS(layout); - uiItemO(layout, NULL, 0, "NLA_OT_add_meta"); - uiItemO(layout, NULL, 0, "NLA_OT_remove_meta"); + uiItemO(layout, NULL, 0, "NLA_OT_meta_add"); + uiItemO(layout, NULL, 0, "NLA_OT_meta_remove"); uiItemS(layout); - uiItemO(layout, NULL, 0, "NLA_OT_add_tracks"); - uiItemBooleanO(layout, "Add Tracks Above Selected", 0, "NLA_OT_add_tracks", "above_selected", 1); + uiItemO(layout, NULL, 0, "NLA_OT_tracks_add"); + uiItemBooleanO(layout, "Add Tracks Above Selected", 0, "NLA_OT_tracks_add", "above_selected", 1); } /* ------------------ */ diff --git a/source/blender/editors/space_nla/nla_intern.h b/source/blender/editors/space_nla/nla_intern.h index 91c1decc576..ca50452b442 100644 --- a/source/blender/editors/space_nla/nla_intern.h +++ b/source/blender/editors/space_nla/nla_intern.h @@ -88,11 +88,11 @@ void NLA_OT_tweakmode_exit(wmOperatorType *ot); /* --- */ -void NLA_OT_add_actionclip(wmOperatorType *ot); -void NLA_OT_add_transition(wmOperatorType *ot); +void NLA_OT_actionclip_add(wmOperatorType *ot); +void NLA_OT_transition_add(wmOperatorType *ot); -void NLA_OT_add_meta(wmOperatorType *ot); -void NLA_OT_remove_meta(wmOperatorType *ot); +void NLA_OT_meta_add(wmOperatorType *ot); +void NLA_OT_meta_remove(wmOperatorType *ot); void NLA_OT_duplicate(wmOperatorType *ot); void NLA_OT_delete(wmOperatorType *ot); @@ -116,7 +116,7 @@ void NLA_OT_fmodifier_add(wmOperatorType *ot); void NLA_OT_channels_click(wmOperatorType *ot); -void NLA_OT_add_tracks(wmOperatorType *ot); +void NLA_OT_tracks_add(wmOperatorType *ot); void NLA_OT_delete_tracks(wmOperatorType *ot); /* **************************************** */ diff --git a/source/blender/editors/space_nla/nla_ops.c b/source/blender/editors/space_nla/nla_ops.c index d210016d201..8f057c2d751 100644 --- a/source/blender/editors/space_nla/nla_ops.c +++ b/source/blender/editors/space_nla/nla_ops.c @@ -130,7 +130,7 @@ void nla_operatortypes(void) /* channels */ WM_operatortype_append(NLA_OT_channels_click); - WM_operatortype_append(NLA_OT_add_tracks); + WM_operatortype_append(NLA_OT_tracks_add); WM_operatortype_append(NLA_OT_delete_tracks); /* select */ @@ -142,11 +142,11 @@ void nla_operatortypes(void) WM_operatortype_append(NLA_OT_tweakmode_enter); WM_operatortype_append(NLA_OT_tweakmode_exit); - WM_operatortype_append(NLA_OT_add_actionclip); - WM_operatortype_append(NLA_OT_add_transition); + WM_operatortype_append(NLA_OT_actionclip_add); + WM_operatortype_append(NLA_OT_transition_add); - WM_operatortype_append(NLA_OT_add_meta); - WM_operatortype_append(NLA_OT_remove_meta); + WM_operatortype_append(NLA_OT_meta_add); + WM_operatortype_append(NLA_OT_meta_remove); WM_operatortype_append(NLA_OT_duplicate); WM_operatortype_append(NLA_OT_delete); @@ -178,8 +178,8 @@ static void nla_keymap_channels (wmKeyConfig *keyconf, wmKeyMap *keymap) /* channel operations */ /* add tracks */ - WM_keymap_add_item(keymap, "NLA_OT_add_tracks", AKEY, KM_PRESS, KM_SHIFT, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "NLA_OT_add_tracks", AKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "above_selected", 1); + WM_keymap_add_item(keymap, "NLA_OT_tracks_add", AKEY, KM_PRESS, KM_SHIFT, 0); + RNA_boolean_set(WM_keymap_add_item(keymap, "NLA_OT_tracks_add", AKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "above_selected", 1); /* delete tracks */ WM_keymap_add_item(keymap, "NLA_OT_delete_tracks", XKEY, KM_PRESS, 0, 0); @@ -240,12 +240,12 @@ static void nla_keymap_main (wmKeyConfig *keyconf, wmKeyMap *keymap) WM_keymap_add_item(keymap, "NLA_OT_tweakmode_exit", TABKEY, KM_PRESS, 0, 0); /* add strips */ - 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); + WM_keymap_add_item(keymap, "NLA_OT_actionclip_add", AKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "NLA_OT_transition_add", TKEY, KM_PRESS, KM_SHIFT, 0); /* meta-strips */ - WM_keymap_add_item(keymap, "NLA_OT_add_meta", GKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "NLA_OT_remove_meta", GKEY, KM_PRESS, KM_ALT, 0); + WM_keymap_add_item(keymap, "NLA_OT_meta_add", GKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "NLA_OT_meta_remove", GKEY, KM_PRESS, KM_ALT, 0); /* duplicate */ WM_keymap_add_item(keymap, "NLA_OT_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0); diff --git a/source/blender/editors/space_outliner/outliner_ops.c b/source/blender/editors/space_outliner/outliner_ops.c index 431801d50f2..434c7942714 100644 --- a/source/blender/editors/space_outliner/outliner_ops.c +++ b/source/blender/editors/space_outliner/outliner_ops.c @@ -107,8 +107,8 @@ void outliner_keymap(wmKeyConfig *keyconf) WM_keymap_verify_item(keymap, "OUTLINER_OT_keyingset_add_selected", KKEY, KM_PRESS, 0, 0); WM_keymap_verify_item(keymap, "OUTLINER_OT_keyingset_remove_selected", KKEY, KM_PRESS, KM_ALT, 0); - WM_keymap_verify_item(keymap, "ANIM_OT_insert_keyframe", IKEY, KM_PRESS, 0, 0); - WM_keymap_verify_item(keymap, "ANIM_OT_delete_keyframe", IKEY, KM_PRESS, KM_ALT, 0); + WM_keymap_verify_item(keymap, "ANIM_OT_keyframe_insert", IKEY, KM_PRESS, 0, 0); + WM_keymap_verify_item(keymap, "ANIM_OT_keyframe_delete", IKEY, KM_PRESS, KM_ALT, 0); WM_keymap_verify_item(keymap, "OUTLINER_OT_drivers_add_selected", DKEY, KM_PRESS, 0, 0); WM_keymap_verify_item(keymap, "OUTLINER_OT_drivers_delete_selected", DKEY, KM_PRESS, KM_ALT, 0); diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 1d6941f471d..2915cc64cf0 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2685,7 +2685,7 @@ static void gesture_border_modal_keymap(wmKeyConfig *keyconf) #endif /* assign map to operators */ - WM_modalkeymap_assign(keymap, "ACT_OT_select_border"); + WM_modalkeymap_assign(keymap, "ACTION_OT_select_border"); WM_modalkeymap_assign(keymap, "ANIM_OT_channels_select_border"); WM_modalkeymap_assign(keymap, "ANIM_OT_previewrange_set"); WM_modalkeymap_assign(keymap, "CONSOLE_OT_select_border"); -- cgit v1.2.3