diff options
107 files changed, 6124 insertions, 6124 deletions
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index ec1583f2aa3..bfe17b80fda 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -1104,19 +1104,19 @@ static int animchannels_rearrange_exec(bContext *C, wmOperator *op) static void ANIM_OT_channels_move (wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Channels"; - ot->idname= "ANIM_OT_channels_move"; + ot->name = "Move Channels"; + ot->idname = "ANIM_OT_channels_move"; ot->description = "Rearrange selected animation channels"; /* api callbacks */ - ot->exec= animchannels_rearrange_exec; - ot->poll= animedit_poll_channels_nla_tweakmode_off; + ot->exec = animchannels_rearrange_exec; + ot->poll = animedit_poll_channels_nla_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_enum(ot->srna, "direction", prop_animchannel_rearrange_types, REARRANGE_ANIMCHAN_DOWN, "Direction", ""); + ot->prop = RNA_def_enum(ot->srna, "direction", prop_animchannel_rearrange_types, REARRANGE_ANIMCHAN_DOWN, "Direction", ""); } /* ******************** Delete Channel Operator *********************** */ @@ -1220,16 +1220,16 @@ static int animchannels_delete_exec(bContext *C, wmOperator *UNUSED(op)) static void ANIM_OT_channels_delete (wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Channels"; - ot->idname= "ANIM_OT_channels_delete"; - ot->description= "Delete all selected animation channels"; + ot->name = "Delete Channels"; + ot->idname = "ANIM_OT_channels_delete"; + ot->description = "Delete all selected animation channels"; /* api callbacks */ - ot->exec= animchannels_delete_exec; - ot->poll= animedit_poll_channels_active; + ot->exec = animchannels_delete_exec; + ot->poll = animedit_poll_channels_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************** Set Channel Visibility Operator *********************** */ @@ -1312,16 +1312,16 @@ static int animchannels_visibility_set_exec(bContext *C, wmOperator *UNUSED(op)) static void ANIM_OT_channels_visibility_set (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Visibility"; - ot->idname= "ANIM_OT_channels_visibility_set"; - ot->description= "Make only the selected animation channels visible in the Graph Editor"; + ot->name = "Set Visibility"; + ot->idname = "ANIM_OT_channels_visibility_set"; + ot->description = "Make only the selected animation channels visible in the Graph Editor"; /* api callbacks */ - ot->exec= animchannels_visibility_set_exec; - ot->poll= ED_operator_graphedit_active; + ot->exec = animchannels_visibility_set_exec; + ot->poll = ED_operator_graphedit_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -1389,16 +1389,16 @@ static int animchannels_visibility_toggle_exec(bContext *C, wmOperator *UNUSED(o static void ANIM_OT_channels_visibility_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Visibility"; - ot->idname= "ANIM_OT_channels_visibility_toggle"; - ot->description= "Toggle visibility in Graph Editor of all selected animation channels"; + ot->name = "Toggle Visibility"; + ot->idname = "ANIM_OT_channels_visibility_toggle"; + ot->description = "Toggle visibility in Graph Editor of all selected animation channels"; /* api callbacks */ - ot->exec= animchannels_visibility_toggle_exec; - ot->poll= ED_operator_graphedit_active; + ot->exec = animchannels_visibility_toggle_exec; + ot->poll = ED_operator_graphedit_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ********************** Set Flags Operator *********************** */ @@ -1532,82 +1532,82 @@ static int animchannels_setflag_exec(bContext *C, wmOperator *op) static void ANIM_OT_channels_setting_enable (wmOperatorType *ot) { /* identifiers */ - ot->name= "Enable Channel Setting"; - ot->idname= "ANIM_OT_channels_setting_enable"; - ot->description= "Enable specified setting on all selected animation channels"; + ot->name = "Enable Channel Setting"; + ot->idname = "ANIM_OT_channels_setting_enable"; + ot->description = "Enable specified setting on all selected animation channels"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= animchannels_setflag_exec; - ot->poll= animedit_poll_channels_active; + ot->invoke = WM_menu_invoke; + ot->exec = animchannels_setflag_exec; + ot->poll = animedit_poll_channels_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ /* flag-setting mode */ RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_ADD, "Mode", ""); /* setting to set */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, "Type", ""); } /* duplicate of 'ANIM_OT_channels_setting_toggle' for menu title only, weak! */ static void ANIM_OT_channels_setting_disable (wmOperatorType *ot) { /* identifiers */ - ot->name= "Disable Channel Setting"; - ot->idname= "ANIM_OT_channels_setting_disable"; - ot->description= "Disable specified setting on all selected animation channels"; + ot->name = "Disable Channel Setting"; + ot->idname = "ANIM_OT_channels_setting_disable"; + ot->description = "Disable specified setting on all selected animation channels"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= animchannels_setflag_exec; - ot->poll= animedit_poll_channels_active; + ot->invoke = WM_menu_invoke; + ot->exec = animchannels_setflag_exec; + ot->poll = animedit_poll_channels_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ /* flag-setting mode */ RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_CLEAR, "Mode", ""); /* setting to set */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, "Type", ""); } static void ANIM_OT_channels_setting_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Channel Setting"; - ot->idname= "ANIM_OT_channels_setting_toggle"; - ot->description= "Toggle specified setting on all selected animation channels"; + ot->name = "Toggle Channel Setting"; + ot->idname = "ANIM_OT_channels_setting_toggle"; + ot->description = "Toggle specified setting on all selected animation channels"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= animchannels_setflag_exec; - ot->poll= animedit_poll_channels_active; + ot->invoke = WM_menu_invoke; + ot->exec = animchannels_setflag_exec; + ot->poll = animedit_poll_channels_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ /* flag-setting mode */ RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_TOGGLE, "Mode", ""); /* setting to set */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, "Type", ""); } static void ANIM_OT_channels_editable_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Channel Editability"; - ot->idname= "ANIM_OT_channels_editable_toggle"; - ot->description= "Toggle editability of selected channels"; + ot->name = "Toggle Channel Editability"; + ot->idname = "ANIM_OT_channels_editable_toggle"; + ot->description = "Toggle editability of selected channels"; /* api callbacks */ - ot->exec= animchannels_setflag_exec; - ot->poll= animedit_poll_channels_active; + ot->exec = animchannels_setflag_exec; + ot->poll = animedit_poll_channels_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ /* flag-setting mode */ @@ -1643,19 +1643,19 @@ static int animchannels_expand_exec (bContext *C, wmOperator *op) static void ANIM_OT_channels_expand (wmOperatorType *ot) { /* identifiers */ - ot->name= "Expand Channels"; - ot->idname= "ANIM_OT_channels_expand"; - ot->description= "Expand (i.e. open) all selected expandable animation channels"; + ot->name = "Expand Channels"; + ot->idname = "ANIM_OT_channels_expand"; + ot->description = "Expand (i.e. open) all selected expandable animation channels"; /* api callbacks */ - ot->exec= animchannels_expand_exec; - ot->poll= animedit_poll_channels_active; + ot->exec = animchannels_expand_exec; + ot->poll = animedit_poll_channels_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_boolean(ot->srna, "all", 1, "All", "Expand all channels (not just selected ones)"); + ot->prop = RNA_def_boolean(ot->srna, "all", 1, "All", "Expand all channels (not just selected ones)"); } /* ********************** Collapse Channels Operator *********************** */ @@ -1685,19 +1685,19 @@ static int animchannels_collapse_exec (bContext *C, wmOperator *op) static void ANIM_OT_channels_collapse (wmOperatorType *ot) { /* identifiers */ - ot->name= "Collapse Channels"; - ot->idname= "ANIM_OT_channels_collapse"; - ot->description= "Collapse (i.e. close) all selected expandable animation channels"; + ot->name = "Collapse Channels"; + ot->idname = "ANIM_OT_channels_collapse"; + ot->description = "Collapse (i.e. close) all selected expandable animation channels"; /* api callbacks */ - ot->exec= animchannels_collapse_exec; - ot->poll= animedit_poll_channels_active; + ot->exec = animchannels_collapse_exec; + ot->poll = animedit_poll_channels_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_boolean(ot->srna, "all", 1, "All", "Collapse all channels (not just selected ones)"); + ot->prop = RNA_def_boolean(ot->srna, "all", 1, "All", "Collapse all channels (not just selected ones)"); } /* ******************* Reenable Disabled Operator ******************* */ @@ -1761,16 +1761,16 @@ static int animchannels_enable_exec (bContext *C, wmOperator *UNUSED(op)) static void ANIM_OT_channels_fcurves_enable (wmOperatorType *ot) { /* identifiers */ - ot->name= "Revive Disabled F-Curves"; - ot->idname= "ANIM_OT_channels_fcurves_enable"; - ot->description= "Clears 'disabled' tag from all F-Curves to get broken F-Curves working again"; + ot->name = "Revive Disabled F-Curves"; + ot->idname = "ANIM_OT_channels_fcurves_enable"; + ot->description = "Clears 'disabled' tag from all F-Curves to get broken F-Curves working again"; /* api callbacks */ - ot->exec= animchannels_enable_exec; - ot->poll= animchannels_enable_poll; + ot->exec = animchannels_enable_exec; + ot->poll = animchannels_enable_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ********************** Select All Operator *********************** */ @@ -1798,19 +1798,19 @@ static int animchannels_deselectall_exec (bContext *C, wmOperator *op) static void ANIM_OT_channels_select_all_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select All"; - ot->idname= "ANIM_OT_channels_select_all_toggle"; - ot->description= "Toggle selection of all animation channels"; + ot->name = "Select All"; + ot->idname = "ANIM_OT_channels_select_all_toggle"; + ot->description = "Toggle selection of all animation channels"; /* api callbacks */ - ot->exec= animchannels_deselectall_exec; - ot->poll= animedit_poll_channels_nla_tweakmode_off; + ot->exec = animchannels_deselectall_exec; + ot->poll = animedit_poll_channels_nla_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_boolean(ot->srna, "invert", 0, "Invert", ""); + ot->prop = RNA_def_boolean(ot->srna, "invert", 0, "Invert", ""); } /* ******************** Borderselect Operator *********************** */ @@ -1929,20 +1929,20 @@ static int animchannels_borderselect_exec(bContext *C, wmOperator *op) static void ANIM_OT_channels_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Select"; - ot->idname= "ANIM_OT_channels_select_border"; - ot->description= "Select all animation channels within the specified region"; + ot->name = "Border Select"; + ot->idname = "ANIM_OT_channels_select_border"; + ot->description = "Select all animation channels within the specified region"; /* api callbacks */ - ot->invoke= WM_border_select_invoke; - ot->exec= animchannels_borderselect_exec; - ot->modal= WM_border_select_modal; - ot->cancel= WM_border_select_cancel; + ot->invoke = WM_border_select_invoke; + ot->exec = animchannels_borderselect_exec; + ot->modal = WM_border_select_modal; + ot->cancel = WM_border_select_cancel; - ot->poll= animedit_poll_channels_nla_tweakmode_off; + ot->poll = animedit_poll_channels_nla_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* rna */ WM_operator_properties_gesture_border(ot, TRUE); @@ -2040,13 +2040,13 @@ static int animchannels_rename_invoke (bContext *C, wmOperator *UNUSED(op), wmEv static void ANIM_OT_channels_rename (wmOperatorType *ot) { /* identifiers */ - ot->name= "Rename Channels"; - ot->idname= "ANIM_OT_channels_rename"; - ot->description= "Rename animation channel under mouse"; + ot->name = "Rename Channels"; + ot->idname = "ANIM_OT_channels_rename"; + ot->description = "Rename animation channel under mouse"; /* api callbacks */ - ot->invoke= animchannels_rename_invoke; - ot->poll= animedit_poll_channels_active; + ot->invoke = animchannels_rename_invoke; + ot->poll = animedit_poll_channels_active; } /* ******************** Mouse-Click Operator *********************** */ @@ -2349,16 +2349,16 @@ static int animchannels_mouseclick_invoke(bContext *C, wmOperator *op, wmEvent * static void ANIM_OT_channels_click (wmOperatorType *ot) { /* identifiers */ - ot->name= "Mouse Click on Channels"; - ot->idname= "ANIM_OT_channels_click"; - ot->description= "Handle mouse-clicks over animation channels"; + ot->name = "Mouse Click on Channels"; + ot->idname = "ANIM_OT_channels_click"; + ot->description = "Handle mouse-clicks over animation channels"; /* api callbacks */ - ot->invoke= animchannels_mouseclick_invoke; - ot->poll= animedit_poll_channels_active; + ot->invoke = animchannels_mouseclick_invoke; + ot->poll = animedit_poll_channels_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index 803516e211b..f5c70796b58 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -582,17 +582,17 @@ static int ed_marker_add(bContext *C, wmOperator *UNUSED(op)) static void MARKER_OT_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Time Marker"; - ot->description= "Add a new time marker"; - ot->idname= "MARKER_OT_add"; + ot->name = "Add Time Marker"; + ot->description = "Add a new time marker"; + ot->idname = "MARKER_OT_add"; /* api callbacks */ - ot->exec= ed_marker_add; + ot->exec = ed_marker_add; ot->invoke = ed_markers_opwrap_invoke; - ot->poll= ED_operator_animview_active; + ot->poll = ED_operator_animview_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ************************** transform markers *************************** */ @@ -883,19 +883,19 @@ static int ed_marker_move_exec(bContext *C, wmOperator *op) static void MARKER_OT_move(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Time Marker"; - ot->description= "Move selected time marker(s)"; - ot->idname= "MARKER_OT_move"; + ot->name = "Move Time Marker"; + ot->description = "Move selected time marker(s)"; + ot->idname = "MARKER_OT_move"; /* api callbacks */ - ot->exec= ed_marker_move_exec; - ot->invoke= ed_marker_move_invoke_wrapper; - ot->modal= ed_marker_move_modal; - ot->poll= ed_markers_poll_selected_markers; - ot->cancel= ed_marker_move_cancel; + ot->exec = ed_marker_move_exec; + ot->invoke = ed_marker_move_invoke_wrapper; + ot->modal = ed_marker_move_modal; + ot->poll = ed_markers_poll_selected_markers; + ot->cancel = ed_marker_move_cancel; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; /* rna storage */ RNA_def_int(ot->srna, "frames", 0, INT_MIN, INT_MAX, "Frames", "", INT_MIN, INT_MAX); @@ -976,19 +976,19 @@ static int ed_marker_duplicate_invoke_wrapper(bContext *C, wmOperator *op, wmEve static void MARKER_OT_duplicate(wmOperatorType *ot) { /* identifiers */ - ot->name= "Duplicate Time Marker"; - ot->description= "Duplicate selected time marker(s)"; - ot->idname= "MARKER_OT_duplicate"; + ot->name = "Duplicate Time Marker"; + ot->description = "Duplicate selected time marker(s)"; + ot->idname = "MARKER_OT_duplicate"; /* api callbacks */ - ot->exec= ed_marker_duplicate_exec; - ot->invoke= ed_marker_duplicate_invoke_wrapper; - ot->modal= ed_marker_move_modal; - ot->poll= ed_markers_poll_selected_markers; - ot->cancel= ed_marker_move_cancel; + ot->exec = ed_marker_duplicate_exec; + ot->invoke = ed_marker_duplicate_invoke_wrapper; + ot->modal = ed_marker_move_modal; + ot->poll = ed_markers_poll_selected_markers; + ot->cancel = ed_marker_move_cancel; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* rna storage */ RNA_def_int(ot->srna, "frames", 0, INT_MIN, INT_MAX, "Frames", "", INT_MIN, INT_MAX); @@ -1101,16 +1101,16 @@ static int ed_marker_select_invoke_wrapper(bContext *C, wmOperator *op, wmEvent static void MARKER_OT_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Time Marker"; - ot->description= "Select time marker(s)"; - ot->idname= "MARKER_OT_select"; + ot->name = "Select Time Marker"; + ot->description = "Select time marker(s)"; + ot->idname = "MARKER_OT_select"; /* api callbacks */ - ot->invoke= ed_marker_select_invoke_wrapper; - ot->poll= ed_markers_poll_markers_exist; + ot->invoke = ed_marker_select_invoke_wrapper; + ot->poll = ed_markers_poll_markers_exist; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend the selection"); #ifdef DURIAN_CAMERA_SWITCH @@ -1189,20 +1189,20 @@ static int ed_marker_select_border_invoke_wrapper(bContext *C, wmOperator *op, w static void MARKER_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Marker Border select"; - ot->description= "Select all time markers using border selection"; - ot->idname= "MARKER_OT_select_border"; + ot->name = "Marker Border select"; + ot->description = "Select all time markers using border selection"; + ot->idname = "MARKER_OT_select_border"; /* api callbacks */ - ot->exec= ed_marker_border_select_exec; - ot->invoke= ed_marker_select_border_invoke_wrapper; - ot->modal= WM_border_select_modal; - ot->cancel= WM_border_select_cancel; + ot->exec = ed_marker_border_select_exec; + ot->invoke = ed_marker_select_border_invoke_wrapper; + ot->modal = WM_border_select_modal; + ot->cancel = WM_border_select_cancel; - ot->poll= ed_markers_poll_markers_exist; + ot->poll = ed_markers_poll_markers_exist; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* rna */ WM_operator_properties_gesture_border(ot, TRUE); @@ -1246,17 +1246,17 @@ static int ed_marker_select_all_exec(bContext *C, wmOperator *op) static void MARKER_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "(De)select all markers"; - ot->description= "Change selection of all time markers"; - ot->idname= "MARKER_OT_select_all"; + ot->name = "(De)select all markers"; + ot->description = "Change selection of all time markers"; + ot->idname = "MARKER_OT_select_all"; /* api callbacks */ - ot->exec= ed_marker_select_all_exec; + ot->exec = ed_marker_select_all_exec; ot->invoke = ed_markers_opwrap_invoke; - ot->poll= ed_markers_poll_markers_exist; + ot->poll = ed_markers_poll_markers_exist; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* rna */ WM_operator_properties_select_all(ot); @@ -1299,17 +1299,17 @@ static int ed_marker_delete_invoke_wrapper(bContext *C, wmOperator *op, wmEvent static void MARKER_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Markers"; - ot->description= "Delete selected time marker(s)"; - ot->idname= "MARKER_OT_delete"; + ot->name = "Delete Markers"; + ot->description = "Delete selected time marker(s)"; + ot->idname = "MARKER_OT_delete"; /* api callbacks */ - ot->invoke= ed_marker_delete_invoke_wrapper; - ot->exec= ed_marker_delete_exec; - ot->poll= ed_markers_poll_selected_markers; + ot->invoke = ed_marker_delete_invoke_wrapper; + ot->exec = ed_marker_delete_exec; + ot->poll = ed_markers_poll_selected_markers; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -1347,17 +1347,17 @@ static int ed_marker_rename_invoke_wrapper(bContext *C, wmOperator *op, wmEvent static void MARKER_OT_rename(wmOperatorType *ot) { /* identifiers */ - ot->name= "Rename Marker"; - ot->description= "Rename first selected time marker"; - ot->idname= "MARKER_OT_rename"; + ot->name = "Rename Marker"; + ot->description = "Rename first selected time marker"; + ot->idname = "MARKER_OT_rename"; /* api callbacks */ - ot->invoke= ed_marker_rename_invoke_wrapper; - ot->exec= ed_marker_rename_exec; - ot->poll= ed_markers_poll_selected_markers; + ot->invoke = ed_marker_rename_invoke_wrapper; + ot->exec = ed_marker_rename_exec; + ot->poll = ed_markers_poll_selected_markers; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ ot->prop = RNA_def_string(ot->srna, "name", "RenamedMarker", sizeof(((TimeMarker *)NULL)->name), "Name", "New name for marker"); @@ -1400,22 +1400,22 @@ static void MARKER_OT_make_links_scene(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Make Links to Scene"; - ot->description= "Copy selected markers to another scene"; - ot->idname= "MARKER_OT_make_links_scene"; + ot->name = "Make Links to Scene"; + ot->description = "Copy selected markers to another scene"; + ot->idname = "MARKER_OT_make_links_scene"; /* api callbacks */ - ot->exec= ed_marker_make_links_scene_exec; + ot->exec = ed_marker_make_links_scene_exec; ot->invoke = ed_markers_opwrap_invoke; - ot->poll= ed_markers_poll_selected_markers; + ot->poll = ed_markers_poll_selected_markers; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ prop= RNA_def_enum(ot->srna, "scene", DummyRNA_NULL_items, 0, "Scene", ""); RNA_def_enum_funcs(prop, RNA_scene_itemf); - ot->prop= prop; + ot->prop = prop; } @@ -1450,17 +1450,17 @@ static int ed_marker_camera_bind_exec(bContext *C, wmOperator *UNUSED(op)) static void MARKER_OT_camera_bind(wmOperatorType *ot) { /* identifiers */ - ot->name= "Bind Camera to Markers"; - ot->description= "Bind the active camera to selected markers(s)"; - ot->idname= "MARKER_OT_camera_bind"; + ot->name = "Bind Camera to Markers"; + ot->description = "Bind the active camera to selected markers(s)"; + ot->idname = "MARKER_OT_camera_bind"; /* api callbacks */ - ot->exec= ed_marker_camera_bind_exec; + ot->exec = ed_marker_camera_bind_exec; ot->invoke = ed_markers_opwrap_invoke; - ot->poll= ed_markers_poll_selected_markers; + ot->poll = ed_markers_poll_selected_markers; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } #endif diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c index 5b246e63a20..05a7a263e08 100644 --- a/source/blender/editors/animation/anim_ops.c +++ b/source/blender/editors/animation/anim_ops.c @@ -161,18 +161,18 @@ static int change_frame_modal(bContext *C, wmOperator *op, wmEvent *event) static void ANIM_OT_change_frame(wmOperatorType *ot) { /* identifiers */ - ot->name= "Change frame"; - ot->idname= "ANIM_OT_change_frame"; - ot->description= "Interactively change the current frame number"; + ot->name = "Change frame"; + ot->idname = "ANIM_OT_change_frame"; + ot->description = "Interactively change the current frame number"; /* api callbacks */ - ot->exec= change_frame_exec; - ot->invoke= change_frame_invoke; - ot->modal= change_frame_modal; - ot->poll= change_frame_poll; + ot->exec = change_frame_exec; + ot->invoke = change_frame_invoke; + ot->modal = change_frame_modal; + ot->poll = change_frame_poll; /* flags */ - ot->flag= OPTYPE_BLOCKING|OPTYPE_UNDO; + ot->flag = OPTYPE_BLOCKING|OPTYPE_UNDO; /* rna */ RNA_def_int(ot->srna, "frame", 0, MINAFRAME, MAXFRAME, "Frame", "", MINAFRAME, MAXFRAME); @@ -216,20 +216,20 @@ static int previewrange_define_exec(bContext *C, wmOperator *op) static void ANIM_OT_previewrange_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Preview Range"; - ot->idname= "ANIM_OT_previewrange_set"; - ot->description= "Interactively define frame range used for playback"; + ot->name = "Set Preview Range"; + ot->idname = "ANIM_OT_previewrange_set"; + ot->description = "Interactively define frame range used for playback"; /* api callbacks */ - ot->invoke= WM_border_select_invoke; - ot->exec= previewrange_define_exec; - ot->modal= WM_border_select_modal; - ot->cancel= WM_border_select_cancel; + ot->invoke = WM_border_select_invoke; + ot->exec = previewrange_define_exec; + ot->modal = WM_border_select_modal; + ot->cancel = WM_border_select_cancel; - ot->poll= ED_operator_animview_active; + ot->poll = ED_operator_animview_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* rna */ /* used to define frame range */ @@ -264,17 +264,17 @@ static int previewrange_clear_exec(bContext *C, wmOperator *UNUSED(op)) static void ANIM_OT_previewrange_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Preview Range"; - ot->idname= "ANIM_OT_previewrange_clear"; - ot->description= "Clear Preview Range"; + ot->name = "Clear Preview Range"; + ot->idname = "ANIM_OT_previewrange_clear"; + ot->description = "Clear Preview Range"; /* api callbacks */ - ot->exec= previewrange_clear_exec; + ot->exec = previewrange_clear_exec; - ot->poll= ED_operator_animview_active; + ot->poll = ED_operator_animview_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ************************** registration **********************************/ diff --git a/source/blender/editors/animation/drivers.c b/source/blender/editors/animation/drivers.c index 6af95b35ba8..881de2904f7 100644 --- a/source/blender/editors/animation/drivers.c +++ b/source/blender/editors/animation/drivers.c @@ -515,16 +515,16 @@ static int add_driver_button_exec (bContext *C, wmOperator *op) void ANIM_OT_driver_button_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Driver"; - ot->idname= "ANIM_OT_driver_button_add"; - ot->description= "Add driver(s) for the property(s) connected represented by the highlighted button"; + ot->name = "Add Driver"; + ot->idname = "ANIM_OT_driver_button_add"; + ot->description = "Add driver(s) for the property(s) connected represented by the highlighted button"; /* callbacks */ - ot->exec= add_driver_button_exec; + ot->exec = add_driver_button_exec; //op->poll= ??? // TODO: need to have some animatable property to do this /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "all", 1, "All", "Create drivers for all elements of the array"); @@ -567,16 +567,16 @@ static int remove_driver_button_exec (bContext *C, wmOperator *op) void ANIM_OT_driver_button_remove (wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Driver"; - ot->idname= "ANIM_OT_driver_button_remove"; - ot->description= "Remove the driver(s) for the property(s) connected represented by the highlighted button"; + ot->name = "Remove Driver"; + ot->idname = "ANIM_OT_driver_button_remove"; + ot->description = "Remove the driver(s) for the property(s) connected represented by the highlighted button"; /* callbacks */ - ot->exec= remove_driver_button_exec; + ot->exec = remove_driver_button_exec; //op->poll= ??? // TODO: need to have some driver to be able to do this... /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "all", 1, "All", "Delete drivers for all elements of the array"); @@ -614,16 +614,16 @@ static int copy_driver_button_exec (bContext *C, wmOperator *op) void ANIM_OT_copy_driver_button (wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Driver"; - ot->idname= "ANIM_OT_copy_driver_button"; - ot->description= "Copy the driver for the highlighted button"; + ot->name = "Copy Driver"; + ot->idname = "ANIM_OT_copy_driver_button"; + ot->description = "Copy the driver for the highlighted button"; /* callbacks */ - ot->exec= copy_driver_button_exec; + ot->exec = copy_driver_button_exec; //op->poll= ??? // TODO: need to have some driver to be able to do this... /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* Paste Driver Button Operator ------------------------ */ @@ -658,16 +658,16 @@ static int paste_driver_button_exec (bContext *C, wmOperator *op) void ANIM_OT_paste_driver_button (wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste Driver"; - ot->idname= "ANIM_OT_paste_driver_button"; - ot->description= "Paste the driver in the copy/paste buffer for the highlighted button"; + ot->name = "Paste Driver"; + ot->idname = "ANIM_OT_paste_driver_button"; + ot->description = "Paste the driver in the copy/paste buffer for the highlighted button"; /* callbacks */ - ot->exec= paste_driver_button_exec; + ot->exec = paste_driver_button_exec; //op->poll= ??? // TODO: need to have some driver to be able to do this... /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ************************************************** */ diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index e82f234d2b6..fdd790f58fc 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -1158,22 +1158,22 @@ void ANIM_OT_keyframe_insert (wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Insert Keyframe"; - ot->idname= "ANIM_OT_keyframe_insert"; - ot->description= "Insert keyframes on the current frame for all properties in the specified Keying Set"; + ot->name = "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 */ - ot->exec= insert_key_exec; - ot->poll= modify_key_op_poll; + ot->exec = insert_key_exec; + ot->poll = modify_key_op_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* keyingset to use (dynamic enum) */ prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use"); RNA_def_enum_funcs(prop, ANIM_keying_sets_enum_itemf); RNA_def_property_flag(prop, PROP_HIDDEN); - ot->prop= prop; + ot->prop = prop; /* confirm whether a keyframe was added by showing a popup * - by default, this is enabled, since this operator is assumed to be called independently @@ -1219,23 +1219,23 @@ void ANIM_OT_keyframe_insert_menu (wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Insert Keyframe Menu"; - ot->idname= "ANIM_OT_keyframe_insert_menu"; - ot->description= "Insert Keyframes for specified Keying Set, with menu of available Keying Sets if undefined"; + ot->name = "Insert Keyframe Menu"; + ot->idname = "ANIM_OT_keyframe_insert_menu"; + ot->description = "Insert Keyframes for specified Keying Set, with menu of available Keying Sets if undefined"; /* callbacks */ - ot->invoke= insert_key_menu_invoke; - ot->exec= insert_key_exec; - ot->poll= ED_operator_areaactive; + ot->invoke = insert_key_menu_invoke; + ot->exec = insert_key_exec; + ot->poll = ED_operator_areaactive; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* keyingset to use (dynamic enum) */ prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use"); RNA_def_enum_funcs(prop, ANIM_keying_sets_enum_itemf); RNA_def_property_flag(prop, PROP_HIDDEN); - ot->prop= prop; + ot->prop = prop; /* confirm whether a keyframe was added by showing a popup * - by default, this is disabled so that if a menu is shown, this doesn't come up too @@ -1314,22 +1314,22 @@ void ANIM_OT_keyframe_delete (wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Delete Keying-Set Keyframe"; - ot->idname= "ANIM_OT_keyframe_delete"; - ot->description= "Delete keyframes on the current frame for all properties in the specified Keying Set"; + ot->name = "Delete Keying-Set Keyframe"; + ot->idname = "ANIM_OT_keyframe_delete"; + ot->description = "Delete keyframes on the current frame for all properties in the specified Keying Set"; /* callbacks */ - ot->exec= delete_key_exec; - ot->poll= modify_key_op_poll; + ot->exec = delete_key_exec; + ot->poll = modify_key_op_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* keyingset to use (dynamic enum) */ prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use"); RNA_def_enum_funcs(prop, ANIM_keying_sets_enum_itemf); RNA_def_property_flag(prop, PROP_HIDDEN); - ot->prop= prop; + ot->prop = prop; /* confirm whether a keyframe was added by showing a popup * - by default, this is enabled, since this operator is assumed to be called independently @@ -1387,18 +1387,18 @@ static int delete_key_v3d_exec (bContext *C, wmOperator *op) void ANIM_OT_keyframe_delete_v3d (wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Keyframe"; - ot->description= "Remove keyframes on current frame for selected object"; - ot->idname= "ANIM_OT_keyframe_delete_v3d"; + ot->name = "Delete Keyframe"; + ot->description = "Remove keyframes on current frame for selected object"; + ot->idname = "ANIM_OT_keyframe_delete_v3d"; /* callbacks */ - ot->invoke= WM_operator_confirm; - ot->exec= delete_key_v3d_exec; + ot->invoke = WM_operator_confirm; + ot->exec = delete_key_v3d_exec; - ot->poll= ED_operator_areaactive; + ot->poll = ED_operator_areaactive; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -1477,15 +1477,15 @@ static int insert_key_button_exec (bContext *C, wmOperator *op) void ANIM_OT_keyframe_insert_button (wmOperatorType *ot) { /* identifiers */ - ot->name= "Insert Keyframe (Buttons)"; - ot->idname= "ANIM_OT_keyframe_insert_button"; + ot->name = "Insert Keyframe (Buttons)"; + ot->idname = "ANIM_OT_keyframe_insert_button"; /* callbacks */ - ot->exec= insert_key_button_exec; - ot->poll= modify_key_op_poll; + ot->exec = insert_key_button_exec; + ot->poll = modify_key_op_poll; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "all", 1, "All", "Insert a keyframe for all element of the array"); @@ -1549,15 +1549,15 @@ static int delete_key_button_exec (bContext *C, wmOperator *op) void ANIM_OT_keyframe_delete_button (wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Keyframe (Buttons)"; - ot->idname= "ANIM_OT_keyframe_delete_button"; + ot->name = "Delete Keyframe (Buttons)"; + ot->idname = "ANIM_OT_keyframe_delete_button"; /* callbacks */ - ot->exec= delete_key_button_exec; - ot->poll= modify_key_op_poll; + ot->exec = delete_key_button_exec; + ot->poll = modify_key_op_poll; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "all", 1, "All", "Delete keyfames from all elements of the array"); diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index 82d0bff79b8..32078060ca6 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -140,13 +140,13 @@ static int add_default_keyingset_exec (bContext *C, wmOperator *UNUSED(op)) void ANIM_OT_keying_set_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Empty Keying Set"; - ot->idname= "ANIM_OT_keying_set_add"; - ot->description= "Add a new (empty) Keying Set to the active Scene"; + ot->name = "Add Empty Keying Set"; + ot->idname = "ANIM_OT_keying_set_add"; + ot->description = "Add a new (empty) Keying Set to the active Scene"; /* callbacks */ - ot->exec= add_default_keyingset_exec; - ot->poll= keyingset_poll_default_add; + ot->exec = add_default_keyingset_exec; + ot->poll = keyingset_poll_default_add; } /* Remove 'Active' Keying Set ------------------------- */ @@ -187,13 +187,13 @@ static int remove_active_keyingset_exec (bContext *C, wmOperator *op) void ANIM_OT_keying_set_remove (wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Active Keying Set"; - ot->idname= "ANIM_OT_keying_set_remove"; - ot->description= "Remove the active Keying Set"; + ot->name = "Remove Active Keying Set"; + ot->idname = "ANIM_OT_keying_set_remove"; + ot->description = "Remove the active Keying Set"; /* callbacks */ - ot->exec= remove_active_keyingset_exec; - ot->poll= keyingset_poll_active_edit; + ot->exec = remove_active_keyingset_exec; + ot->poll = keyingset_poll_active_edit; } /* Add Empty Keying Set Path ------------------------- */ @@ -230,13 +230,13 @@ static int add_empty_ks_path_exec (bContext *C, wmOperator *op) void ANIM_OT_keying_set_path_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Empty Keying Set Path"; - ot->idname= "ANIM_OT_keying_set_path_add"; - ot->description= "Add empty path to active Keying Set"; + ot->name = "Add Empty Keying Set Path"; + ot->idname = "ANIM_OT_keying_set_path_add"; + ot->description = "Add empty path to active Keying Set"; /* callbacks */ - ot->exec= add_empty_ks_path_exec; - ot->poll= keyingset_poll_active_edit; + ot->exec = add_empty_ks_path_exec; + ot->poll = keyingset_poll_active_edit; } /* Remove Active Keying Set Path ------------------------- */ @@ -273,13 +273,13 @@ static int remove_active_ks_path_exec (bContext *C, wmOperator *op) void ANIM_OT_keying_set_path_remove (wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Active Keying Set Path"; - ot->idname= "ANIM_OT_keying_set_path_remove"; - ot->description= "Remove active Path from active Keying Set"; + ot->name = "Remove Active Keying Set Path"; + ot->idname = "ANIM_OT_keying_set_path_remove"; + ot->description = "Remove active Path from active Keying Set"; /* callbacks */ - ot->exec= remove_active_ks_path_exec; - ot->poll= keyingset_poll_activePath_edit; + ot->exec = remove_active_ks_path_exec; + ot->poll = keyingset_poll_activePath_edit; } /* ************************************************** */ @@ -371,15 +371,15 @@ static int add_keyingset_button_exec (bContext *C, wmOperator *op) void ANIM_OT_keyingset_button_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add to Keying Set"; - ot->idname= "ANIM_OT_keyingset_button_add"; + ot->name = "Add to Keying Set"; + ot->idname = "ANIM_OT_keyingset_button_add"; /* callbacks */ - ot->exec= add_keyingset_button_exec; + ot->exec = add_keyingset_button_exec; //op->poll= ??? /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "all", 1, "All", "Add all elements of the array to a Keying Set"); @@ -450,15 +450,15 @@ static int remove_keyingset_button_exec (bContext *C, wmOperator *op) void ANIM_OT_keyingset_button_remove (wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove from Keying Set"; - ot->idname= "ANIM_OT_keyingset_button_remove"; + ot->name = "Remove from Keying Set"; + ot->idname = "ANIM_OT_keyingset_button_remove"; /* callbacks */ - ot->exec= remove_keyingset_button_exec; + ot->exec = remove_keyingset_button_exec; //op->poll= ??? /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************************************* */ @@ -499,16 +499,16 @@ void ANIM_OT_keying_set_active_set (wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Set Active Keying Set"; - ot->idname= "ANIM_OT_keying_set_active_set"; + ot->name = "Set Active Keying Set"; + ot->idname = "ANIM_OT_keying_set_active_set"; /* callbacks */ - ot->invoke= keyingset_active_menu_invoke; - ot->exec= keyingset_active_menu_exec; - ot->poll= ED_operator_areaactive; + ot->invoke = keyingset_active_menu_invoke; + ot->exec = keyingset_active_menu_exec; + ot->poll = ED_operator_areaactive; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* keyingset to use (dynamic enum) */ prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use"); diff --git a/source/blender/editors/armature/armature_ops.c b/source/blender/editors/armature/armature_ops.c index ad52f4e61cb..cfc87941dd3 100644 --- a/source/blender/editors/armature/armature_ops.c +++ b/source/blender/editors/armature/armature_ops.c @@ -172,7 +172,7 @@ void ED_operatormacros_armature(void) ot= WM_operatortype_append_macro("ARMATURE_OT_duplicate_move", "Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER); if(ot) { - ot->description= "Make copies of the selected bones within the same armature and move them"; + ot->description = "Make copies of the selected bones within the same armature and move them"; WM_operatortype_macro_define(ot, "ARMATURE_OT_duplicate"); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); RNA_enum_set(otmacro->ptr, "proportional", 0); @@ -180,7 +180,7 @@ void ED_operatormacros_armature(void) ot= WM_operatortype_append_macro("ARMATURE_OT_extrude_move", "Extrude", OPTYPE_UNDO|OPTYPE_REGISTER); if(ot) { - ot->description= "Create new bones from the selected joints and move them"; + ot->description = "Create new bones from the selected joints and move them"; otmacro=WM_operatortype_macro_define(ot, "ARMATURE_OT_extrude"); RNA_boolean_set(otmacro->ptr, "forked", FALSE); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); @@ -191,7 +191,7 @@ void ED_operatormacros_armature(void) // that would require fixing a properties bug 19733 ot= WM_operatortype_append_macro("ARMATURE_OT_extrude_forked", "Extrude Forked", OPTYPE_UNDO|OPTYPE_REGISTER); if(ot) { - ot->description= "Create new bones from the selected joints and move them"; + ot->description = "Create new bones from the selected joints and move them"; otmacro=WM_operatortype_macro_define(ot, "ARMATURE_OT_extrude"); RNA_boolean_set(otmacro->ptr, "forked", TRUE); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 0bc0d214b8b..321aa30f55a 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -729,16 +729,16 @@ static int apply_armature_pose2bones_exec (bContext *C, wmOperator *op) void POSE_OT_armature_apply (wmOperatorType *ot) { /* identifiers */ - ot->name= "Apply Pose as Rest Pose"; - ot->idname= "POSE_OT_armature_apply"; - ot->description= "Apply the current pose as the new rest pose"; + ot->name = "Apply Pose as Rest Pose"; + ot->idname = "POSE_OT_armature_apply"; + ot->description = "Apply the current pose as the new rest pose"; /* callbacks */ - ot->exec= apply_armature_pose2bones_exec; - ot->poll= ED_operator_posemode; + ot->exec = apply_armature_pose2bones_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -780,16 +780,16 @@ static int pose_visual_transform_apply_exec (bContext *C, wmOperator *UNUSED(op) void POSE_OT_visual_transform_apply (wmOperatorType *ot) { /* identifiers */ - ot->name= "Apply Visual Transform to Pose"; - ot->idname= "POSE_OT_visual_transform_apply"; - ot->description= "Apply final constrained position of pose bones to their transform"; + ot->name = "Apply Visual Transform to Pose"; + ot->idname = "POSE_OT_visual_transform_apply"; + ot->description = "Apply final constrained position of pose bones to their transform"; /* callbacks */ - ot->exec= pose_visual_transform_apply_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_visual_transform_apply_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ---------------------- */ @@ -1243,17 +1243,17 @@ static int separate_armature_exec (bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_separate (wmOperatorType *ot) { /* identifiers */ - ot->name= "Separate Bones"; - ot->idname= "ARMATURE_OT_separate"; - ot->description= "Isolate selected bones into a separate armature"; + ot->name = "Separate Bones"; + ot->idname = "ARMATURE_OT_separate"; + ot->description = "Isolate selected bones into a separate armature"; /* callbacks */ - ot->invoke= WM_operator_confirm; - ot->exec= separate_armature_exec; - ot->poll= ED_operator_editarmature; + ot->invoke = WM_operator_confirm; + ot->exec = separate_armature_exec; + ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* **************** END tools on Editmode Armature **************** */ @@ -1467,17 +1467,17 @@ static int pose_select_linked_poll(bContext *C) void POSE_OT_select_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Connected"; - ot->idname= "POSE_OT_select_linked"; - ot->description= "Select bones related to selected ones by parent/child relationships"; + ot->name = "Select Connected"; + ot->idname = "POSE_OT_select_linked"; + ot->description = "Select bones related to selected ones by parent/child relationships"; /* api callbacks */ - ot->exec= NULL; - ot->invoke= pose_select_connected_invoke; - ot->poll= pose_select_linked_poll; + ot->exec = NULL; + ot->invoke = pose_select_connected_invoke; + ot->poll = pose_select_linked_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ RNA_def_boolean(ot->srna, "extend", FALSE, "Extend", "Extend selection instead of deselecting everything first"); @@ -1561,17 +1561,17 @@ static int armature_select_linked_poll(bContext *C) void ARMATURE_OT_select_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Connected"; - ot->idname= "ARMATURE_OT_select_linked"; - ot->description= "Select bones related to selected ones by parent/child relationships"; + ot->name = "Select Connected"; + ot->idname = "ARMATURE_OT_select_linked"; + ot->description = "Select bones related to selected ones by parent/child relationships"; /* api callbacks */ - ot->exec= NULL; - ot->invoke= armature_select_linked_invoke; - ot->poll= armature_select_linked_poll; + ot->exec = NULL; + ot->invoke = armature_select_linked_invoke; + ot->poll = armature_select_linked_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties s*/ RNA_def_boolean(ot->srna, "extend", FALSE, "Extend", "Extend selection instead of deselecting everything first"); @@ -1746,9 +1746,9 @@ static int armature_delete_selected_exec(bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Selected Bone(s)"; - ot->idname= "ARMATURE_OT_delete"; - ot->description= "Remove selected bones from the armature"; + ot->name = "Delete Selected Bone(s)"; + ot->idname = "ARMATURE_OT_delete"; + ot->description = "Remove selected bones from the armature"; /* api callbacks */ ot->invoke = WM_operator_confirm; @@ -1756,7 +1756,7 @@ void ARMATURE_OT_delete(wmOperatorType *ot) ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* toggle==0: deselect @@ -2101,9 +2101,9 @@ static int armature_calc_roll_exec(bContext *C, wmOperator *op) void ARMATURE_OT_calculate_roll(wmOperatorType *ot) { /* identifiers */ - ot->name= "Recalculate Roll"; - ot->idname= "ARMATURE_OT_calculate_roll"; - ot->description= "Automatically fix alignment of select bones' axes"; + ot->name = "Recalculate Roll"; + ot->idname = "ARMATURE_OT_calculate_roll"; + ot->description = "Automatically fix alignment of select bones' axes"; /* api callbacks */ ot->invoke = WM_menu_invoke; @@ -2111,10 +2111,10 @@ void ARMATURE_OT_calculate_roll(wmOperatorType *ot) ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_calc_roll_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_calc_roll_types, 0, "Type", ""); RNA_def_boolean(ot->srna, "axis_flip", 0, "Flip Axis", "Negate the alignment axis"); RNA_def_boolean(ot->srna, "axis_only", 0, "Shortest Rotation", "Ignore the axis direction, use the shortest rotation to align"); } @@ -2408,9 +2408,9 @@ static int armature_click_extrude_invoke(bContext *C, wmOperator *op, wmEvent *e void ARMATURE_OT_click_extrude(wmOperatorType *ot) { /* identifiers */ - ot->name= "Click-Extrude"; - ot->idname= "ARMATURE_OT_click_extrude"; - ot->description= "Create a new bone going from the last selected joint to the mouse position"; + ot->name = "Click-Extrude"; + ot->idname = "ARMATURE_OT_click_extrude"; + ot->description = "Create a new bone going from the last selected joint to the mouse position"; /* api callbacks */ ot->invoke = armature_click_extrude_invoke; @@ -2418,7 +2418,7 @@ void ARMATURE_OT_click_extrude(wmOperatorType *ot) ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ } @@ -2676,16 +2676,16 @@ static int armature_duplicate_selected_exec(bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_duplicate(wmOperatorType *ot) { /* identifiers */ - ot->name= "Duplicate Selected Bone(s)"; - ot->idname= "ARMATURE_OT_duplicate"; - ot->description= "Make copies of the selected bones within the same armature"; + ot->name = "Duplicate Selected Bone(s)"; + ot->idname = "ARMATURE_OT_duplicate"; + ot->description = "Make copies of the selected bones within the same armature"; /* api callbacks */ ot->exec = armature_duplicate_selected_exec; ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -2950,16 +2950,16 @@ static int armature_fill_bones_exec (bContext *C, wmOperator *op) void ARMATURE_OT_fill (wmOperatorType *ot) { /* identifiers */ - ot->name= "Fill Between Joints"; - ot->idname= "ARMATURE_OT_fill"; - ot->description= "Add bone between selected joint(s) and/or 3D-Cursor"; + ot->name = "Fill Between Joints"; + ot->idname = "ARMATURE_OT_fill"; + ot->description = "Add bone between selected joint(s) and/or 3D-Cursor"; /* callbacks */ - ot->exec= armature_fill_bones_exec; - ot->poll= ED_operator_editarmature; + ot->exec = armature_fill_bones_exec; + ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* --------------------- */ @@ -3134,20 +3134,20 @@ void ARMATURE_OT_merge (wmOperatorType *ot) }; /* identifiers */ - ot->name= "Merge Bones"; - ot->idname= "ARMATURE_OT_merge"; - ot->description= "Merge continuous chains of selected bones"; + ot->name = "Merge Bones"; + ot->idname = "ARMATURE_OT_merge"; + ot->description = "Merge continuous chains of selected bones"; /* callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= armature_merge_exec; - ot->poll= ED_operator_editarmature; + ot->invoke = WM_menu_invoke; + ot->exec = armature_merge_exec; + ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", merge_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", merge_types, 0, "Type", ""); } /* ************** END Add/Remove stuff in editmode ************ */ @@ -3183,16 +3183,16 @@ static int armature_hide_exec(bContext *C, wmOperator *op) void ARMATURE_OT_hide(wmOperatorType *ot) { /* identifiers */ - ot->name= "Hide Selected Bones"; - ot->idname= "ARMATURE_OT_hide"; - ot->description= "Tag selected bones to not be visible in Edit Mode"; + ot->name = "Hide Selected Bones"; + ot->idname = "ARMATURE_OT_hide"; + ot->description = "Tag selected bones to not be visible in Edit Mode"; /* api callbacks */ - ot->exec= armature_hide_exec; - ot->poll= ED_operator_editarmature; + ot->exec = armature_hide_exec; + ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected"); @@ -3223,16 +3223,16 @@ static int armature_reveal_exec(bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_reveal(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reveal Bones"; - ot->idname= "ARMATURE_OT_reveal"; - ot->description= "Unhide all bones that have been tagged to be hidden in Edit Mode"; + ot->name = "Reveal Bones"; + ot->idname = "ARMATURE_OT_reveal"; + ot->description = "Unhide all bones that have been tagged to be hidden in Edit Mode"; /* api callbacks */ - ot->exec= armature_reveal_exec; - ot->poll= ED_operator_editarmature; + ot->exec = armature_reveal_exec; + ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } #if 0 // remove this? @@ -3432,16 +3432,16 @@ static int armature_extrude_exec(bContext *C, wmOperator *op) void ARMATURE_OT_extrude(wmOperatorType *ot) { /* identifiers */ - ot->name= "Extrude"; - ot->idname= "ARMATURE_OT_extrude"; - ot->description= "Create new bones from the selected joints"; + ot->name = "Extrude"; + ot->idname = "ARMATURE_OT_extrude"; + ot->description = "Create new bones from the selected joints"; /* api callbacks */ - ot->exec= armature_extrude_exec; - ot->poll= ED_operator_editarmature; + ot->exec = armature_extrude_exec; + ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ RNA_def_boolean(ot->srna, "forked", 0, "Forked", ""); @@ -3495,16 +3495,16 @@ static int armature_bone_primitive_add_exec(bContext *C, wmOperator *op) void ARMATURE_OT_bone_primitive_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Bone"; - ot->idname= "ARMATURE_OT_bone_primitive_add"; - ot->description= "Add a new bone located at the 3D-Cursor"; + ot->name = "Add Bone"; + ot->idname = "ARMATURE_OT_bone_primitive_add"; + ot->description = "Add a new bone located at the 3D-Cursor"; /* api callbacks */ ot->exec = armature_bone_primitive_add_exec; ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_string(ot->srna, "name", "Bone", MAXBONENAME, "Name", "Name of the newly created bone"); @@ -3587,16 +3587,16 @@ void ARMATURE_OT_subdivide(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Subdivide Multi"; - ot->idname= "ARMATURE_OT_subdivide"; - ot->description= "Break selected bones into chains of smaller bones"; + ot->name = "Subdivide Multi"; + ot->idname = "ARMATURE_OT_subdivide"; + ot->description = "Break selected bones into chains of smaller bones"; /* api callbacks */ ot->exec = armature_subdivide_exec; ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* Properties */ prop = RNA_def_int(ot->srna, "number_cuts", 1, 1, INT_MAX, "Number of Cuts", "", 1, 10); @@ -3691,16 +3691,16 @@ static int armature_switch_direction_exec(bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_switch_direction(wmOperatorType *ot) { /* identifiers */ - ot->name= "Switch Direction"; - ot->idname= "ARMATURE_OT_switch_direction"; - ot->description= "Change the direction that a chain of bones points in (head <-> tail swap)"; + ot->name = "Switch Direction"; + ot->idname = "ARMATURE_OT_switch_direction"; + ot->description = "Change the direction that a chain of bones points in (head <-> tail swap)"; /* api callbacks */ ot->exec = armature_switch_direction_exec; ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ***************** Parenting *********************** */ @@ -3866,9 +3866,9 @@ static int armature_parent_set_invoke(bContext *C, wmOperator *UNUSED(op), wmEve void ARMATURE_OT_parent_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Parent"; - ot->idname= "ARMATURE_OT_parent_set"; - ot->description= "Set the active bone as the parent of the selected bones"; + ot->name = "Make Parent"; + ot->idname = "ARMATURE_OT_parent_set"; + ot->description = "Set the active bone as the parent of the selected bones"; /* api callbacks */ ot->invoke = armature_parent_set_invoke; @@ -3876,7 +3876,7 @@ void ARMATURE_OT_parent_set(wmOperatorType *ot) ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_enum(ot->srna, "type", prop_editarm_make_parent_types, 0, "ParentType", "Type of parenting"); } @@ -3920,9 +3920,9 @@ static int armature_parent_clear_exec(bContext *C, wmOperator *op) void ARMATURE_OT_parent_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Parent"; - ot->idname= "ARMATURE_OT_parent_clear"; - ot->description= "Remove the parent-child relationship between selected bones and their parents"; + ot->name = "Clear Parent"; + ot->idname = "ARMATURE_OT_parent_clear"; + ot->description = "Remove the parent-child relationship between selected bones and their parents"; /* api callbacks */ ot->invoke = WM_menu_invoke; @@ -3930,9 +3930,9 @@ void ARMATURE_OT_parent_clear(wmOperatorType *ot) ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; - ot->prop= RNA_def_enum(ot->srna, "type", prop_editarm_clear_parent_types, 0, "ClearType", "What way to clear parenting"); + ot->prop = RNA_def_enum(ot->srna, "type", prop_editarm_clear_parent_types, 0, "ClearType", "What way to clear parenting"); } /* **************** Selections ******************/ @@ -3957,16 +3957,16 @@ static int armature_select_inverse_exec(bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_select_inverse(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Inverse"; - ot->idname= "ARMATURE_OT_select_inverse"; - ot->description= "Flip the selection status of bones (selected -> unselected, unselected -> selected)"; + ot->name = "Select Inverse"; + ot->idname = "ARMATURE_OT_select_inverse"; + ot->description = "Flip the selection status of bones (selected -> unselected, unselected -> selected)"; /* api callbacks */ - ot->exec= armature_select_inverse_exec; - ot->poll= ED_operator_editarmature; + ot->exec = armature_select_inverse_exec; + ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int armature_de_select_all_exec(bContext *C, wmOperator *op) @@ -4017,16 +4017,16 @@ static int armature_de_select_all_exec(bContext *C, wmOperator *op) void ARMATURE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "(De)select All"; - ot->idname= "ARMATURE_OT_select_all"; - ot->description= "Toggle selection status of all bones"; + ot->name = "(De)select All"; + ot->idname = "ARMATURE_OT_select_all"; + ot->description = "Toggle selection status of all bones"; /* api callbacks */ - ot->exec= armature_de_select_all_exec; - ot->poll= ED_operator_editarmature; + ot->exec = armature_de_select_all_exec; + ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_select_all(ot); } @@ -4098,16 +4098,16 @@ void ARMATURE_OT_select_hierarchy(wmOperatorType *ot) }; /* identifiers */ - ot->name= "Select Hierarchy"; - ot->idname= "ARMATURE_OT_select_hierarchy"; - ot->description= "Select immediate parent/children of selected bones"; + ot->name = "Select Hierarchy"; + ot->idname = "ARMATURE_OT_select_hierarchy"; + ot->description = "Select immediate parent/children of selected bones"; /* api callbacks */ - ot->exec= armature_select_hierarchy_exec; - ot->poll= ED_operator_editarmature; + ot->exec = armature_select_hierarchy_exec; + ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ RNA_def_enum(ot->srna, "direction", direction_items, @@ -4237,9 +4237,9 @@ static int armature_align_bones_exec(bContext *C, wmOperator *op) void ARMATURE_OT_align(wmOperatorType *ot) { /* identifiers */ - ot->name= "Align Bones"; - ot->idname= "ARMATURE_OT_align"; - ot->description= "Align selected bones to the active bone (or to their parent)"; + ot->name = "Align Bones"; + ot->idname = "ARMATURE_OT_align"; + ot->description = "Align selected bones to the active bone (or to their parent)"; /* api callbacks */ ot->invoke = WM_operator_confirm; @@ -4247,7 +4247,7 @@ void ARMATURE_OT_align(wmOperatorType *ot) ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ***************** Pose tools ********************* */ @@ -4957,8 +4957,8 @@ static int pose_clear_scale_exec(bContext *C, wmOperator *op) void POSE_OT_scale_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Pose Scale"; - ot->idname= "POSE_OT_scale_clear"; + ot->name = "Clear Pose Scale"; + ot->idname = "POSE_OT_scale_clear"; ot->description = "Reset scaling of selected bones to their default values"; /* api callbacks */ @@ -4966,7 +4966,7 @@ void POSE_OT_scale_clear(wmOperatorType *ot) ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -4978,8 +4978,8 @@ static int pose_clear_rot_exec(bContext *C, wmOperator *op) void POSE_OT_rot_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Pose Rotation"; - ot->idname= "POSE_OT_rot_clear"; + ot->name = "Clear Pose Rotation"; + ot->idname = "POSE_OT_rot_clear"; ot->description = "Reset rotations of selected bones to their default values"; /* api callbacks */ @@ -4987,7 +4987,7 @@ void POSE_OT_rot_clear(wmOperatorType *ot) ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -4999,8 +4999,8 @@ static int pose_clear_loc_exec(bContext *C, wmOperator *op) void POSE_OT_loc_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Pose Location"; - ot->idname= "POSE_OT_loc_clear"; + ot->name = "Clear Pose Location"; + ot->idname = "POSE_OT_loc_clear"; ot->description = "Reset locations of selected bones to their default values"; /* api callbacks */ @@ -5008,7 +5008,7 @@ void POSE_OT_loc_clear(wmOperatorType *ot) ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -5020,8 +5020,8 @@ static int pose_clear_transforms_exec(bContext *C, wmOperator *op) void POSE_OT_transforms_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Pose Transforms"; - ot->idname= "POSE_OT_transforms_clear"; + ot->name = "Clear Pose Transforms"; + ot->idname = "POSE_OT_transforms_clear"; ot->description = "Reset location, rotation, and scaling of selected bones to their default values"; /* api callbacks */ @@ -5029,7 +5029,7 @@ void POSE_OT_transforms_clear(wmOperatorType *ot) ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ***************** selections ********************** */ @@ -5081,16 +5081,16 @@ static int pose_de_select_all_exec(bContext *C, wmOperator *op) void POSE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "(De)select All"; - ot->idname= "POSE_OT_select_all"; - ot->description= "Toggle selection status of all bones"; + ot->name = "(De)select All"; + ot->idname = "POSE_OT_select_all"; + ot->description = "Toggle selection status of all bones"; /* api callbacks */ - ot->exec= pose_de_select_all_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_de_select_all_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_select_all(ot); } @@ -5125,16 +5125,16 @@ static int pose_select_parent_exec(bContext *C, wmOperator *UNUSED(op)) void POSE_OT_select_parent(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Parent Bone"; - ot->idname= "POSE_OT_select_parent"; - ot->description= "Select bones that are parents of the currently selected bones"; + ot->name = "Select Parent Bone"; + ot->idname = "POSE_OT_select_parent"; + ot->description = "Select bones that are parents of the currently selected bones"; /* api callbacks */ - ot->exec= pose_select_parent_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_select_parent_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -5190,16 +5190,16 @@ static int pose_hide_exec(bContext *C, wmOperator *op) void POSE_OT_hide(wmOperatorType *ot) { /* identifiers */ - ot->name= "Hide Selected"; - ot->idname= "POSE_OT_hide"; - ot->description= "Tag selected bones to not be visible in Pose Mode"; + ot->name = "Hide Selected"; + ot->idname = "POSE_OT_hide"; + ot->description = "Tag selected bones to not be visible in Pose Mode"; /* api callbacks */ - ot->exec= pose_hide_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_hide_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", ""); @@ -5236,16 +5236,16 @@ static int pose_reveal_exec(bContext *C, wmOperator *UNUSED(op)) void POSE_OT_reveal(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reveal Selected"; - ot->idname= "POSE_OT_reveal"; - ot->description= "Unhide all bones that have been tagged to be hidden in Pose Mode"; + ot->name = "Reveal Selected"; + ot->idname = "POSE_OT_reveal"; + ot->description = "Unhide all bones that have been tagged to be hidden in Pose Mode"; /* api callbacks */ - ot->exec= pose_reveal_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_reveal_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ************* RENAMING DISASTERS ************ */ @@ -5451,16 +5451,16 @@ static int armature_flip_names_exec (bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_flip_names (wmOperatorType *ot) { /* identifiers */ - ot->name= "Flip Names"; - ot->idname= "ARMATURE_OT_flip_names"; - ot->description= "Flips (and corrects) the axis suffixes of the names of selected bones"; + ot->name = "Flip Names"; + ot->idname = "ARMATURE_OT_flip_names"; + ot->description = "Flips (and corrects) the axis suffixes of the names of selected bones"; /* api callbacks */ - ot->exec= armature_flip_names_exec; - ot->poll= ED_operator_editarmature; + ot->exec = armature_flip_names_exec; + ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -5503,20 +5503,20 @@ void ARMATURE_OT_autoside_names (wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "AutoName by Axis"; - ot->idname= "ARMATURE_OT_autoside_names"; - ot->description= "Automatically renames the selected bones according to which side of the target axis they fall on"; + ot->name = "AutoName by Axis"; + ot->idname = "ARMATURE_OT_autoside_names"; + ot->description = "Automatically renames the selected bones according to which side of the target axis they fall on"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= armature_autoside_names_exec; - ot->poll= ED_operator_editarmature; + ot->invoke = WM_menu_invoke; + ot->exec = armature_autoside_names_exec; + ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* settings */ - ot->prop= RNA_def_enum(ot->srna, "type", axis_items, 0, "Axis", "Axis tag names with"); + ot->prop = RNA_def_enum(ot->srna, "type", axis_items, 0, "Axis", "Axis tag names with"); } diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c index 27e2d12a288..5e5789d411f 100644 --- a/source/blender/editors/armature/editarmature_sketch.c +++ b/source/blender/editors/armature/editarmature_sketch.c @@ -2839,130 +2839,130 @@ int ED_operator_sketch_mode(const bContext *C) void SKETCH_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete"; - ot->idname= "SKETCH_OT_delete"; + ot->name = "Delete"; + ot->idname = "SKETCH_OT_delete"; /* api callbacks */ - ot->invoke= sketch_delete; + ot->invoke = sketch_delete; - ot->poll= ED_operator_sketch_full_mode; + ot->poll = ED_operator_sketch_full_mode; /* flags */ -// ot->flag= OPTYPE_UNDO; +// ot->flag = OPTYPE_UNDO; } void SKETCH_OT_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select"; - ot->idname= "SKETCH_OT_select"; + ot->name = "Select"; + ot->idname = "SKETCH_OT_select"; /* api callbacks */ - ot->invoke= sketch_select; + ot->invoke = sketch_select; - ot->poll= ED_operator_sketch_full_mode; + ot->poll = ED_operator_sketch_full_mode; /* flags */ -// ot->flag= OPTYPE_UNDO; +// ot->flag = OPTYPE_UNDO; } void SKETCH_OT_cancel_stroke(wmOperatorType *ot) { /* identifiers */ - ot->name= "Cancel Stroke"; - ot->idname= "SKETCH_OT_cancel_stroke"; + ot->name = "Cancel Stroke"; + ot->idname = "SKETCH_OT_cancel_stroke"; /* api callbacks */ - ot->invoke= sketch_cancel; + ot->invoke = sketch_cancel; - ot->poll= ED_operator_sketch_mode_active_stroke; + ot->poll = ED_operator_sketch_mode_active_stroke; /* flags */ -// ot->flag= OPTYPE_UNDO; +// ot->flag = OPTYPE_UNDO; } void SKETCH_OT_convert(wmOperatorType *ot) { /* identifiers */ - ot->name= "Convert"; - ot->idname= "SKETCH_OT_convert"; + ot->name = "Convert"; + ot->idname = "SKETCH_OT_convert"; /* api callbacks */ - ot->invoke= sketch_convert; + ot->invoke = sketch_convert; - ot->poll= ED_operator_sketch_full_mode; + ot->poll = ED_operator_sketch_full_mode; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; } void SKETCH_OT_finish_stroke(wmOperatorType *ot) { /* identifiers */ - ot->name= "End Stroke"; - ot->idname= "SKETCH_OT_finish_stroke"; + ot->name = "End Stroke"; + ot->idname = "SKETCH_OT_finish_stroke"; /* api callbacks */ - ot->invoke= sketch_finish; + ot->invoke = sketch_finish; - ot->poll= ED_operator_sketch_mode_active_stroke; + ot->poll = ED_operator_sketch_mode_active_stroke; /* flags */ -// ot->flag= OPTYPE_UNDO; +// ot->flag = OPTYPE_UNDO; } void SKETCH_OT_draw_preview(wmOperatorType *ot) { /* identifiers */ - ot->name= "Draw Preview"; - ot->idname= "SKETCH_OT_draw_preview"; + ot->name = "Draw Preview"; + ot->idname = "SKETCH_OT_draw_preview"; /* api callbacks */ - ot->invoke= sketch_draw_preview; + ot->invoke = sketch_draw_preview; - ot->poll= ED_operator_sketch_mode_active_stroke; + ot->poll = ED_operator_sketch_mode_active_stroke; RNA_def_boolean(ot->srna, "snap", 0, "Snap", ""); /* flags */ -// ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; +// ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } void SKETCH_OT_draw_stroke(wmOperatorType *ot) { /* identifiers */ - ot->name= "Draw Stroke"; - ot->idname= "SKETCH_OT_draw_stroke"; + ot->name = "Draw Stroke"; + ot->idname = "SKETCH_OT_draw_stroke"; /* api callbacks */ ot->invoke = sketch_draw_stroke; ot->modal = sketch_draw_stroke_modal; ot->cancel = sketch_draw_stroke_cancel; - ot->poll= (int (*)(bContext *))ED_operator_sketch_mode; + ot->poll = (int (*)(bContext *))ED_operator_sketch_mode; RNA_def_boolean(ot->srna, "snap", 0, "Snap", ""); /* flags */ - ot->flag= OPTYPE_BLOCKING; // OPTYPE_REGISTER|OPTYPE_UNDO + ot->flag = OPTYPE_BLOCKING; // OPTYPE_REGISTER|OPTYPE_UNDO } void SKETCH_OT_gesture(wmOperatorType *ot) { /* identifiers */ - ot->name= "Gesture"; - ot->idname= "SKETCH_OT_gesture"; + ot->name = "Gesture"; + ot->idname = "SKETCH_OT_gesture"; /* api callbacks */ ot->invoke = sketch_draw_gesture; ot->modal = sketch_draw_gesture_modal; ot->cancel = sketch_draw_gesture_cancel; - ot->poll= ED_operator_sketch_mode_gesture; + ot->poll = ED_operator_sketch_mode_gesture; RNA_def_boolean(ot->srna, "snap", 0, "Snap", ""); /* flags */ - ot->flag= OPTYPE_BLOCKING; // OPTYPE_UNDO + ot->flag = OPTYPE_BLOCKING; // OPTYPE_UNDO } diff --git a/source/blender/editors/armature/poseSlide.c b/source/blender/editors/armature/poseSlide.c index adabf7405d6..de7a243f75f 100644 --- a/source/blender/editors/armature/poseSlide.c +++ b/source/blender/editors/armature/poseSlide.c @@ -762,19 +762,19 @@ static int pose_slide_push_exec (bContext *C, wmOperator *op) void POSE_OT_push (wmOperatorType *ot) { /* identifiers */ - ot->name= "Push Pose"; - ot->idname= "POSE_OT_push"; - ot->description= "Exaggerate the current pose"; + ot->name = "Push Pose"; + ot->idname = "POSE_OT_push"; + ot->description = "Exaggerate the current pose"; /* callbacks */ - ot->exec= pose_slide_push_exec; - ot->invoke= pose_slide_push_invoke; - ot->modal= pose_slide_modal; - ot->cancel= pose_slide_cancel; - ot->poll= ED_operator_posemode; + ot->exec = pose_slide_push_exec; + ot->invoke = pose_slide_push_invoke; + ot->modal = pose_slide_modal; + ot->cancel = pose_slide_cancel; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; /* Properties */ pose_slide_opdef_properties(ot); @@ -819,19 +819,19 @@ static int pose_slide_relax_exec (bContext *C, wmOperator *op) void POSE_OT_relax (wmOperatorType *ot) { /* identifiers */ - ot->name= "Relax Pose"; - ot->idname= "POSE_OT_relax"; - ot->description= "Make the current pose more similar to its surrounding ones"; + ot->name = "Relax Pose"; + ot->idname = "POSE_OT_relax"; + ot->description = "Make the current pose more similar to its surrounding ones"; /* callbacks */ - ot->exec= pose_slide_relax_exec; - ot->invoke= pose_slide_relax_invoke; - ot->modal= pose_slide_modal; - ot->cancel= pose_slide_cancel; - ot->poll= ED_operator_posemode; + ot->exec = pose_slide_relax_exec; + ot->invoke = pose_slide_relax_invoke; + ot->modal = pose_slide_modal; + ot->cancel = pose_slide_cancel; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; /* Properties */ pose_slide_opdef_properties(ot); @@ -876,19 +876,19 @@ static int pose_slide_breakdown_exec (bContext *C, wmOperator *op) void POSE_OT_breakdown (wmOperatorType *ot) { /* identifiers */ - ot->name= "Pose Breakdowner"; - ot->idname= "POSE_OT_breakdown"; - ot->description= "Create a suitable breakdown pose on the current frame"; + ot->name = "Pose Breakdowner"; + ot->idname = "POSE_OT_breakdown"; + ot->description = "Create a suitable breakdown pose on the current frame"; /* callbacks */ - ot->exec= pose_slide_breakdown_exec; - ot->invoke= pose_slide_breakdown_invoke; - ot->modal= pose_slide_modal; - ot->cancel= pose_slide_cancel; - ot->poll= ED_operator_posemode; + ot->exec = pose_slide_breakdown_exec; + ot->invoke = pose_slide_breakdown_invoke; + ot->modal = pose_slide_modal; + ot->cancel = pose_slide_cancel; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; /* Properties */ pose_slide_opdef_properties(ot); @@ -1240,20 +1240,20 @@ void POSE_OT_propagate (wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Propagate Pose"; - ot->idname= "POSE_OT_propagate"; - ot->description= "Copy selected aspects of the current pose to subsequent poses already keyframed"; + ot->name = "Propagate Pose"; + ot->idname = "POSE_OT_propagate"; + ot->description = "Copy selected aspects of the current pose to subsequent poses already keyframed"; /* callbacks */ - ot->exec= pose_propagate_exec; - ot->poll= ED_operator_posemode; // XXX: needs selected bones! + ot->exec = pose_propagate_exec; + ot->poll = ED_operator_posemode; // XXX: needs selected bones! /* flag */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ // TODO: add "fade out" control for tapering off amount of propagation as time goes by? - ot->prop= RNA_def_enum(ot->srna, "mode", terminate_items, POSE_PROPAGATE_SMART_HOLDS, "Terminate Mode", "Method used to determine when to stop propagating pose to keyframes"); + ot->prop = RNA_def_enum(ot->srna, "mode", terminate_items, POSE_PROPAGATE_SMART_HOLDS, "Terminate Mode", "Method used to determine when to stop propagating pose to keyframes"); RNA_def_float(ot->srna, "end_frame", 250.0, FLT_MIN, FLT_MAX, "End Frame", "Frame to stop propagating frames to (for 'Before Frame' mode)", 1.0, 250.0); } diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c index ef01b895f38..fbe05d7ef49 100644 --- a/source/blender/editors/armature/poselib.c +++ b/source/blender/editors/armature/poselib.c @@ -241,10 +241,10 @@ void POSELIB_OT_new (wmOperatorType *ot) /* callbacks */ ot->exec = poselib_new_exec; - ot->poll= ED_operator_posemode; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ------------------------------------------------ */ @@ -276,10 +276,10 @@ void POSELIB_OT_unlink (wmOperatorType *ot) /* callbacks */ ot->exec = poselib_unlink_exec; - ot->poll= has_poselib_pose_data_poll; + ot->poll = has_poselib_pose_data_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ************************************************************* */ @@ -365,7 +365,7 @@ void POSELIB_OT_action_sanitise (wmOperatorType *ot) ot->poll = has_poselib_pose_data_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ------------------------------------------ */ @@ -486,17 +486,17 @@ static int poselib_add_exec (bContext *C, wmOperator *op) void POSELIB_OT_pose_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "PoseLib Add Pose"; - ot->idname= "POSELIB_OT_pose_add"; - ot->description= "Add the current Pose to the active Pose Library"; + ot->name = "PoseLib Add Pose"; + ot->idname = "POSELIB_OT_pose_add"; + ot->description = "Add the current Pose to the active Pose Library"; /* api callbacks */ - ot->invoke= poselib_add_menu_invoke; - ot->exec= poselib_add_exec; - ot->poll= ED_operator_posemode; + ot->invoke = poselib_add_menu_invoke; + ot->exec = poselib_add_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_int(ot->srna, "frame", 1, 0, INT_MAX, "Frame", "Frame to store pose on", 0, INT_MAX); @@ -592,22 +592,22 @@ void POSELIB_OT_pose_remove (wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "PoseLib Remove Pose"; - ot->idname= "POSELIB_OT_pose_remove"; - ot->description= "Remove nth pose from the active Pose Library"; + ot->name = "PoseLib Remove Pose"; + ot->idname = "POSELIB_OT_pose_remove"; + ot->description = "Remove nth pose from the active Pose Library"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= poselib_remove_exec; - ot->poll= has_poselib_pose_data_poll; + ot->invoke = WM_menu_invoke; + ot->exec = poselib_remove_exec; + ot->poll = has_poselib_pose_data_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ prop= RNA_def_enum(ot->srna, "pose", DummyRNA_DEFAULT_items, 0, "Pose", "The pose to remove"); RNA_def_enum_funcs(prop, poselib_stored_pose_itemf); - ot->prop= prop; + ot->prop = prop; } static int poselib_rename_invoke (bContext *C, wmOperator *op, wmEvent *evt) @@ -682,21 +682,21 @@ void POSELIB_OT_pose_rename (wmOperatorType *ot) }; /* identifiers */ - ot->name= "PoseLib Rename Pose"; - ot->idname= "POSELIB_OT_pose_rename"; - ot->description= "Rename specified pose from the active Pose Library"; + ot->name = "PoseLib Rename Pose"; + ot->idname = "POSELIB_OT_pose_rename"; + ot->description = "Rename specified pose from the active Pose Library"; /* api callbacks */ - ot->invoke= poselib_rename_invoke; - ot->exec= poselib_rename_exec; - ot->poll= has_poselib_pose_data_poll; + ot->invoke = poselib_rename_invoke; + ot->exec = poselib_rename_exec; + ot->poll = has_poselib_pose_data_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ /* NOTE: name not pose is the operator's "main" property, so that it will get activated in the popup for easy renaming */ - ot->prop= RNA_def_string(ot->srna, "name", "RenamedPose", 64, "New Pose Name", "New name for pose"); + ot->prop = RNA_def_string(ot->srna, "name", "RenamedPose", 64, "New Pose Name", "New name for pose"); prop= RNA_def_enum(ot->srna, "pose", prop_poses_dummy_types, 0, "Pose", "The pose to rename"); RNA_def_enum_funcs(prop, poselib_stored_pose_itemf); } @@ -1613,23 +1613,23 @@ static int poselib_preview_exec (bContext *C, wmOperator *op) void POSELIB_OT_browse_interactive (wmOperatorType *ot) { /* identifiers */ - ot->name= "PoseLib Browse Poses"; - ot->idname= "POSELIB_OT_browse_interactive"; - ot->description= "Interactively browse poses in 3D-View"; + ot->name = "PoseLib Browse Poses"; + ot->idname = "POSELIB_OT_browse_interactive"; + ot->description = "Interactively browse poses in 3D-View"; /* callbacks */ - ot->invoke= poselib_preview_invoke; - ot->modal= poselib_preview_modal; - ot->cancel= poselib_preview_cancel; - ot->exec= poselib_preview_exec; - ot->poll= has_poselib_pose_data_poll; + ot->invoke = poselib_preview_invoke; + ot->modal = poselib_preview_modal; + ot->cancel = poselib_preview_cancel; + ot->exec = poselib_preview_exec; + ot->poll = has_poselib_pose_data_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; /* properties */ // TODO: make the pose_index into a proper enum instead of a cryptic int... - ot->prop= RNA_def_int(ot->srna, "pose_index", -1, -2, INT_MAX, "Pose", "Index of the pose to apply (-2 for no change to pose, -1 for poselib active pose)", 0, INT_MAX); + ot->prop = RNA_def_int(ot->srna, "pose_index", -1, -2, INT_MAX, "Pose", "Index of the pose to apply (-2 for no change to pose, -1 for poselib active pose)", 0, INT_MAX); // XXX: percentage vs factor? /* not used yet */ @@ -1644,13 +1644,13 @@ void POSELIB_OT_apply_pose (wmOperatorType *ot) ot->description = "Apply specified Pose Library pose to the rig"; /* callbacks */ - ot->exec= poselib_preview_exec; - ot->poll= has_poselib_pose_data_poll; + ot->exec = poselib_preview_exec; + ot->poll = has_poselib_pose_data_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ // TODO: make the pose_index into a proper enum instead of a cryptic int... - ot->prop= RNA_def_int(ot->srna, "pose_index", -1, -2, INT_MAX, "Pose", "Index of the pose to apply (-2 for no change to pose, -1 for poselib active pose)", 0, INT_MAX); + ot->prop = RNA_def_int(ot->srna, "pose_index", -1, -2, INT_MAX, "Pose", "Index of the pose to apply (-2 for no change to pose, -1 for poselib active pose)", 0, INT_MAX); } diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c index 282519896c7..2689ec68563 100644 --- a/source/blender/editors/armature/poseobject.c +++ b/source/blender/editors/armature/poseobject.c @@ -236,16 +236,16 @@ static int pose_calculate_paths_exec (bContext *C, wmOperator *op) void POSE_OT_paths_calculate (wmOperatorType *ot) { /* identifiers */ - ot->name= "Calculate Bone Paths"; - ot->idname= "POSE_OT_paths_calculate"; - ot->description= "Calculate paths for the selected bones"; + ot->name = "Calculate Bone Paths"; + ot->idname = "POSE_OT_paths_calculate"; + ot->description = "Calculate paths for the selected bones"; /* api callbacks */ - ot->exec= pose_calculate_paths_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_calculate_paths_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* --------- */ @@ -304,13 +304,13 @@ static int pose_clear_paths_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_paths_clear (wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Bone Paths"; - ot->idname= "POSE_OT_paths_clear"; - ot->description= "Clear path caches for selected bones"; + ot->name = "Clear Bone Paths"; + ot->idname = "POSE_OT_paths_clear"; + ot->description = "Clear path caches for selected bones"; /* api callbacks */ - ot->exec= pose_clear_paths_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_clear_paths_exec; + ot->poll = ED_operator_posemode; /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; @@ -364,16 +364,16 @@ static int pose_select_constraint_target_exec(bContext *C, wmOperator *UNUSED(op void POSE_OT_select_constraint_target(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Constraint Target"; - ot->idname= "POSE_OT_select_constraint_target"; - ot->description= "Select bones used as targets for the currently selected bones"; + ot->name = "Select Constraint Target"; + ot->idname = "POSE_OT_select_constraint_target"; + ot->description = "Select bones used as targets for the currently selected bones"; /* api callbacks */ - ot->exec= pose_select_constraint_target_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_select_constraint_target_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************* select hierarchy operator ************* */ @@ -441,19 +441,19 @@ void POSE_OT_select_hierarchy(wmOperatorType *ot) }; /* identifiers */ - ot->name= "Select Hierarchy"; - ot->idname= "POSE_OT_select_hierarchy"; - ot->description= "Select immediate parent/children of selected bones"; + ot->name = "Select Hierarchy"; + ot->idname = "POSE_OT_select_hierarchy"; + ot->description = "Select immediate parent/children of selected bones"; /* api callbacks */ - ot->exec= pose_select_hierarchy_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_select_hierarchy_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_enum(ot->srna, "direction", direction_items, BONE_SELECT_PARENT, "Direction", ""); + ot->prop = RNA_def_enum(ot->srna, "direction", direction_items, BONE_SELECT_PARENT, "Direction", ""); RNA_def_boolean(ot->srna, "extend", 0, "Add to Selection", ""); } @@ -661,21 +661,21 @@ void POSE_OT_select_grouped (wmOperatorType *ot) }; /* identifiers */ - ot->name= "Select Grouped"; + ot->name = "Select Grouped"; ot->description = "Select all visible bones grouped by similar properties"; - ot->idname= "POSE_OT_select_grouped"; + ot->idname = "POSE_OT_select_grouped"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= pose_select_grouped_exec; - ot->poll= ED_operator_posemode; + ot->invoke = WM_menu_invoke; + ot->exec = pose_select_grouped_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "extend", FALSE, "Extend", "Extend selection instead of deselecting everything first"); - ot->prop= RNA_def_enum(ot->srna, "type", prop_select_grouped_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_select_grouped_types, 0, "Type", ""); } @@ -721,13 +721,13 @@ static int pose_bone_flip_active_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_select_flip_active(wmOperatorType *ot) { /* identifiers */ - ot->name= "Flip Selected Active Bone"; - ot->idname= "POSE_OT_select_flip_active"; - ot->description= "Activate the bone with a flipped name"; + ot->name = "Flip Selected Active Bone"; + ot->idname = "POSE_OT_select_flip_active"; + ot->description = "Activate the bone with a flipped name"; /* api callbacks */ - ot->exec= pose_bone_flip_active_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_bone_flip_active_exec; + ot->poll = ED_operator_posemode; /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1129,16 +1129,16 @@ static int pose_copy_exec (bContext *C, wmOperator *op) void POSE_OT_copy (wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Pose"; - ot->idname= "POSE_OT_copy"; - ot->description= "Copies the current pose of the selected bones to copy/paste buffer"; + ot->name = "Copy Pose"; + ot->idname = "POSE_OT_copy"; + ot->description = "Copies the current pose of the selected bones to copy/paste buffer"; /* api callbacks */ - ot->exec= pose_copy_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_copy_exec; + ot->poll = ED_operator_posemode; /* flag */ - ot->flag= OPTYPE_REGISTER; + ot->flag = OPTYPE_REGISTER; } /* ---- */ @@ -1196,16 +1196,16 @@ static int pose_paste_exec (bContext *C, wmOperator *op) void POSE_OT_paste (wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste Pose"; - ot->idname= "POSE_OT_paste"; - ot->description= "Paste the stored pose on to the current pose"; + ot->name = "Paste Pose"; + ot->idname = "POSE_OT_paste"; + ot->description = "Paste the stored pose on to the current pose"; /* api callbacks */ - ot->exec= pose_paste_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_paste_exec; + ot->poll = ED_operator_posemode; /* flag */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "flipped", FALSE, "Flipped on X-Axis", "Paste the stored pose flipped on to current pose"); @@ -1242,13 +1242,13 @@ static int pose_group_add_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_group_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Bone Group"; - ot->idname= "POSE_OT_group_add"; - ot->description= "Add a new bone group"; + ot->name = "Add Bone Group"; + ot->idname = "POSE_OT_group_add"; + ot->description = "Add a new bone group"; /* api callbacks */ - ot->exec= pose_group_add_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_group_add_exec; + ot->poll = ED_operator_posemode; /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1282,13 +1282,13 @@ static int pose_group_remove_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_group_remove (wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Bone Group"; - ot->idname= "POSE_OT_group_remove"; - ot->description= "Removes the active bone group"; + ot->name = "Remove Bone Group"; + ot->idname = "POSE_OT_group_remove"; + ot->description = "Removes the active bone group"; /* api callbacks */ - ot->exec= pose_group_remove_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_group_remove_exec; + ot->poll = ED_operator_posemode; /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1397,14 +1397,14 @@ static int pose_group_assign_exec (bContext *C, wmOperator *op) void POSE_OT_group_assign (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Selected to Bone Group"; - ot->idname= "POSE_OT_group_assign"; - ot->description= "Add selected bones to the chosen bone group"; + ot->name = "Add Selected to Bone Group"; + ot->idname = "POSE_OT_group_assign"; + ot->description = "Add selected bones to the chosen bone group"; /* api callbacks */ - ot->invoke= pose_groups_menu_invoke; - ot->exec= pose_group_assign_exec; - ot->poll= ED_operator_posemode; + ot->invoke = pose_groups_menu_invoke; + ot->exec = pose_group_assign_exec; + ot->poll = ED_operator_posemode; /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1453,13 +1453,13 @@ static int pose_group_unassign_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_group_unassign (wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Selected from Bone Groups"; - ot->idname= "POSE_OT_group_unassign"; - ot->description= "Remove selected bones from all bone groups"; + ot->name = "Remove Selected from Bone Groups"; + ot->idname = "POSE_OT_group_unassign"; + ot->description = "Remove selected bones from all bone groups"; /* api callbacks */ - ot->exec= pose_group_unassign_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_group_unassign_exec; + ot->poll = ED_operator_posemode; /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1534,16 +1534,16 @@ void POSE_OT_group_move(wmOperatorType *ot) }; /* identifiers */ - ot->name= "Move Bone Group"; - ot->idname= "POSE_OT_group_move"; - ot->description= "Change position of active Bone Group in list of Bone Groups"; + ot->name = "Move Bone Group"; + ot->idname = "POSE_OT_group_move"; + ot->description = "Change position of active Bone Group in list of Bone Groups"; /* api callbacks */ - ot->exec= group_move_exec; - ot->poll= ED_operator_posemode; + ot->exec = group_move_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_enum(ot->srna, "direction", group_slot_move, 0, "Direction", "Direction to move, UP or DOWN"); } @@ -1618,16 +1618,16 @@ static int group_sort_exec(bContext *C, wmOperator *UNUSED(op)) void POSE_OT_group_sort(wmOperatorType *ot) { /* identifiers */ - ot->name= "Sort Bone Groups"; - ot->idname= "POSE_OT_group_sort"; - ot->description= "Sort Bone Groups by their names in ascending order"; + ot->name = "Sort Bone Groups"; + ot->idname = "POSE_OT_group_sort"; + ot->description = "Sort Bone Groups by their names in ascending order"; /* api callbacks */ - ot->exec= group_sort_exec; - ot->poll= ED_operator_posemode; + ot->exec = group_sort_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static void pose_group_select(bContext *C, Object *ob, int select) @@ -1676,13 +1676,13 @@ static int pose_group_select_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_group_select (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Bones of Bone Group"; - ot->idname= "POSE_OT_group_select"; - ot->description= "Select bones in active Bone Group"; + ot->name = "Select Bones of Bone Group"; + ot->idname = "POSE_OT_group_select"; + ot->description = "Select bones in active Bone Group"; /* api callbacks */ - ot->exec= pose_group_select_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_group_select_exec; + ot->poll = ED_operator_posemode; /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1714,13 +1714,13 @@ static int pose_group_deselect_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_group_deselect (wmOperatorType *ot) { /* identifiers */ - ot->name= "Deselect Bone Group"; - ot->idname= "POSE_OT_group_deselect"; - ot->description= "Deselect bones of active Bone Group"; + ot->name = "Deselect Bone Group"; + ot->idname = "POSE_OT_group_deselect"; + ot->description = "Deselect bones of active Bone Group"; /* api callbacks */ - ot->exec= pose_group_deselect_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_group_deselect_exec; + ot->poll = ED_operator_posemode; /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1759,16 +1759,16 @@ static int pose_flip_names_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_flip_names (wmOperatorType *ot) { /* identifiers */ - ot->name= "Flip Names"; - ot->idname= "POSE_OT_flip_names"; - ot->description= "Flips (and corrects) the axis suffixes of the the names of selected bones"; + ot->name = "Flip Names"; + ot->idname = "POSE_OT_flip_names"; + ot->description = "Flips (and corrects) the axis suffixes of the the names of selected bones"; /* api callbacks */ - ot->exec= pose_flip_names_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_flip_names_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ------------------ */ @@ -1812,20 +1812,20 @@ void POSE_OT_autoside_names (wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "AutoName by Axis"; - ot->idname= "POSE_OT_autoside_names"; - ot->description= "Automatically renames the selected bones according to which side of the target axis they fall on"; + ot->name = "AutoName by Axis"; + ot->idname = "POSE_OT_autoside_names"; + ot->description = "Automatically renames the selected bones according to which side of the target axis they fall on"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= pose_autoside_names_exec; - ot->poll= ED_operator_posemode; + ot->invoke = WM_menu_invoke; + ot->exec = pose_autoside_names_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* settings */ - ot->prop= RNA_def_enum(ot->srna, "axis", axis_items, 0, "Axis", "Axis tag names with"); + ot->prop = RNA_def_enum(ot->srna, "axis", axis_items, 0, "Axis", "Axis tag names with"); } /* ********************************************** */ @@ -1852,20 +1852,20 @@ static int pose_bone_rotmode_exec (bContext *C, wmOperator *op) void POSE_OT_rotation_mode_set (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Rotation Mode"; - ot->idname= "POSE_OT_rotation_mode_set"; - ot->description= "Set the rotation representation used by selected bones"; + ot->name = "Set Rotation Mode"; + ot->idname = "POSE_OT_rotation_mode_set"; + ot->description = "Set the rotation representation used by selected bones"; /* callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= pose_bone_rotmode_exec; - ot->poll= ED_operator_posemode; + ot->invoke = WM_menu_invoke; + ot->exec = pose_bone_rotmode_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", posebone_rotmode_items, 0, "Rotation Mode", ""); + ot->prop = RNA_def_enum(ot->srna, "type", posebone_rotmode_items, 0, "Rotation Mode", ""); } /* ********************************************** */ @@ -1911,16 +1911,16 @@ static int pose_armature_layers_showall_exec (bContext *C, wmOperator *op) void ARMATURE_OT_layers_show_all (wmOperatorType *ot) { /* identifiers */ - ot->name= "Show All Layers"; - ot->idname= "ARMATURE_OT_layers_show_all"; - ot->description= "Make all armature layers visible"; + ot->name = "Show All Layers"; + ot->idname = "ARMATURE_OT_layers_show_all"; + ot->description = "Make all armature layers visible"; /* callbacks */ - ot->exec= pose_armature_layers_showall_exec; - ot->poll= pose_armature_layers_showall_poll; + ot->exec = pose_armature_layers_showall_exec; + ot->poll = pose_armature_layers_showall_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ ot->prop = RNA_def_boolean(ot->srna, "all", 1, "All Layers", "Enable all layers or just the first 16 (top row)"); @@ -1977,17 +1977,17 @@ static int pose_armature_layers_exec (bContext *C, wmOperator *op) void POSE_OT_armature_layers (wmOperatorType *ot) { /* identifiers */ - ot->name= "Change Armature Layers"; - ot->idname= "POSE_OT_armature_layers"; - ot->description= "Change the visible armature layers"; + ot->name = "Change Armature Layers"; + ot->idname = "POSE_OT_armature_layers"; + ot->description = "Change the visible armature layers"; /* callbacks */ - ot->invoke= pose_armature_layers_invoke; - ot->exec= pose_armature_layers_exec; - ot->poll= ED_operator_posemode; + ot->invoke = pose_armature_layers_invoke; + ot->exec = pose_armature_layers_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean_layer_member(ot->srna, "layers", 32, NULL, "Layer", "Armature layers to make visible"); @@ -1996,17 +1996,17 @@ void POSE_OT_armature_layers (wmOperatorType *ot) void ARMATURE_OT_armature_layers (wmOperatorType *ot) { /* identifiers */ - ot->name= "Change Armature Layers"; - ot->idname= "ARMATURE_OT_armature_layers"; - ot->description= "Change the visible armature layers"; + ot->name = "Change Armature Layers"; + ot->idname = "ARMATURE_OT_armature_layers"; + ot->description = "Change the visible armature layers"; /* callbacks */ - ot->invoke= pose_armature_layers_invoke; - ot->exec= pose_armature_layers_exec; - ot->poll= ED_operator_editarmature; + ot->invoke = pose_armature_layers_invoke; + ot->exec = pose_armature_layers_exec; + ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean_layer_member(ot->srna, "layers", 32, NULL, "Layer", "Armature layers to make visible"); @@ -2071,17 +2071,17 @@ static int pose_bone_layers_exec (bContext *C, wmOperator *op) void POSE_OT_bone_layers (wmOperatorType *ot) { /* identifiers */ - ot->name= "Change Bone Layers"; - ot->idname= "POSE_OT_bone_layers"; - ot->description= "Change the layers that the selected bones belong to"; + ot->name = "Change Bone Layers"; + ot->idname = "POSE_OT_bone_layers"; + ot->description = "Change the layers that the selected bones belong to"; /* callbacks */ - ot->invoke= pose_bone_layers_invoke; - ot->exec= pose_bone_layers_exec; - ot->poll= ED_operator_posemode; + ot->invoke = pose_bone_layers_invoke; + ot->exec = pose_bone_layers_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean_layer_member(ot->srna, "layers", 32, NULL, "Layer", "Armature layers that bone belongs to"); @@ -2143,17 +2143,17 @@ static int armature_bone_layers_exec (bContext *C, wmOperator *op) void ARMATURE_OT_bone_layers (wmOperatorType *ot) { /* identifiers */ - ot->name= "Change Bone Layers"; - ot->idname= "ARMATURE_OT_bone_layers"; - ot->description= "Change the layers that the selected bones belong to"; + ot->name = "Change Bone Layers"; + ot->idname = "ARMATURE_OT_bone_layers"; + ot->description = "Change the layers that the selected bones belong to"; /* callbacks */ - ot->invoke= armature_bone_layers_invoke; - ot->exec= armature_bone_layers_exec; - ot->poll= ED_operator_editarmature; + ot->invoke = armature_bone_layers_invoke; + ot->exec = armature_bone_layers_exec; + ot->poll = ED_operator_editarmature; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean_layer_member(ot->srna, "layers", 32, NULL, "Layer", "Armature layers that bone belongs to"); @@ -2192,15 +2192,15 @@ void POSE_OT_quaternions_flip (wmOperatorType *ot) { /* identifiers */ ot->name = "Flip Quats"; - ot->idname= "POSE_OT_quaternions_flip"; - ot->description= "Flip quaternion values to achieve desired rotations, while maintaining the same orientations"; + ot->idname = "POSE_OT_quaternions_flip"; + ot->description = "Flip quaternion values to achieve desired rotations, while maintaining the same orientations"; /* callbacks */ - ot->exec= pose_flip_quats_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_flip_quats_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ********************************************** */ @@ -2268,14 +2268,14 @@ void POSE_OT_user_transforms_clear (wmOperatorType *ot) { /* identifiers */ ot->name = "Clear User Transforms"; - ot->idname= "POSE_OT_user_transforms_clear"; - ot->description= "Reset pose on selected bones to keyframed state"; + ot->idname = "POSE_OT_user_transforms_clear"; + ot->description = "Reset pose on selected bones to keyframed state"; /* callbacks */ - ot->exec= pose_clear_user_transforms_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_clear_user_transforms_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index afa68ac5597..7b855398802 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -1400,15 +1400,15 @@ static int separate_exec(bContext *C, wmOperator *op) void CURVE_OT_separate(wmOperatorType *ot) { /* identifiers */ - ot->name= "Separate"; - ot->idname= "CURVE_OT_separate"; + ot->name = "Separate"; + ot->idname = "CURVE_OT_separate"; /* api callbacks */ - ot->exec= separate_exec; - ot->poll= ED_operator_editsurfcurve; + ot->exec = separate_exec; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************* FLAGS ********************* */ @@ -2008,16 +2008,16 @@ static int switch_direction_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_switch_direction(wmOperatorType *ot) { /* identifiers */ - ot->name= "Switch Direction"; - ot->description= "Switch direction of selected splines"; - ot->idname= "CURVE_OT_switch_direction"; + ot->name = "Switch Direction"; + ot->description = "Switch direction of selected splines"; + ot->idname = "CURVE_OT_switch_direction"; /* api callbacks */ - ot->exec= switch_direction_exec; - ot->poll= ED_operator_editsurfcurve; + ot->exec = switch_direction_exec; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /****************** set weight operator *******************/ @@ -2056,17 +2056,17 @@ static int set_goal_weight_exec(bContext *C, wmOperator *op) void CURVE_OT_spline_weight_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Goal Weight"; - ot->description= "Set softbody goal weight for selected points"; - ot->idname= "CURVE_OT_spline_weight_set"; + ot->name = "Set Goal Weight"; + ot->description = "Set softbody goal weight for selected points"; + ot->idname = "CURVE_OT_spline_weight_set"; /* api callbacks */ - ot->exec= set_goal_weight_exec; - ot->invoke= WM_operator_props_popup; - ot->poll= ED_operator_editsurfcurve; + ot->exec = set_goal_weight_exec; + ot->invoke = WM_operator_props_popup; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_float_factor(ot->srna, "weight", 1.0f, 0.0f, 1.0f, "Weight", "", 0.0f, 1.0f); @@ -2108,17 +2108,17 @@ static int set_radius_exec(bContext *C, wmOperator *op) void CURVE_OT_radius_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Curve Radius"; - ot->description= "Set per-point radius which is used for bevel tapering"; - ot->idname= "CURVE_OT_radius_set"; + ot->name = "Set Curve Radius"; + ot->description = "Set per-point radius which is used for bevel tapering"; + ot->idname = "CURVE_OT_radius_set"; /* api callbacks */ - ot->exec= set_radius_exec; - ot->invoke= WM_operator_props_popup; - ot->poll= ED_operator_editsurfcurve; + ot->exec = set_radius_exec; + ot->invoke = WM_operator_props_popup; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_float(ot->srna, "radius", 1.0f, 0.0f, FLT_MAX, "Radius", "", 0.0001f, 10.0f); @@ -2184,16 +2184,16 @@ static int smooth_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_smooth(wmOperatorType *ot) { /* identifiers */ - ot->name= "Smooth"; - ot->description= "Flatten angles of selected points"; - ot->idname= "CURVE_OT_smooth"; + ot->name = "Smooth"; + ot->description = "Flatten angles of selected points"; + ot->idname = "CURVE_OT_smooth"; /* api callbacks */ - ot->exec= smooth_exec; - ot->poll= ED_operator_editsurfcurve; + ot->exec = smooth_exec; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /**************** smooth curve radius operator *************/ @@ -2350,16 +2350,16 @@ static int smooth_radius_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_smooth_radius(wmOperatorType *ot) { /* identifiers */ - ot->name= "Smooth Curve Radius"; - ot->description= "Flatten radiuses of selected points"; - ot->idname= "CURVE_OT_smooth_radius"; + ot->name = "Smooth Curve Radius"; + ot->description = "Flatten radiuses of selected points"; + ot->idname = "CURVE_OT_smooth_radius"; /* api clastbacks */ - ot->exec= smooth_radius_exec; - ot->poll= ED_operator_editsurfcurve; + ot->exec = smooth_radius_exec; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /***************** selection utility *************************/ @@ -2502,15 +2502,15 @@ static int de_select_first_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_de_select_first(wmOperatorType *ot) { /* identifiers */ - ot->name= "(De)select First"; - ot->idname= "CURVE_OT_de_select_first"; + ot->name = "(De)select First"; + ot->idname = "CURVE_OT_de_select_first"; /* api cfirstbacks */ - ot->exec= de_select_first_exec; - ot->poll= ED_operator_editcurve; + ot->exec = de_select_first_exec; + ot->poll = ED_operator_editcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int de_select_last_exec(bContext *C, wmOperator *UNUSED(op)) @@ -2526,15 +2526,15 @@ static int de_select_last_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_de_select_last(wmOperatorType *ot) { /* identifiers */ - ot->name= "(De)select Last"; - ot->idname= "CURVE_OT_de_select_last"; + ot->name = "(De)select Last"; + ot->idname = "CURVE_OT_de_select_last"; /* api clastbacks */ - ot->exec= de_select_last_exec; - ot->poll= ED_operator_editcurve; + ot->exec = de_select_last_exec; + ot->poll = ED_operator_editcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /******************* de select all operator ***************/ @@ -2604,15 +2604,15 @@ static int de_select_all_exec(bContext *C, wmOperator *op) void CURVE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "(De)select All"; - ot->idname= "CURVE_OT_select_all"; + ot->name = "(De)select All"; + ot->idname = "CURVE_OT_select_all"; /* api callbacks */ - ot->exec= de_select_all_exec; - ot->poll= ED_operator_editsurfcurve; + ot->exec = de_select_all_exec; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ WM_operator_properties_select_all(ot); @@ -2678,15 +2678,15 @@ static int hide_exec(bContext *C, wmOperator *op) void CURVE_OT_hide(wmOperatorType *ot) { /* identifiers */ - ot->name= "Hide Selected"; - ot->idname= "CURVE_OT_hide"; + ot->name = "Hide Selected"; + ot->idname = "CURVE_OT_hide"; /* api callbacks */ - ot->exec= hide_exec; - ot->poll= ED_operator_editsurfcurve; + ot->exec = hide_exec; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected"); @@ -2738,15 +2738,15 @@ static int reveal_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_reveal(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reveal Hidden"; - ot->idname= "CURVE_OT_reveal"; + ot->name = "Reveal Hidden"; + ot->idname = "CURVE_OT_reveal"; /* api callbacks */ - ot->exec= reveal_exec; - ot->poll= ED_operator_editsurfcurve; + ot->exec = reveal_exec; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** subdivide operator *********************/ @@ -3174,16 +3174,16 @@ void CURVE_OT_subdivide(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Subdivide"; - ot->description= "Subdivide selected segments"; - ot->idname= "CURVE_OT_subdivide"; + ot->name = "Subdivide"; + ot->description = "Subdivide selected segments"; + ot->idname = "CURVE_OT_subdivide"; /* api callbacks */ - ot->exec= subdivide_exec; - ot->poll= ED_operator_editsurfcurve; + ot->exec = subdivide_exec; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; prop = RNA_def_int(ot->srna, "number_cuts", 1, 1, INT_MAX, "Number of cuts", "", 1, 10); /* avoid re-using last var because it can cause _very_ high poly meshes and annoy users (or worse crash) */ @@ -3502,20 +3502,20 @@ void CURVE_OT_spline_type_set(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Set Spline Type"; + ot->name = "Set Spline Type"; ot->description = "Set type of active spline"; - ot->idname= "CURVE_OT_spline_type_set"; + ot->idname = "CURVE_OT_spline_type_set"; /* api callbacks */ - ot->exec= set_spline_type_exec; - ot->invoke= WM_menu_invoke; - ot->poll= ED_operator_editcurve; + ot->exec = set_spline_type_exec; + ot->invoke = WM_menu_invoke; + ot->poll = ED_operator_editcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", type_items, CU_POLY, "Type", "Spline type"); + ot->prop = RNA_def_enum(ot->srna, "type", type_items, CU_POLY, "Type", "Spline type"); } /***************** set handle type operator *******************/ @@ -3545,20 +3545,20 @@ void CURVE_OT_handle_type_set(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Set Handle Type"; + ot->name = "Set Handle Type"; ot->description = "Set type of handles for selected control points"; - ot->idname= "CURVE_OT_handle_type_set"; + ot->idname = "CURVE_OT_handle_type_set"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= set_handle_type_exec; - ot->poll= ED_operator_editcurve; + ot->invoke = WM_menu_invoke; + ot->exec = set_handle_type_exec; + ot->poll = ED_operator_editcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", editcurve_handle_type_items, 1, "Type", "Spline type"); + ot->prop = RNA_def_enum(ot->srna, "type", editcurve_handle_type_items, 1, "Type", "Spline type"); } /***************** make segment operator **********************/ @@ -4080,15 +4080,15 @@ static int make_segment_exec(bContext *C, wmOperator *op) void CURVE_OT_make_segment(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Segment"; - ot->idname= "CURVE_OT_make_segment"; + ot->name = "Make Segment"; + ot->idname = "CURVE_OT_make_segment"; /* api callbacks */ - ot->exec= make_segment_exec; - ot->poll= ED_operator_editsurfcurve; + ot->exec = make_segment_exec; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /***************** pick select from 3d view **********************/ @@ -4310,16 +4310,16 @@ static int spin_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void CURVE_OT_spin(wmOperatorType *ot) { /* identifiers */ - ot->name= "Spin"; - ot->idname= "CURVE_OT_spin"; + ot->name = "Spin"; + ot->idname = "CURVE_OT_spin"; /* api callbacks */ - ot->exec= spin_exec; + ot->exec = spin_exec; ot->invoke = spin_invoke; - ot->poll= ED_operator_editsurf; + ot->poll = ED_operator_editsurf; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_float_vector_xyz(ot->srna, "center", 3, NULL, -FLT_MAX, FLT_MAX, "Center", "Center in global view space", -FLT_MAX, FLT_MAX); RNA_def_float_vector(ot->srna, "axis", 3, NULL, -1.0f, 1.0f, "Axis", "Axis in global view space", -FLT_MAX, FLT_MAX); @@ -4619,16 +4619,16 @@ static int add_vertex_invoke(bContext *C, wmOperator *op, wmEvent *event) void CURVE_OT_vertex_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Vertex"; - ot->idname= "CURVE_OT_vertex_add"; + ot->name = "Add Vertex"; + ot->idname = "CURVE_OT_vertex_add"; /* api callbacks */ - ot->exec= add_vertex_exec; - ot->invoke= add_vertex_invoke; - ot->poll= ED_operator_editcurve; + ot->exec = add_vertex_exec; + ot->invoke = add_vertex_invoke; + ot->poll = ED_operator_editcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_float_vector_xyz(ot->srna, "location", 3, NULL, -FLT_MAX, FLT_MAX, "Location", "Location to add new vertex at", -1e4, 1e4); @@ -4667,16 +4667,16 @@ static int extrude_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_extrude(wmOperatorType *ot) { /* identifiers */ - ot->name= "Extrude"; + ot->name = "Extrude"; ot->description = "Extrude selected control point(s) and move"; - ot->idname= "CURVE_OT_extrude"; + ot->idname = "CURVE_OT_extrude"; /* api callbacks */ - ot->exec= extrude_exec; - ot->poll= ED_operator_editsurfcurve; + ot->exec = extrude_exec; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* to give to transform */ RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); @@ -4795,17 +4795,17 @@ void CURVE_OT_cyclic_toggle(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Toggle Cyclic"; + ot->name = "Toggle Cyclic"; ot->description = "Make active spline closed/opened loop"; - ot->idname= "CURVE_OT_cyclic_toggle"; + ot->idname = "CURVE_OT_cyclic_toggle"; /* api callbacks */ - ot->exec= toggle_cyclic_exec; - ot->invoke= toggle_cyclic_invoke; - ot->poll= ED_operator_editsurfcurve; + ot->exec = toggle_cyclic_exec; + ot->invoke = toggle_cyclic_invoke; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_enum(ot->srna, "direction", direction_items, 0, "Direction", "Direction to make surface cyclic in"); @@ -4872,16 +4872,16 @@ static int select_linked_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve void CURVE_OT_select_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Linked All"; - ot->idname= "CURVE_OT_select_linked"; + ot->name = "Select Linked All"; + ot->idname = "CURVE_OT_select_linked"; /* api callbacks */ - ot->exec= select_linked_exec; - ot->invoke= select_linked_invoke; - ot->poll= ED_operator_editsurfcurve; + ot->exec = select_linked_exec; + ot->invoke = select_linked_invoke; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ } @@ -4932,15 +4932,15 @@ static int select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent *event void CURVE_OT_select_linked_pick(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Linked"; - ot->idname= "CURVE_OT_select_linked_pick"; + ot->name = "Select Linked"; + ot->idname = "CURVE_OT_select_linked_pick"; /* api callbacks */ - ot->invoke= select_linked_pick_invoke; - ot->poll= ED_operator_editsurfcurve_region_view3d; + ot->invoke = select_linked_pick_invoke; + ot->poll = ED_operator_editsurfcurve_region_view3d; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", "Deselect linked control points rather than selecting them"); @@ -5010,15 +5010,15 @@ static int select_row_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_select_row(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Control Point Row"; - ot->idname= "CURVE_OT_select_row"; + ot->name = "Select Control Point Row"; + ot->idname = "CURVE_OT_select_row"; /* api callbacks */ - ot->exec= select_row_exec; - ot->poll= ED_operator_editsurf; + ot->exec = select_row_exec; + ot->poll = ED_operator_editsurf; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /***************** select next operator **********************/ @@ -5037,15 +5037,15 @@ static int select_next_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_select_next(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Next"; - ot->idname= "CURVE_OT_select_next"; + ot->name = "Select Next"; + ot->idname = "CURVE_OT_select_next"; /* api callbacks */ - ot->exec= select_next_exec; - ot->poll= ED_operator_editcurve; + ot->exec = select_next_exec; + ot->poll = ED_operator_editcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /***************** select previous operator **********************/ @@ -5064,15 +5064,15 @@ static int select_previous_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_select_previous(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Previous"; - ot->idname= "CURVE_OT_select_previous"; + ot->name = "Select Previous"; + ot->idname = "CURVE_OT_select_previous"; /* api callbacks */ - ot->exec= select_previous_exec; - ot->poll= ED_operator_editcurve; + ot->exec = select_previous_exec; + ot->poll = ED_operator_editcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /***************** select more operator **********************/ @@ -5151,15 +5151,15 @@ static int select_more_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_select_more(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select More"; - ot->idname= "CURVE_OT_select_more"; + ot->name = "Select More"; + ot->idname = "CURVE_OT_select_more"; /* api callbacks */ - ot->exec= select_more_exec; - ot->poll= ED_operator_editsurfcurve; + ot->exec = select_more_exec; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /******************** select less operator *****************/ @@ -5312,15 +5312,15 @@ static int select_less_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_select_less(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Less"; - ot->idname= "CURVE_OT_select_less"; + ot->name = "Select Less"; + ot->idname = "CURVE_OT_select_less"; /* api callbacks */ - ot->exec= select_less_exec; - ot->poll= ED_operator_editsurfcurve; + ot->exec = select_less_exec; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** select random *********************/ @@ -5375,15 +5375,15 @@ static int select_random_exec(bContext *C, wmOperator *op) void CURVE_OT_select_random(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Random"; - ot->idname= "CURVE_OT_select_random"; + ot->name = "Select Random"; + ot->idname = "CURVE_OT_select_random"; /* api callbacks */ - ot->exec= select_random_exec; - ot->poll= ED_operator_editsurfcurve; + ot->exec = select_random_exec; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_float_percentage(ot->srna, "percent", 50.f, 0.0f, 100.0f, "Percent", "Percentage of elements to select randomly", 0.f, 100.0f); @@ -5508,16 +5508,16 @@ static int select_nth_exec(bContext *C, wmOperator *op) void CURVE_OT_select_nth(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Nth"; - ot->description= ""; - ot->idname= "CURVE_OT_select_nth"; + ot->name = "Select Nth"; + ot->description = ""; + ot->idname = "CURVE_OT_select_nth"; /* api callbacks */ - ot->exec= select_nth_exec; - ot->poll= ED_operator_editsurfcurve; + ot->exec = select_nth_exec; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_int(ot->srna, "nth", 2, 2, 100, "Nth Selection", "", 1, INT_MAX); } @@ -5537,16 +5537,16 @@ static int duplicate_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_duplicate(wmOperatorType *ot) { /* identifiers */ - ot->name= "Duplicate Curve"; + ot->name = "Duplicate Curve"; ot->description = "Duplicate selected control points and segments between them"; - ot->idname= "CURVE_OT_duplicate"; + ot->idname = "CURVE_OT_duplicate"; /* api callbacks */ - ot->exec= duplicate_exec; - ot->poll= ED_operator_editsurfcurve; + ot->exec = duplicate_exec; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** delete operator *********************/ @@ -5912,17 +5912,17 @@ void CURVE_OT_delete(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Delete"; + ot->name = "Delete"; ot->description = "Delete selected control points or segments"; - ot->idname= "CURVE_OT_delete"; + ot->idname = "CURVE_OT_delete"; /* api callbacks */ - ot->exec= delete_exec; - ot->invoke= delete_invoke; - ot->poll= ED_operator_editsurfcurve; + ot->exec = delete_exec; + ot->invoke = delete_invoke; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_enum(ot->srna, "type", type_items, 0, "Type", "Which elements to delete"); @@ -5956,29 +5956,29 @@ static int shade_smooth_exec(bContext *C, wmOperator *op) void CURVE_OT_shade_smooth(wmOperatorType *ot) { /* identifiers */ - ot->name= "Shade Smooth"; - ot->idname= "CURVE_OT_shade_smooth"; + ot->name = "Shade Smooth"; + ot->idname = "CURVE_OT_shade_smooth"; /* api callbacks */ - ot->exec= shade_smooth_exec; - ot->poll= ED_operator_editsurfcurve; + ot->exec = shade_smooth_exec; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } void CURVE_OT_shade_flat(wmOperatorType *ot) { /* identifiers */ - ot->name= "Shade Flat"; - ot->idname= "CURVE_OT_shade_flat"; + ot->name = "Shade Flat"; + ot->idname = "CURVE_OT_shade_flat"; /* api callbacks */ - ot->exec= shade_smooth_exec; - ot->poll= ED_operator_editsurfcurve; + ot->exec = shade_smooth_exec; + ot->poll = ED_operator_editsurfcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /************** join operator, to be used externally? ****************/ @@ -6554,17 +6554,17 @@ static int add_primitive_bezier_exec(bContext *C, wmOperator *op) void CURVE_OT_primitive_bezier_curve_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Bezier"; - ot->description= "Construct a Bezier Curve"; - ot->idname= "CURVE_OT_primitive_bezier_curve_add"; + ot->name = "Add Bezier"; + ot->description = "Construct a Bezier Curve"; + ot->idname = "CURVE_OT_primitive_bezier_curve_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= add_primitive_bezier_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = add_primitive_bezier_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; ED_object_add_generic_props(ot, TRUE); } @@ -6577,17 +6577,17 @@ static int add_primitive_bezier_circle_exec(bContext *C, wmOperator *op) void CURVE_OT_primitive_bezier_circle_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Bezier Circle"; - ot->description= "Construct a Bezier Circle"; - ot->idname= "CURVE_OT_primitive_bezier_circle_add"; + ot->name = "Add Bezier Circle"; + ot->description = "Construct a Bezier Circle"; + ot->idname = "CURVE_OT_primitive_bezier_circle_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= add_primitive_bezier_circle_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = add_primitive_bezier_circle_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; ED_object_add_generic_props(ot, TRUE); } @@ -6600,17 +6600,17 @@ static int add_primitive_nurbs_curve_exec(bContext *C, wmOperator *op) void CURVE_OT_primitive_nurbs_curve_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Nurbs Curve"; - ot->description= "Construct a Nurbs Curve"; - ot->idname= "CURVE_OT_primitive_nurbs_curve_add"; + ot->name = "Add Nurbs Curve"; + ot->description = "Construct a Nurbs Curve"; + ot->idname = "CURVE_OT_primitive_nurbs_curve_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= add_primitive_nurbs_curve_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = add_primitive_nurbs_curve_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; ED_object_add_generic_props(ot, TRUE); } @@ -6623,17 +6623,17 @@ static int add_primitive_nurbs_circle_exec(bContext *C, wmOperator *op) void CURVE_OT_primitive_nurbs_circle_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Nurbs Circle"; - ot->description= "Construct a Nurbs Circle"; - ot->idname= "CURVE_OT_primitive_nurbs_circle_add"; + ot->name = "Add Nurbs Circle"; + ot->description = "Construct a Nurbs Circle"; + ot->idname = "CURVE_OT_primitive_nurbs_circle_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= add_primitive_nurbs_circle_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = add_primitive_nurbs_circle_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; ED_object_add_generic_props(ot, TRUE); } @@ -6646,17 +6646,17 @@ static int add_primitive_curve_path_exec(bContext *C, wmOperator *op) void CURVE_OT_primitive_nurbs_path_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Path"; - ot->description= "Construct a Path"; - ot->idname= "CURVE_OT_primitive_nurbs_path_add"; + ot->name = "Add Path"; + ot->description = "Construct a Path"; + ot->idname = "CURVE_OT_primitive_nurbs_path_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= add_primitive_curve_path_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = add_primitive_curve_path_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; ED_object_add_generic_props(ot, TRUE); } @@ -6670,17 +6670,17 @@ static int add_primitive_nurbs_surface_curve_exec(bContext *C, wmOperator *op) void SURFACE_OT_primitive_nurbs_surface_curve_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Surface Curve"; - ot->description= "Construct a Nurbs surface Curve"; - ot->idname= "SURFACE_OT_primitive_nurbs_surface_curve_add"; + ot->name = "Add Surface Curve"; + ot->description = "Construct a Nurbs surface Curve"; + ot->idname = "SURFACE_OT_primitive_nurbs_surface_curve_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= add_primitive_nurbs_surface_curve_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = add_primitive_nurbs_surface_curve_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; ED_object_add_generic_props(ot, TRUE); } @@ -6693,17 +6693,17 @@ static int add_primitive_nurbs_surface_circle_exec(bContext *C, wmOperator *op) void SURFACE_OT_primitive_nurbs_surface_circle_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Surface Circle"; - ot->description= "Construct a Nurbs surface Circle"; - ot->idname= "SURFACE_OT_primitive_nurbs_surface_circle_add"; + ot->name = "Add Surface Circle"; + ot->description = "Construct a Nurbs surface Circle"; + ot->idname = "SURFACE_OT_primitive_nurbs_surface_circle_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= add_primitive_nurbs_surface_circle_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = add_primitive_nurbs_surface_circle_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; ED_object_add_generic_props(ot, TRUE); } @@ -6716,17 +6716,17 @@ static int add_primitive_nurbs_surface_surface_exec(bContext *C, wmOperator *op) void SURFACE_OT_primitive_nurbs_surface_surface_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Surface Patch"; - ot->description= "Construct a Nurbs surface Patch"; - ot->idname= "SURFACE_OT_primitive_nurbs_surface_surface_add"; + ot->name = "Add Surface Patch"; + ot->description = "Construct a Nurbs surface Patch"; + ot->idname = "SURFACE_OT_primitive_nurbs_surface_surface_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= add_primitive_nurbs_surface_surface_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = add_primitive_nurbs_surface_surface_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; ED_object_add_generic_props(ot, TRUE); } @@ -6739,17 +6739,17 @@ static int add_primitive_nurbs_surface_cylinder_exec(bContext *C, wmOperator *op void SURFACE_OT_primitive_nurbs_surface_cylinder_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Surface Cylinder"; - ot->description= "Construct a Nurbs surface Cylinder"; - ot->idname= "SURFACE_OT_primitive_nurbs_surface_cylinder_add"; + ot->name = "Add Surface Cylinder"; + ot->description = "Construct a Nurbs surface Cylinder"; + ot->idname = "SURFACE_OT_primitive_nurbs_surface_cylinder_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= add_primitive_nurbs_surface_cylinder_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = add_primitive_nurbs_surface_cylinder_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; ED_object_add_generic_props(ot, TRUE); } @@ -6762,17 +6762,17 @@ static int add_primitive_nurbs_surface_sphere_exec(bContext *C, wmOperator *op) void SURFACE_OT_primitive_nurbs_surface_sphere_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Surface Sphere"; - ot->description= "Construct a Nurbs surface Sphere"; - ot->idname= "SURFACE_OT_primitive_nurbs_surface_sphere_add"; + ot->name = "Add Surface Sphere"; + ot->description = "Construct a Nurbs surface Sphere"; + ot->idname = "SURFACE_OT_primitive_nurbs_surface_sphere_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= add_primitive_nurbs_surface_sphere_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = add_primitive_nurbs_surface_sphere_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; ED_object_add_generic_props(ot, TRUE); } @@ -6785,17 +6785,17 @@ static int add_primitive_nurbs_surface_torus_exec(bContext *C, wmOperator *op) void SURFACE_OT_primitive_nurbs_surface_torus_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Surface Torus"; - ot->description= "Construct a Nurbs surface Torus"; - ot->idname= "SURFACE_OT_primitive_nurbs_surface_torus_add"; + ot->name = "Add Surface Torus"; + ot->description = "Construct a Nurbs surface Torus"; + ot->idname = "SURFACE_OT_primitive_nurbs_surface_torus_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= add_primitive_nurbs_surface_torus_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = add_primitive_nurbs_surface_torus_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; ED_object_add_generic_props(ot, TRUE); } @@ -6840,15 +6840,15 @@ static int clear_tilt_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_tilt_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Tilt"; - ot->idname= "CURVE_OT_tilt_clear"; + ot->name = "Clear Tilt"; + ot->idname = "CURVE_OT_tilt_clear"; /* api callbacks */ - ot->exec= clear_tilt_exec; - ot->poll= ED_operator_editcurve; + ot->exec = clear_tilt_exec; + ot->poll = ED_operator_editcurve; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /****************** undo for curves ****************/ diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index 4170b7e3299..7f31b34b367 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -321,16 +321,16 @@ static int insert_lorem_exec(bContext *C, wmOperator *UNUSED(op)) void FONT_OT_insert_lorem(wmOperatorType *ot) { /* identifiers */ - ot->name= "Insert Lorem"; - ot->description= "Insert placeholder text"; - ot->idname= "FONT_OT_insert_lorem"; + ot->name = "Insert Lorem"; + ot->description = "Insert placeholder text"; + ot->idname = "FONT_OT_insert_lorem"; /* api callbacks */ - ot->exec= insert_lorem_exec; - ot->poll= ED_operator_editfont; + ot->exec = insert_lorem_exec; + ot->poll = ED_operator_editfont; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /******************* paste file operator ********************/ @@ -409,17 +409,17 @@ static int paste_file_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event) void FONT_OT_file_paste(wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste File"; - ot->description= "Paste contents from file"; - ot->idname= "FONT_OT_file_paste"; + ot->name = "Paste File"; + ot->description = "Paste contents from file"; + ot->idname = "FONT_OT_file_paste"; /* api callbacks */ - ot->exec= paste_file_exec; - ot->invoke= paste_file_invoke; - ot->poll= ED_operator_editfont; + ot->exec = paste_file_exec; + ot->invoke = paste_file_invoke; + ot->poll = ED_operator_editfont; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ WM_operator_properties_filesel(ot, FOLDERFILE|TEXTFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY); @@ -611,16 +611,16 @@ static int set_style_exec(bContext *C, wmOperator *op) void FONT_OT_style_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Style"; - ot->description= "Set font style"; - ot->idname= "FONT_OT_style_set"; + ot->name = "Set Style"; + ot->description = "Set font style"; + ot->idname = "FONT_OT_style_set"; /* api callbacks */ - ot->exec= set_style_exec; - ot->poll= ED_operator_editfont; + ot->exec = set_style_exec; + ot->poll = ED_operator_editfont; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_enum(ot->srna, "style", style_items, CU_CHINFO_BOLD, "Style", "Style to set selection to"); @@ -649,16 +649,16 @@ static int toggle_style_exec(bContext *C, wmOperator *op) void FONT_OT_style_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Style"; - ot->description= "Toggle font style"; - ot->idname= "FONT_OT_style_toggle"; + ot->name = "Toggle Style"; + ot->description = "Toggle font style"; + ot->idname = "FONT_OT_style_toggle"; /* api callbacks */ - ot->exec= toggle_style_exec; - ot->poll= ED_operator_editfont; + ot->exec = toggle_style_exec; + ot->poll = ED_operator_editfont; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_enum(ot->srna, "style", style_items, CU_CHINFO_BOLD, "Style", "Style to set selection to"); @@ -692,13 +692,13 @@ static int copy_text_exec(bContext *C, wmOperator *UNUSED(op)) void FONT_OT_text_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Text"; - ot->description= "Copy selected text to clipboard"; - ot->idname= "FONT_OT_text_copy"; + ot->name = "Copy Text"; + ot->description = "Copy selected text to clipboard"; + ot->idname = "FONT_OT_text_copy"; /* api callbacks */ - ot->exec= copy_text_exec; - ot->poll= ED_operator_editfont; + ot->exec = copy_text_exec; + ot->poll = ED_operator_editfont; } /******************* cut text operator ********************/ @@ -723,16 +723,16 @@ static int cut_text_exec(bContext *C, wmOperator *UNUSED(op)) void FONT_OT_text_cut(wmOperatorType *ot) { /* identifiers */ - ot->name= "Cut Text"; - ot->description= "Cut selected text to clipboard"; - ot->idname= "FONT_OT_text_cut"; + ot->name = "Cut Text"; + ot->description = "Cut selected text to clipboard"; + ot->idname = "FONT_OT_text_cut"; /* api callbacks */ - ot->exec= cut_text_exec; - ot->poll= ED_operator_editfont; + ot->exec = cut_text_exec; + ot->poll = ED_operator_editfont; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /******************* paste text operator ********************/ @@ -781,16 +781,16 @@ static int paste_text_exec(bContext *C, wmOperator *op) void FONT_OT_text_paste(wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste Text"; - ot->description= "Paste text from clipboard"; - ot->idname= "FONT_OT_text_paste"; + ot->name = "Paste Text"; + ot->description = "Paste text from clipboard"; + ot->idname = "FONT_OT_text_paste"; /* api callbacks */ - ot->exec= paste_text_exec; - ot->poll= ED_operator_editfont; + ot->exec = paste_text_exec; + ot->poll = ED_operator_editfont; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /************************ move operator ************************/ @@ -918,16 +918,16 @@ static int move_exec(bContext *C, wmOperator *op) void FONT_OT_move(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Cursor"; - ot->description= "Move cursor to position type"; - ot->idname= "FONT_OT_move"; + ot->name = "Move Cursor"; + ot->description = "Move cursor to position type"; + ot->idname = "FONT_OT_move"; /* api callbacks */ - ot->exec= move_exec; - ot->poll= ED_operator_editfont; + ot->exec = move_exec; + ot->poll = ED_operator_editfont; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_enum(ot->srna, "type", move_type_items, LINE_BEGIN, "Type", "Where to move cursor to"); @@ -945,16 +945,16 @@ static int move_select_exec(bContext *C, wmOperator *op) void FONT_OT_move_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Select"; - ot->description= "Make selection from current cursor position to new cursor position type"; - ot->idname= "FONT_OT_move_select"; + ot->name = "Move Select"; + ot->description = "Make selection from current cursor position to new cursor position type"; + ot->idname = "FONT_OT_move_select"; /* api callbacks */ - ot->exec= move_select_exec; - ot->poll= ED_operator_editfont; + ot->exec = move_select_exec; + ot->poll = ED_operator_editfont; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_enum(ot->srna, "type", move_type_items, LINE_BEGIN, "Type", "Where to move cursor to, to make a selection"); @@ -987,16 +987,16 @@ static int change_spacing_exec(bContext *C, wmOperator *op) void FONT_OT_change_spacing(wmOperatorType *ot) { /* identifiers */ - ot->name= "Change Spacing"; - ot->description= "Change font spacing"; - ot->idname= "FONT_OT_change_spacing"; + ot->name = "Change Spacing"; + ot->description = "Change font spacing"; + ot->idname = "FONT_OT_change_spacing"; /* api callbacks */ - ot->exec= change_spacing_exec; - ot->poll= ED_operator_editfont; + ot->exec = change_spacing_exec; + ot->poll = ED_operator_editfont; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_int(ot->srna, "delta", 1, -20, 20, "Delta", "Amount to decrease or increase character spacing with", -20, 20); @@ -1032,16 +1032,16 @@ static int change_character_exec(bContext *C, wmOperator *op) void FONT_OT_change_character(wmOperatorType *ot) { /* identifiers */ - ot->name= "Change Character"; - ot->description= "Change font character code"; - ot->idname= "FONT_OT_change_character"; + ot->name = "Change Character"; + ot->description = "Change font character code"; + ot->idname = "FONT_OT_change_character"; /* api callbacks */ - ot->exec= change_character_exec; - ot->poll= ED_operator_editfont; + ot->exec = change_character_exec; + ot->poll = ED_operator_editfont; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_int(ot->srna, "delta", 1, -255, 255, "Delta", "Number to increase or decrease character code with", -255, 255); @@ -1075,16 +1075,16 @@ static int line_break_exec(bContext *C, wmOperator *op) void FONT_OT_line_break(wmOperatorType *ot) { /* identifiers */ - ot->name= "Line Break"; - ot->description= "Insert line break at cursor position"; - ot->idname= "FONT_OT_line_break"; + ot->name = "Line Break"; + ot->description = "Insert line break at cursor position"; + ot->idname = "FONT_OT_line_break"; /* api callbacks */ - ot->exec= line_break_exec; - ot->poll= ED_operator_editfont; + ot->exec = line_break_exec; + ot->poll = ED_operator_editfont; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "ctrl", 0, "Ctrl", ""); // XXX what is this? @@ -1165,16 +1165,16 @@ static int delete_exec(bContext *C, wmOperator *op) void FONT_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete"; - ot->description= "Delete text by cursor position"; - ot->idname= "FONT_OT_delete"; + ot->name = "Delete"; + ot->description = "Delete text by cursor position"; + ot->idname = "FONT_OT_delete"; /* api callbacks */ - ot->exec= delete_exec; - ot->poll= ED_operator_editfont; + ot->exec = delete_exec; + ot->poll = ED_operator_editfont; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_enum(ot->srna, "type", delete_type_items, DEL_ALL, "Type", "Which part of the text to delete"); @@ -1326,17 +1326,17 @@ static int insert_text_invoke(bContext *C, wmOperator *op, wmEvent *evt) void FONT_OT_text_insert(wmOperatorType *ot) { /* identifiers */ - ot->name= "Insert Text"; - ot->description= "Insert text at cursor position"; - ot->idname= "FONT_OT_text_insert"; + ot->name = "Insert Text"; + ot->description = "Insert text at cursor position"; + ot->idname = "FONT_OT_text_insert"; /* api callbacks */ - ot->exec= insert_text_exec; - ot->invoke= insert_text_invoke; - ot->poll= ED_operator_editfont; + ot->exec = insert_text_exec; + ot->invoke = insert_text_invoke; + ot->poll = ED_operator_editfont; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_string(ot->srna, "text", "", 0, "Text", "Text to insert at the cursor position"); @@ -1365,16 +1365,16 @@ static int textbox_add_exec(bContext *C, wmOperator *UNUSED(op)) void FONT_OT_textbox_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Textbox"; - ot->description= "Add a new text box"; - ot->idname= "FONT_OT_textbox_add"; + ot->name = "Add Textbox"; + ot->description = "Add a new text box"; + ot->idname = "FONT_OT_textbox_add"; /* api callbacks */ - ot->exec= textbox_add_exec; - ot->poll= ED_operator_object_active_editable_font; + ot->exec = textbox_add_exec; + ot->poll = ED_operator_object_active_editable_font; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -1408,16 +1408,16 @@ static int textbox_remove_exec(bContext *C, wmOperator *op) void FONT_OT_textbox_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Textbox"; - ot->description= "Remove the textbox"; - ot->idname= "FONT_OT_textbox_remove"; + ot->name = "Remove Textbox"; + ot->description = "Remove the textbox"; + ot->idname = "FONT_OT_textbox_remove"; /* api callbacks */ - ot->exec= textbox_remove_exec; - ot->poll= ED_operator_object_active_editable_font; + ot->exec = textbox_remove_exec; + ot->poll = ED_operator_object_active_editable_font; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "The current text box", 0, INT_MAX); } @@ -1544,16 +1544,16 @@ static int set_case_exec(bContext *C, wmOperator *op) void FONT_OT_case_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Case"; - ot->description= "Set font case"; - ot->idname= "FONT_OT_case_set"; + ot->name = "Set Case"; + ot->description = "Set font case"; + ot->idname = "FONT_OT_case_set"; /* api callbacks */ - ot->exec= set_case_exec; - ot->poll= ED_operator_editfont; + ot->exec = set_case_exec; + ot->poll = ED_operator_editfont; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_enum(ot->srna, "case", case_items, CASE_LOWER, "Case", "Lower or upper case"); @@ -1587,16 +1587,16 @@ static int toggle_case_exec(bContext *C, wmOperator *UNUSED(op)) void FONT_OT_case_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Case"; - ot->description= "Toggle font case"; - ot->idname= "FONT_OT_case_toggle"; + ot->name = "Toggle Case"; + ot->description = "Toggle font case"; + ot->idname = "FONT_OT_case_toggle"; /* api callbacks */ - ot->exec= toggle_case_exec; - ot->poll= ED_operator_editfont; + ot->exec = toggle_case_exec; + ot->poll = ED_operator_editfont; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* **************** Open Font ************** */ @@ -1685,16 +1685,16 @@ static int open_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void FONT_OT_open(wmOperatorType *ot) { /* identifiers */ - ot->name= "Open Font"; - ot->idname= "FONT_OT_open"; + ot->name = "Open Font"; + ot->idname = "FONT_OT_open"; /* api callbacks */ - ot->exec= font_open_exec; - ot->invoke= open_invoke; - ot->cancel= font_open_cancel; + ot->exec = font_open_exec; + ot->invoke = open_invoke; + ot->cancel = font_open_cancel; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ WM_operator_properties_filesel(ot, FOLDERFILE|FTFONTFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH|WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY); @@ -1728,12 +1728,12 @@ static int font_unlink_exec(bContext *C, wmOperator *op) void FONT_OT_unlink(wmOperatorType *ot) { /* identifiers */ - ot->name= "Unlink"; - ot->idname= "FONT_OT_unlink"; - ot->description= "Unlink active font data block"; + ot->name = "Unlink"; + ot->idname = "FONT_OT_unlink"; + ot->description = "Unlink active font data block"; /* api callbacks */ - ot->exec= font_unlink_exec; + ot->exec = font_unlink_exec; } diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index 9a492153b7f..34eaaf2a31b 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -213,14 +213,14 @@ static int gp_data_add_exec (bContext *C, wmOperator *op) void GPENCIL_OT_data_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Grease Pencil Add New"; - ot->idname= "GPENCIL_OT_data_add"; - ot->description= "Add new Grease Pencil datablock"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Grease Pencil Add New"; + ot->idname = "GPENCIL_OT_data_add"; + ot->description = "Add new Grease Pencil datablock"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* callbacks */ - ot->exec= gp_data_add_exec; - ot->poll= gp_add_poll; + ot->exec = gp_data_add_exec; + ot->poll = gp_add_poll; } /* ******************* Unlink Data ************************ */ @@ -261,14 +261,14 @@ static int gp_data_unlink_exec (bContext *C, wmOperator *op) void GPENCIL_OT_data_unlink (wmOperatorType *ot) { /* identifiers */ - ot->name= "Grease Pencil Unlink"; - ot->idname= "GPENCIL_OT_data_unlink"; - ot->description= "Unlink active Grease Pencil datablock"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Grease Pencil Unlink"; + ot->idname = "GPENCIL_OT_data_unlink"; + ot->description = "Unlink active Grease Pencil datablock"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* callbacks */ - ot->exec= gp_data_unlink_exec; - ot->poll= gp_data_unlink_poll; + ot->exec = gp_data_unlink_exec; + ot->poll = gp_data_unlink_poll; } /* ******************* Add New Layer ************************ */ @@ -298,14 +298,14 @@ static int gp_layer_add_exec (bContext *C, wmOperator *op) void GPENCIL_OT_layer_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add New Layer"; - ot->idname= "GPENCIL_OT_layer_add"; - ot->description= "Add new Grease Pencil layer for the active Grease Pencil datablock"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Add New Layer"; + ot->idname = "GPENCIL_OT_layer_add"; + ot->description = "Add new Grease Pencil layer for the active Grease Pencil datablock"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* callbacks */ - ot->exec= gp_layer_add_exec; - ot->poll= gp_add_poll; + ot->exec = gp_layer_add_exec; + ot->poll = gp_add_poll; } /* ******************* Delete Active Frame ************************ */ @@ -349,14 +349,14 @@ static int gp_actframe_delete_exec (bContext *C, wmOperator *op) void GPENCIL_OT_active_frame_delete (wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Active Frame"; - ot->idname= "GPENCIL_OT_active_frame_delete"; - ot->description= "Delete the active frame for the active Grease Pencil datablock"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Delete Active Frame"; + ot->idname = "GPENCIL_OT_active_frame_delete"; + ot->description = "Delete the active frame for the active Grease Pencil datablock"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* callbacks */ - ot->exec= gp_actframe_delete_exec; - ot->poll= gp_actframe_delete_poll; + ot->exec = gp_actframe_delete_exec; + ot->poll = gp_actframe_delete_poll; } /* ************************************************ */ @@ -632,21 +632,21 @@ static int gp_convert_layer_exec (bContext *C, wmOperator *op) void GPENCIL_OT_convert (wmOperatorType *ot) { /* identifiers */ - ot->name= "Convert Grease Pencil"; - ot->idname= "GPENCIL_OT_convert"; - ot->description= "Convert the active Grease Pencil layer to a new Object"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Convert Grease Pencil"; + ot->idname = "GPENCIL_OT_convert"; + ot->description = "Convert the active Grease Pencil layer to a new Object"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= gp_convert_layer_exec; - ot->poll= gp_convert_poll; + ot->invoke = WM_menu_invoke; + ot->exec = gp_convert_layer_exec; + ot->poll = gp_convert_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_gpencil_convertmodes, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_gpencil_convertmodes, 0, "Type", ""); } /* ************************************************ */ diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 535a0f947f1..b7ebc6d0a35 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -1919,19 +1919,19 @@ static EnumPropertyItem prop_gpencil_drawmodes[] = { void GPENCIL_OT_draw (wmOperatorType *ot) { /* identifiers */ - ot->name= "Grease Pencil Draw"; - ot->idname= "GPENCIL_OT_draw"; - ot->description= "Make annotations on the active data"; + ot->name = "Grease Pencil Draw"; + ot->idname = "GPENCIL_OT_draw"; + ot->description = "Make annotations on the active data"; /* api callbacks */ - ot->exec= gpencil_draw_exec; - ot->invoke= gpencil_draw_invoke; - ot->modal= gpencil_draw_modal; - ot->cancel= gpencil_draw_cancel; - ot->poll= gpencil_draw_poll; + ot->exec = gpencil_draw_exec; + ot->invoke = gpencil_draw_invoke; + ot->modal = gpencil_draw_modal; + ot->cancel = gpencil_draw_cancel; + ot->poll = gpencil_draw_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; /* settings for drawing */ RNA_def_enum(ot->srna, "mode", prop_gpencil_drawmodes, 0, "Mode", "Way to interpret mouse movements"); diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index 80c77a54a84..e389612507d 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -189,19 +189,19 @@ static int eyedropper_poll(bContext *C) static void UI_OT_eyedropper(wmOperatorType *ot) { /* identifiers */ - ot->name= "Eyedropper"; - ot->idname= "UI_OT_eyedropper"; - ot->description= "Sample a color from the Blender Window to store in a property"; + ot->name = "Eyedropper"; + ot->idname = "UI_OT_eyedropper"; + ot->description = "Sample a color from the Blender Window to store in a property"; /* api callbacks */ - ot->invoke= eyedropper_invoke; - ot->modal= eyedropper_modal; - ot->cancel= eyedropper_cancel; - ot->exec= eyedropper_exec; - ot->poll= eyedropper_poll; + ot->invoke = eyedropper_invoke; + ot->modal = eyedropper_modal; + ot->cancel = eyedropper_cancel; + ot->exec = eyedropper_exec; + ot->poll = eyedropper_poll; /* flags */ - ot->flag= OPTYPE_BLOCKING; + ot->flag = OPTYPE_BLOCKING; /* properties */ } @@ -219,15 +219,15 @@ static int reset_default_theme_exec(bContext *C, wmOperator *UNUSED(op)) static void UI_OT_reset_default_theme(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reset to Default Theme"; - ot->idname= "UI_OT_reset_default_theme"; - ot->description= "Reset to the default theme colors"; + ot->name = "Reset to Default Theme"; + ot->idname = "UI_OT_reset_default_theme"; + ot->description = "Reset to the default theme colors"; /* callbacks */ - ot->exec= reset_default_theme_exec; + ot->exec = reset_default_theme_exec; /* flags */ - ot->flag= OPTYPE_REGISTER; + ot->flag = OPTYPE_REGISTER; } /* Copy Data Path Operator ------------------------ */ @@ -259,16 +259,16 @@ static int copy_data_path_button_exec(bContext *C, wmOperator *UNUSED(op)) static void UI_OT_copy_data_path_button(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Data Path"; - ot->idname= "UI_OT_copy_data_path_button"; - ot->description= "Copy the RNA data path for this property to the clipboard"; + ot->name = "Copy Data Path"; + ot->idname = "UI_OT_copy_data_path_button"; + ot->description = "Copy the RNA data path for this property to the clipboard"; /* callbacks */ - ot->exec= copy_data_path_button_exec; + ot->exec = copy_data_path_button_exec; //op->poll= ??? // TODO: need to have some valid property before this can be done /* flags */ - ot->flag= OPTYPE_REGISTER; + ot->flag = OPTYPE_REGISTER; } /* Reset to Default Values Button Operator ------------------------ */ @@ -327,16 +327,16 @@ static int reset_default_button_exec(bContext *C, wmOperator *op) static void UI_OT_reset_default_button(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reset to Default Value"; - ot->idname= "UI_OT_reset_default_button"; - ot->description= "Reset this property's value to its default value"; + ot->name = "Reset to Default Value"; + ot->idname = "UI_OT_reset_default_button"; + ot->description = "Reset this property's value to its default value"; /* callbacks */ - ot->poll= reset_default_button_poll; - ot->exec= reset_default_button_exec; + ot->poll = reset_default_button_poll; + ot->exec = reset_default_button_exec; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "all", 1, "All", "Reset to default values all elements of the array"); @@ -419,16 +419,16 @@ static int copy_to_selected_button_exec(bContext *C, wmOperator *op) static void UI_OT_copy_to_selected_button(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy To Selected"; - ot->idname= "UI_OT_copy_to_selected_button"; - ot->description= "Copy property from this object to selected objects or bones"; + ot->name = "Copy To Selected"; + ot->idname = "UI_OT_copy_to_selected_button"; + ot->description = "Copy property from this object to selected objects or bones"; /* callbacks */ - ot->poll= copy_to_selected_button_poll; - ot->exec= copy_to_selected_button_exec; + ot->poll = copy_to_selected_button_poll; + ot->exec = copy_to_selected_button_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "all", 1, "All", "Reset to default values all elements of the array"); @@ -474,13 +474,13 @@ static int reports_to_text_exec(bContext *C, wmOperator *UNUSED(op)) static void UI_OT_reports_to_textblock(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reports to Text Block"; - ot->idname= "UI_OT_reports_to_textblock"; - ot->description= "Write the reports "; + ot->name = "Reports to Text Block"; + ot->idname = "UI_OT_reports_to_textblock"; + ot->description = "Write the reports "; /* callbacks */ - ot->poll= reports_to_text_poll; - ot->exec= reports_to_text_exec; + ot->poll = reports_to_text_poll; + ot->exec = reports_to_text_exec; } #ifdef WITH_PYTHON @@ -693,12 +693,12 @@ static int editsource_exec(bContext *C, wmOperator *op) static void UI_OT_editsource(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reports to Text Block"; - ot->idname= "UI_OT_editsource"; - ot->description= "Edit source code for a button"; + ot->name = "Reports to Text Block"; + ot->idname = "UI_OT_editsource"; + ot->description = "Edit source code for a button"; /* callbacks */ - ot->exec= editsource_exec; + ot->exec = editsource_exec; } #endif /* WITH_PYTHON */ diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index e4726bf0ae4..16613d3acee 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -291,18 +291,18 @@ static int view_pan_cancel(bContext *UNUSED(C), wmOperator *op) static void VIEW2D_OT_pan(wmOperatorType *ot) { /* identifiers */ - ot->name= "Pan View"; - ot->description= "Pan the view"; - ot->idname= "VIEW2D_OT_pan"; + ot->name = "Pan View"; + ot->description = "Pan the view"; + ot->idname = "VIEW2D_OT_pan"; /* api callbacks */ - ot->exec= view_pan_exec; - ot->invoke= view_pan_invoke; - ot->modal= view_pan_modal; - ot->cancel= view_pan_cancel; + ot->exec = view_pan_exec; + ot->invoke = view_pan_invoke; + ot->modal = view_pan_modal; + ot->cancel = view_pan_cancel; /* operator is modal */ - ot->flag= OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; + ot->flag = OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; /* rna - must keep these in sync with the other operators */ RNA_def_int(ot->srna, "deltax", 0, INT_MIN, INT_MAX, "Delta X", "", INT_MIN, INT_MAX); @@ -341,12 +341,12 @@ static int view_scrollright_exec(bContext *C, wmOperator *op) static void VIEW2D_OT_scroll_right(wmOperatorType *ot) { /* identifiers */ - ot->name= "Scroll Right"; - ot->description= "Scroll the view right"; - ot->idname= "VIEW2D_OT_scroll_right"; + ot->name = "Scroll Right"; + ot->description = "Scroll the view right"; + ot->idname = "VIEW2D_OT_scroll_right"; /* api callbacks */ - ot->exec= view_scrollright_exec; + ot->exec = view_scrollright_exec; /* rna - must keep these in sync with the other operators */ RNA_def_int(ot->srna, "deltax", 0, INT_MIN, INT_MAX, "Delta X", "", INT_MIN, INT_MAX); @@ -385,12 +385,12 @@ static int view_scrollleft_exec(bContext *C, wmOperator *op) static void VIEW2D_OT_scroll_left(wmOperatorType *ot) { /* identifiers */ - ot->name= "Scroll Left"; - ot->description= "Scroll the view left"; - ot->idname= "VIEW2D_OT_scroll_left"; + ot->name = "Scroll Left"; + ot->description = "Scroll the view left"; + ot->idname = "VIEW2D_OT_scroll_left"; /* api callbacks */ - ot->exec= view_scrollleft_exec; + ot->exec = view_scrollleft_exec; /* rna - must keep these in sync with the other operators */ RNA_def_int(ot->srna, "deltax", 0, INT_MIN, INT_MAX, "Delta X", "", INT_MIN, INT_MAX); @@ -433,12 +433,12 @@ static int view_scrolldown_exec(bContext *C, wmOperator *op) static void VIEW2D_OT_scroll_down(wmOperatorType *ot) { /* identifiers */ - ot->name= "Scroll Down"; - ot->description= "Scroll the view down"; - ot->idname= "VIEW2D_OT_scroll_down"; + ot->name = "Scroll Down"; + ot->description = "Scroll the view down"; + ot->idname = "VIEW2D_OT_scroll_down"; /* api callbacks */ - ot->exec= view_scrolldown_exec; + ot->exec = view_scrolldown_exec; /* rna - must keep these in sync with the other operators */ RNA_def_int(ot->srna, "deltax", 0, INT_MIN, INT_MAX, "Delta X", "", INT_MIN, INT_MAX); @@ -483,12 +483,12 @@ static int view_scrollup_exec(bContext *C, wmOperator *op) static void VIEW2D_OT_scroll_up(wmOperatorType *ot) { /* identifiers */ - ot->name= "Scroll Up"; - ot->description= "Scroll the view up"; - ot->idname= "VIEW2D_OT_scroll_up"; + ot->name = "Scroll Up"; + ot->description = "Scroll the view up"; + ot->idname = "VIEW2D_OT_scroll_up"; /* api callbacks */ - ot->exec= view_scrollup_exec; + ot->exec = view_scrollup_exec; /* rna - must keep these in sync with the other operators */ RNA_def_int(ot->srna, "deltax", 0, INT_MIN, INT_MAX, "Delta X", "", INT_MIN, INT_MAX); @@ -711,14 +711,14 @@ static int view_zoomin_invoke(bContext *C, wmOperator *op, wmEvent *event) static void VIEW2D_OT_zoom_in(wmOperatorType *ot) { /* identifiers */ - ot->name= "Zoom In"; - ot->description= "Zoom in the view"; - ot->idname= "VIEW2D_OT_zoom_in"; + ot->name = "Zoom In"; + ot->description = "Zoom in the view"; + ot->idname = "VIEW2D_OT_zoom_in"; /* api callbacks */ - ot->invoke= view_zoomin_invoke; -// ot->exec= view_zoomin_exec; // XXX, needs view_zoomdrag_init called first. - ot->poll= view_zoom_poll; + ot->invoke = view_zoomin_invoke; +// ot->exec = view_zoomin_exec; // XXX, needs view_zoomdrag_init called first. + ot->poll = view_zoom_poll; /* rna - must keep these in sync with the other operators */ RNA_def_float(ot->srna, "zoomfacx", 0, -FLT_MAX, FLT_MAX, "Zoom Factor X", "", -FLT_MAX, FLT_MAX); @@ -768,14 +768,14 @@ static int view_zoomout_invoke(bContext *C, wmOperator *op, wmEvent *event) static void VIEW2D_OT_zoom_out(wmOperatorType *ot) { /* identifiers */ - ot->name= "Zoom Out"; - ot->description= "Zoom out the view"; - ot->idname= "VIEW2D_OT_zoom_out"; + ot->name = "Zoom Out"; + ot->description = "Zoom out the view"; + ot->idname = "VIEW2D_OT_zoom_out"; /* api callbacks */ - ot->invoke= view_zoomout_invoke; -// ot->exec= view_zoomout_exec; // XXX, needs view_zoomdrag_init called first. - ot->poll= view_zoom_poll; + ot->invoke = view_zoomout_invoke; +// ot->exec = view_zoomout_exec; // XXX, needs view_zoomdrag_init called first. + ot->poll = view_zoom_poll; /* rna - must keep these in sync with the other operators */ RNA_def_float(ot->srna, "zoomfacx", 0, -FLT_MAX, FLT_MAX, "Zoom Factor X", "", -FLT_MAX, FLT_MAX); @@ -1063,20 +1063,20 @@ static int view_zoomdrag_modal(bContext *C, wmOperator *op, wmEvent *event) static void VIEW2D_OT_zoom(wmOperatorType *ot) { /* identifiers */ - ot->name= "Zoom 2D View"; - ot->description= "Zoom in/out the view"; - ot->idname= "VIEW2D_OT_zoom"; + ot->name = "Zoom 2D View"; + ot->description = "Zoom in/out the view"; + ot->idname = "VIEW2D_OT_zoom"; /* api callbacks */ - ot->exec= view_zoomdrag_exec; - ot->invoke= view_zoomdrag_invoke; - ot->modal= view_zoomdrag_modal; - ot->cancel= view_zoomdrag_cancel; + ot->exec = view_zoomdrag_exec; + ot->invoke = view_zoomdrag_invoke; + ot->modal = view_zoomdrag_modal; + ot->cancel = view_zoomdrag_cancel; - ot->poll= view_zoom_poll; + ot->poll = view_zoom_poll; /* operator is repeatable */ - // ot->flag= OPTYPE_BLOCKING; + // ot->flag = OPTYPE_BLOCKING; /* rna - must keep these in sync with the other operators */ RNA_def_float(ot->srna, "deltax", 0, -FLT_MAX, FLT_MAX, "Delta X", "", -FLT_MAX, FLT_MAX); @@ -1164,17 +1164,17 @@ static int view_borderzoom_exec(bContext *C, wmOperator *op) static void VIEW2D_OT_zoom_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Zoom to Border"; - ot->description= "Zoom in the view to the nearest item contained in the border"; - ot->idname= "VIEW2D_OT_zoom_border"; + ot->name = "Zoom to Border"; + ot->description = "Zoom in the view to the nearest item contained in the border"; + ot->idname = "VIEW2D_OT_zoom_border"; /* api callbacks */ - ot->invoke= WM_border_select_invoke; - ot->exec= view_borderzoom_exec; - ot->modal= WM_border_select_modal; - ot->cancel= WM_border_select_cancel; + ot->invoke = WM_border_select_invoke; + ot->exec = view_borderzoom_exec; + ot->modal = WM_border_select_modal; + ot->cancel = WM_border_select_cancel; - ot->poll= view_zoom_poll; + ot->poll = view_zoom_poll; /* rna */ RNA_def_int(ot->srna, "gesture_mode", 0, INT_MIN, INT_MAX, "Gesture Mode", "", INT_MIN, INT_MAX); @@ -1587,19 +1587,19 @@ static int scroller_activate_invoke(bContext *C, wmOperator *op, wmEvent *event) static void VIEW2D_OT_scroller_activate(wmOperatorType *ot) { /* identifiers */ - ot->name= "Scroller Activate"; - ot->description= "Scroll view by mouse click and drag"; - ot->idname= "VIEW2D_OT_scroller_activate"; + ot->name = "Scroller Activate"; + ot->description = "Scroll view by mouse click and drag"; + ot->idname = "VIEW2D_OT_scroller_activate"; /* flags */ - ot->flag= OPTYPE_BLOCKING; + ot->flag = OPTYPE_BLOCKING; /* api callbacks */ - ot->invoke= scroller_activate_invoke; - ot->modal= scroller_activate_modal; - ot->cancel= scroller_activate_cancel; + ot->invoke = scroller_activate_invoke; + ot->modal = scroller_activate_modal; + ot->cancel = scroller_activate_cancel; - ot->poll= view2d_poll; + ot->poll = view2d_poll; } /* ********************************************************* */ @@ -1655,13 +1655,13 @@ static int reset_exec(bContext *C, wmOperator *UNUSED(op)) static void VIEW2D_OT_reset(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reset View"; - ot->description= "Reset the view"; - ot->idname= "VIEW2D_OT_reset"; + ot->name = "Reset View"; + ot->description = "Reset the view"; + ot->idname = "VIEW2D_OT_reset"; /* api callbacks */ - ot->exec= reset_exec; - ot->poll= view2d_poll; + ot->exec = reset_exec; + ot->poll = view2d_poll; } /* ********************************************************* */ diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index 1794e5d6e21..b7700623d80 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -158,17 +158,17 @@ static int add_primitive_plane_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_plane_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Plane"; - ot->description= "Construct a filled planar mesh with 4 vertices"; - ot->idname= "MESH_OT_primitive_plane_add"; + ot->name = "Add Plane"; + ot->description = "Construct a filled planar mesh with 4 vertices"; + ot->idname = "MESH_OT_primitive_plane_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= add_primitive_plane_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = add_primitive_plane_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; ED_object_add_generic_props(ot, TRUE); } @@ -203,17 +203,17 @@ static int add_primitive_cube_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_cube_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Cube"; - ot->description= "Construct a cube mesh"; - ot->idname= "MESH_OT_primitive_cube_add"; + ot->name = "Add Cube"; + ot->description = "Construct a cube mesh"; + ot->idname = "MESH_OT_primitive_cube_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= add_primitive_cube_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = add_primitive_cube_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; ED_object_add_generic_props(ot, TRUE); } @@ -262,17 +262,17 @@ void MESH_OT_primitive_circle_add(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Add Circle"; - ot->description= "Construct a circle mesh"; - ot->idname= "MESH_OT_primitive_circle_add"; + ot->name = "Add Circle"; + ot->description = "Construct a circle mesh"; + ot->idname = "MESH_OT_primitive_circle_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= add_primitive_circle_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = add_primitive_circle_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ RNA_def_int(ot->srna, "vertices", 32, 3, INT_MAX, "Vertices", "", 3, 500); @@ -325,17 +325,17 @@ void MESH_OT_primitive_cylinder_add(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Add Cylinder"; - ot->description= "Construct a cylinder mesh"; - ot->idname= "MESH_OT_primitive_cylinder_add"; + ot->name = "Add Cylinder"; + ot->description = "Construct a cylinder mesh"; + ot->idname = "MESH_OT_primitive_cylinder_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= add_primitive_cylinder_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = add_primitive_cylinder_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ RNA_def_int(ot->srna, "vertices", 32, 2, INT_MAX, "Vertices", "", 2, 500); @@ -387,17 +387,17 @@ void MESH_OT_primitive_cone_add(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Add Cone"; - ot->description= "Construct a conic mesh"; - ot->idname= "MESH_OT_primitive_cone_add"; + ot->name = "Add Cone"; + ot->description = "Construct a conic mesh"; + ot->idname = "MESH_OT_primitive_cone_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= add_primitive_cone_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = add_primitive_cone_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ RNA_def_int(ot->srna, "vertices", 32, 2, INT_MAX, "Vertices", "", 2, 500); @@ -447,17 +447,17 @@ void MESH_OT_primitive_grid_add(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Add Grid"; - ot->description= "Construct a grid mesh"; - ot->idname= "MESH_OT_primitive_grid_add"; + ot->name = "Add Grid"; + ot->description = "Construct a grid mesh"; + ot->idname = "MESH_OT_primitive_grid_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= add_primitive_grid_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = add_primitive_grid_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ RNA_def_int(ot->srna, "x_subdivisions", 10, 3, INT_MAX, "X Subdivisions", "", 3, 1000); @@ -499,17 +499,17 @@ static int add_primitive_monkey_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_monkey_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Monkey"; - ot->description= "Construct a Suzanne mesh"; - ot->idname= "MESH_OT_primitive_monkey_add"; + ot->name = "Add Monkey"; + ot->description = "Construct a Suzanne mesh"; + ot->idname = "MESH_OT_primitive_monkey_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= add_primitive_monkey_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = add_primitive_monkey_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; ED_object_add_generic_props(ot, TRUE); } @@ -549,17 +549,17 @@ void MESH_OT_primitive_uv_sphere_add(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Add UV Sphere"; - ot->description= "Construct a UV sphere mesh"; - ot->idname= "MESH_OT_primitive_uv_sphere_add"; + ot->name = "Add UV Sphere"; + ot->description = "Construct a UV sphere mesh"; + ot->idname = "MESH_OT_primitive_uv_sphere_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= add_primitive_uvsphere_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = add_primitive_uvsphere_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ RNA_def_int(ot->srna, "segments", 32, 3, INT_MAX, "Segments", "", 3, 500); @@ -606,17 +606,17 @@ void MESH_OT_primitive_ico_sphere_add(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Add Ico Sphere"; - ot->description= "Construct an Icosphere mesh"; - ot->idname= "MESH_OT_primitive_ico_sphere_add"; + ot->name = "Add Ico Sphere"; + ot->description = "Construct an Icosphere mesh"; + ot->idname = "MESH_OT_primitive_ico_sphere_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= add_primitive_icosphere_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = add_primitive_icosphere_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ RNA_def_int(ot->srna, "subdivisions", 2, 1, INT_MAX, "Subdivisions", "", 1, 8); diff --git a/source/blender/editors/mesh/loopcut.c b/source/blender/editors/mesh/loopcut.c index 6b2a8bad6c1..e9b0e276bd0 100644 --- a/source/blender/editors/mesh/loopcut.c +++ b/source/blender/editors/mesh/loopcut.c @@ -546,16 +546,16 @@ static int loopcut_modal (bContext *C, wmOperator *op, wmEvent *event) void MESH_OT_edgering_select (wmOperatorType *ot) { /* description */ - ot->name= "Edge Ring Select"; - ot->idname= "MESH_OT_edgering_select"; - ot->description= "Select an edge ring"; + ot->name = "Edge Ring Select"; + ot->idname = "MESH_OT_edgering_select"; + ot->description = "Select an edge ring"; /* callbacks */ - ot->invoke= ringsel_invoke; - ot->poll= ED_operator_editmesh_region_view3d; + ot->invoke = ringsel_invoke; + ot->poll = ED_operator_editmesh_region_view3d; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend the selection"); } @@ -567,18 +567,18 @@ void MESH_OT_loopcut (wmOperatorType *ot) PropertyRNA *prop; /* description */ - ot->name= "Loop Cut"; - ot->idname= "MESH_OT_loopcut"; - ot->description= "Add a new loop between existing loops"; + ot->name = "Loop Cut"; + ot->idname = "MESH_OT_loopcut"; + ot->description = "Add a new loop between existing loops"; /* callbacks */ - ot->invoke= ringcut_invoke; - ot->modal= loopcut_modal; - ot->cancel= ringcut_cancel; - ot->poll= ED_operator_editmesh_region_view3d; + ot->invoke = ringcut_invoke; + ot->modal = loopcut_modal; + ot->cancel = ringcut_cancel; + ot->poll = ED_operator_editmesh_region_view3d; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; /* properties */ prop = RNA_def_int(ot->srna, "number_cuts", 1, 1, INT_MAX, "Number of Cuts", "", 1, 10); diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index cdbe34b4bd5..bdc07bb0365 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -501,16 +501,16 @@ static int uv_texture_add_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_uv_texture_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add UV Map"; - ot->description= "Add UV Map"; - ot->idname= "MESH_OT_uv_texture_add"; + ot->name = "Add UV Map"; + ot->description = "Add UV Map"; + ot->idname = "MESH_OT_uv_texture_add"; /* api callbacks */ - ot->poll= layers_poll; - ot->exec= uv_texture_add_exec; + ot->poll = layers_poll; + ot->exec = uv_texture_add_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int drop_named_image_invoke(bContext *C, wmOperator *op, wmEvent *event) @@ -584,16 +584,16 @@ static int drop_named_image_invoke(bContext *C, wmOperator *op, wmEvent *event) void MESH_OT_drop_named_image(wmOperatorType *ot) { /* identifiers */ - ot->name= "Assign Image to UV Map"; - ot->description= "Assign Image to active UV Map, or create an UV Map"; - ot->idname= "MESH_OT_drop_named_image"; + ot->name = "Assign Image to UV Map"; + ot->description = "Assign Image to active UV Map, or create an UV Map"; + ot->idname = "MESH_OT_drop_named_image"; /* api callbacks */ - ot->poll= layers_poll; - ot->invoke= drop_named_image_invoke; + ot->poll = layers_poll; + ot->invoke = drop_named_image_invoke; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; /* properties */ RNA_def_string(ot->srna, "name", "Image", MAX_ID_NAME-2, "Name", "Image name to assign"); @@ -614,16 +614,16 @@ static int uv_texture_remove_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_uv_texture_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove UV Map"; - ot->description= "Remove UV Map"; - ot->idname= "MESH_OT_uv_texture_remove"; + ot->name = "Remove UV Map"; + ot->description = "Remove UV Map"; + ot->idname = "MESH_OT_uv_texture_remove"; /* api callbacks */ - ot->poll= layers_poll; - ot->exec= uv_texture_remove_exec; + ot->poll = layers_poll; + ot->exec = uv_texture_remove_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /*********************** vertex color operators ************************/ @@ -643,16 +643,16 @@ static int vertex_color_add_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_vertex_color_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Vertex Color"; - ot->description= "Add vertex color layer"; - ot->idname= "MESH_OT_vertex_color_add"; + ot->name = "Add Vertex Color"; + ot->description = "Add vertex color layer"; + ot->idname = "MESH_OT_vertex_color_add"; /* api callbacks */ - ot->poll= layers_poll; - ot->exec= vertex_color_add_exec; + ot->poll = layers_poll; + ot->exec = vertex_color_add_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int vertex_color_remove_exec(bContext *C, wmOperator *UNUSED(op)) @@ -669,16 +669,16 @@ static int vertex_color_remove_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_vertex_color_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Vertex Color"; - ot->description= "Remove vertex color layer"; - ot->idname= "MESH_OT_vertex_color_remove"; + ot->name = "Remove Vertex Color"; + ot->description = "Remove vertex color layer"; + ot->idname = "MESH_OT_vertex_color_remove"; /* api callbacks */ - ot->exec= vertex_color_remove_exec; - ot->poll= layers_poll; + ot->exec = vertex_color_remove_exec; + ot->poll = layers_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /*********************** sticky operators ************************/ @@ -707,16 +707,16 @@ static int sticky_add_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_sticky_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Sticky"; - ot->description= "Add sticky UV texture layer"; - ot->idname= "MESH_OT_sticky_add"; + ot->name = "Add Sticky"; + ot->description = "Add sticky UV texture layer"; + ot->idname = "MESH_OT_sticky_add"; /* api callbacks */ - ot->poll= layers_poll; - ot->exec= sticky_add_exec; + ot->poll = layers_poll; + ot->exec = sticky_add_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int sticky_remove_exec(bContext *C, wmOperator *UNUSED(op)) @@ -739,16 +739,16 @@ static int sticky_remove_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_sticky_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Sticky"; - ot->description= "Remove sticky UV texture layer"; - ot->idname= "MESH_OT_sticky_remove"; + ot->name = "Remove Sticky"; + ot->description = "Remove sticky UV texture layer"; + ot->idname = "MESH_OT_sticky_remove"; /* api callbacks */ - ot->poll= layers_poll; - ot->exec= sticky_remove_exec; + ot->poll = layers_poll; + ot->exec = sticky_remove_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /************************** Add Geometry Layers *************************/ diff --git a/source/blender/editors/mesh/mesh_navmesh.c b/source/blender/editors/mesh/mesh_navmesh.c index 38d632ffaee..873bd46a21e 100644 --- a/source/blender/editors/mesh/mesh_navmesh.c +++ b/source/blender/editors/mesh/mesh_navmesh.c @@ -470,15 +470,15 @@ static int create_navmesh_exec(bContext *C, wmOperator *op) void MESH_OT_navmesh_make(wmOperatorType *ot) { /* identifiers */ - ot->name= "Create navigation mesh"; - ot->description= "Create navigation mesh for selected objects"; - ot->idname= "MESH_OT_navmesh_make"; + ot->name = "Create navigation mesh"; + ot->description = "Create navigation mesh for selected objects"; + ot->idname = "MESH_OT_navmesh_make"; /* api callbacks */ - ot->exec= create_navmesh_exec; + ot->exec = create_navmesh_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int navmesh_face_copy_exec(bContext *C, wmOperator *op) @@ -520,16 +520,16 @@ static int navmesh_face_copy_exec(bContext *C, wmOperator *op) void MESH_OT_navmesh_face_copy(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "NavMesh Copy Face Index"; - ot->description= "Copy the index from the active face"; - ot->idname= "MESH_OT_navmesh_face_copy"; + ot->name = "NavMesh Copy Face Index"; + ot->description = "Copy the index from the active face"; + ot->idname = "MESH_OT_navmesh_face_copy"; /* api callbacks */ - ot->poll= ED_operator_editmesh; - ot->exec= navmesh_face_copy_exec; + ot->poll = ED_operator_editmesh; + ot->exec = navmesh_face_copy_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int compare(const void * a, const void * b) @@ -601,16 +601,16 @@ static int navmesh_face_add_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_navmesh_face_add(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "NavMesh New Face Index"; - ot->description= "Add a new index and assign it to selected faces"; - ot->idname= "MESH_OT_navmesh_face_add"; + ot->name = "NavMesh New Face Index"; + ot->description = "Add a new index and assign it to selected faces"; + ot->idname = "MESH_OT_navmesh_face_add"; /* api callbacks */ - ot->poll= ED_operator_editmesh; - ot->exec= navmesh_face_add_exec; + ot->poll = ED_operator_editmesh; + ot->exec = navmesh_face_add_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int navmesh_obmode_data_poll(bContext *C) @@ -650,16 +650,16 @@ static int navmesh_reset_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_navmesh_reset(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "NavMesh Reset Index Values"; - ot->description= "Assign a new index to every face"; - ot->idname= "MESH_OT_navmesh_reset"; + ot->name = "NavMesh Reset Index Values"; + ot->description = "Assign a new index to every face"; + ot->idname = "MESH_OT_navmesh_reset"; /* api callbacks */ - ot->poll= navmesh_obmode_poll; - ot->exec= navmesh_reset_exec; + ot->poll = navmesh_obmode_poll; + ot->exec = navmesh_reset_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int navmesh_clear_exec(bContext *C, wmOperator *UNUSED(op)) @@ -678,14 +678,14 @@ static int navmesh_clear_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_navmesh_clear(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "NavMesh Clear Data"; - ot->description= "Remove navmesh data from this mesh"; - ot->idname= "MESH_OT_navmesh_clear"; + ot->name = "NavMesh Clear Data"; + ot->description = "Remove navmesh data from this mesh"; + ot->idname = "MESH_OT_navmesh_clear"; /* api callbacks */ - ot->poll= navmesh_obmode_data_poll; - ot->exec= navmesh_clear_exec; + ot->poll = navmesh_obmode_data_poll; + ot->exec = navmesh_clear_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index 2d349f6a7bf..2d20743b21b 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -167,16 +167,16 @@ static int mball_select_all_exec(bContext *C, wmOperator *op) void MBALL_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "(De)select All"; - ot->description= "Change selection of all meta elements"; - ot->idname= "MBALL_OT_select_all"; + ot->name = "(De)select All"; + ot->description = "Change selection of all meta elements"; + ot->idname = "MBALL_OT_select_all"; /* callback functions */ - ot->exec= mball_select_all_exec; - ot->poll= ED_operator_editmball; + ot->exec = mball_select_all_exec; + ot->poll = ED_operator_editmball; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_select_all(ot); } @@ -215,17 +215,17 @@ static int select_random_metaelems_exec(bContext *C, wmOperator *op) void MBALL_OT_select_random_metaelems(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Random..."; - ot->description= "Randomly select metaelements"; - ot->idname= "MBALL_OT_select_random_metaelems"; + ot->name = "Random..."; + ot->description = "Randomly select metaelements"; + ot->idname = "MBALL_OT_select_random_metaelems"; /* callback functions */ - ot->exec= select_random_metaelems_exec; - ot->invoke= WM_operator_props_popup; - ot->poll= ED_operator_editmball; + ot->exec = select_random_metaelems_exec; + ot->invoke = WM_operator_props_popup; + ot->poll = ED_operator_editmball; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_float_percentage(ot->srna, "percent", 0.5f, 0.0f, 1.0f, "Percent", "Percentage of metaelems to select randomly", 0.0001f, 1.0f); @@ -274,17 +274,17 @@ static int duplicate_metaelems_invoke(bContext *C, wmOperator *op, wmEvent *UNUS void MBALL_OT_duplicate_metaelems(wmOperatorType *ot) { /* identifiers */ - ot->name= "Duplicate Metaelements"; - ot->description= "Delete selected metaelement(s)"; - ot->idname= "MBALL_OT_duplicate_metaelems"; + ot->name = "Duplicate Metaelements"; + ot->description = "Delete selected metaelement(s)"; + ot->idname = "MBALL_OT_duplicate_metaelems"; /* callback functions */ - ot->exec= duplicate_metaelems_exec; - ot->invoke= duplicate_metaelems_invoke; - ot->poll= ED_operator_editmball; + ot->exec = duplicate_metaelems_exec; + ot->invoke = duplicate_metaelems_invoke; + ot->poll = ED_operator_editmball; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* to give to transform */ RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); @@ -320,16 +320,16 @@ static int delete_metaelems_exec(bContext *C, wmOperator *UNUSED(op)) void MBALL_OT_delete_metaelems(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete"; - ot->description= "Delete selected metaelement(s)"; - ot->idname= "MBALL_OT_delete_metaelems"; + ot->name = "Delete"; + ot->description = "Delete selected metaelement(s)"; + ot->idname = "MBALL_OT_delete_metaelems"; /* callback functions */ - ot->exec= delete_metaelems_exec; - ot->poll= ED_operator_editmball; + ot->exec = delete_metaelems_exec; + ot->poll = ED_operator_editmball; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /***************************** Hide operator *****************************/ @@ -360,16 +360,16 @@ static int hide_metaelems_exec(bContext *C, wmOperator *op) void MBALL_OT_hide_metaelems(wmOperatorType *ot) { /* identifiers */ - ot->name= "Hide"; - ot->description= "Hide (un)selected metaelement(s)"; - ot->idname= "MBALL_OT_hide_metaelems"; + ot->name = "Hide"; + ot->description = "Hide (un)selected metaelement(s)"; + ot->idname = "MBALL_OT_hide_metaelems"; /* callback functions */ - ot->exec= hide_metaelems_exec; - ot->poll= ED_operator_editmball; + ot->exec = hide_metaelems_exec; + ot->poll = ED_operator_editmball; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected"); @@ -401,16 +401,16 @@ static int reveal_metaelems_exec(bContext *C, wmOperator *UNUSED(op)) void MBALL_OT_reveal_metaelems(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reveal"; - ot->description= "Reveal all hidden metaelements"; - ot->idname= "MBALL_OT_reveal_metaelems"; + ot->name = "Reveal"; + ot->description = "Reveal all hidden metaelements"; + ot->idname = "MBALL_OT_reveal_metaelems"; /* callback functions */ - ot->exec= reveal_metaelems_exec; - ot->poll= ED_operator_editmball; + ot->exec = reveal_metaelems_exec; + ot->poll = ED_operator_editmball; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* Select MetaElement with mouse click (user can select radius circle or diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 996dd4ca59f..8a8ce53c1d5 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -365,18 +365,18 @@ static int object_add_exec(bContext *C, wmOperator *op) void OBJECT_OT_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Object"; + ot->name = "Add Object"; ot->description = "Add an object to the scene"; - ot->idname= "OBJECT_OT_add"; + ot->idname = "OBJECT_OT_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= object_add_exec; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = object_add_exec; - ot->poll= ED_operator_objectmode; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_enum(ot->srna, "type", object_type_items, 0, "Type", ""); @@ -457,20 +457,20 @@ static int effector_add_exec(bContext *C, wmOperator *op) void OBJECT_OT_effector_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Effector"; + ot->name = "Add Effector"; ot->description = "Add an empty object with a physics effector to the scene"; - ot->idname= "OBJECT_OT_effector_add"; + ot->idname = "OBJECT_OT_effector_add"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= effector_add_exec; + ot->invoke = WM_menu_invoke; + ot->exec = effector_add_exec; - ot->poll= ED_operator_objectmode; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; - ot->prop= RNA_def_enum(ot->srna, "type", field_type_items, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", field_type_items, 0, "Type", ""); ED_object_add_generic_props(ot, TRUE); } @@ -512,16 +512,16 @@ void OBJECT_OT_camera_add(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Add Camera"; + ot->name = "Add Camera"; ot->description = "Add a camera object to the scene"; - ot->idname= "OBJECT_OT_camera_add"; + ot->idname = "OBJECT_OT_camera_add"; /* api callbacks */ - ot->exec= object_camera_add_exec; - ot->poll= ED_operator_objectmode; + ot->exec = object_camera_add_exec; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; ED_object_add_generic_props(ot, TRUE); @@ -590,17 +590,17 @@ static int object_metaball_add_invoke(bContext *C, wmOperator *op, wmEvent *UNUS void OBJECT_OT_metaball_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Metaball"; - ot->description= "Add an metaball object to the scene"; - ot->idname= "OBJECT_OT_metaball_add"; + ot->name = "Add Metaball"; + ot->description = "Add an metaball object to the scene"; + ot->idname = "OBJECT_OT_metaball_add"; /* api callbacks */ - ot->invoke= object_metaball_add_invoke; - ot->exec= object_metaball_add_exec; - ot->poll= ED_operator_scene_editable; + ot->invoke = object_metaball_add_invoke; + ot->exec = object_metaball_add_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_enum(ot->srna, "type", metaelem_type_items, 0, "Primitive", ""); ED_object_add_generic_props(ot, TRUE); @@ -630,17 +630,17 @@ static int object_add_text_exec(bContext *C, wmOperator *op) void OBJECT_OT_text_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Text"; + ot->name = "Add Text"; ot->description = "Add a text object to the scene"; - ot->idname= "OBJECT_OT_text_add"; + ot->idname = "OBJECT_OT_text_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= object_add_text_exec; - ot->poll= ED_operator_objectmode; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = object_add_text_exec; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; ED_object_add_generic_props(ot, TRUE); } @@ -685,17 +685,17 @@ static int object_armature_add_exec(bContext *C, wmOperator *op) void OBJECT_OT_armature_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Armature"; + ot->name = "Add Armature"; ot->description = "Add an armature object to the scene"; - ot->idname= "OBJECT_OT_armature_add"; + ot->idname = "OBJECT_OT_armature_add"; /* api callbacks */ - ot->invoke= ED_object_add_generic_invoke; - ot->exec= object_armature_add_exec; - ot->poll= ED_operator_objectmode; + ot->invoke = ED_object_add_generic_invoke; + ot->exec = object_armature_add_exec; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; ED_object_add_generic_props(ot, TRUE); } @@ -752,20 +752,20 @@ void OBJECT_OT_lamp_add(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Add Lamp"; + ot->name = "Add Lamp"; ot->description = "Add a lamp object to the scene"; - ot->idname= "OBJECT_OT_lamp_add"; + ot->idname = "OBJECT_OT_lamp_add"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= object_lamp_add_exec; - ot->poll= ED_operator_objectmode; + ot->invoke = WM_menu_invoke; + ot->exec = object_lamp_add_exec; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", lamp_type_items, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", lamp_type_items, 0, "Type", ""); ED_object_add_generic_props(ot, FALSE); } @@ -843,16 +843,16 @@ static int object_speaker_add_exec(bContext *C, wmOperator *op) void OBJECT_OT_speaker_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Speaker"; + ot->name = "Add Speaker"; ot->description = "Add a speaker object to the scene"; - ot->idname= "OBJECT_OT_speaker_add"; + ot->idname = "OBJECT_OT_speaker_add"; /* api callbacks */ - ot->exec= object_speaker_add_exec; - ot->poll= ED_operator_objectmode; + ot->exec = object_speaker_add_exec; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; ED_object_add_generic_props(ot, TRUE); } @@ -863,23 +863,23 @@ void OBJECT_OT_group_instance_add(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Add Group Instance"; + ot->name = "Add Group Instance"; ot->description = "Add a dupligroup instance"; - ot->idname= "OBJECT_OT_group_instance_add"; + ot->idname = "OBJECT_OT_group_instance_add"; /* api callbacks */ - ot->invoke= WM_enum_search_invoke; - ot->exec= group_instance_add_exec; + ot->invoke = WM_enum_search_invoke; + ot->exec = group_instance_add_exec; - ot->poll= ED_operator_objectmode; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ prop= RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", ""); RNA_def_enum_funcs(prop, RNA_group_itemf); - ot->prop= prop; + ot->prop = prop; ED_object_add_generic_props(ot, FALSE); } @@ -946,17 +946,17 @@ static int object_delete_exec(bContext *C, wmOperator *op) void OBJECT_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete"; + ot->name = "Delete"; ot->description = "Delete selected objects"; - ot->idname= "OBJECT_OT_delete"; + ot->idname = "OBJECT_OT_delete"; /* api callbacks */ - ot->invoke= WM_operator_confirm; - ot->exec= object_delete_exec; - ot->poll= ED_operator_objectmode; + ot->invoke = WM_operator_confirm; + ot->exec = object_delete_exec; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "use_global", 0, "Delete Globally", "Remove object from all scenes"); } @@ -1209,17 +1209,17 @@ void OBJECT_OT_duplicates_make_real(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Duplicates Real"; + ot->name = "Make Duplicates Real"; ot->description = "Make dupli objects attached to this object real"; - ot->idname= "OBJECT_OT_duplicates_make_real"; + ot->idname = "OBJECT_OT_duplicates_make_real"; /* api callbacks */ - ot->exec= object_duplicates_make_real_exec; + ot->exec = object_duplicates_make_real_exec; - ot->poll= ED_operator_objectmode; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "use_base_parent", 0, "Parent", "Parent newly created objects to the original duplicator"); RNA_def_boolean(ot->srna, "use_hierarchy", 0, "Keep Hierarchy", "Maintain parent child relationships"); @@ -1580,20 +1580,20 @@ static int convert_exec(bContext *C, wmOperator *op) void OBJECT_OT_convert(wmOperatorType *ot) { /* identifiers */ - ot->name= "Convert to"; + ot->name = "Convert to"; ot->description = "Convert selected objects to another type"; - ot->idname= "OBJECT_OT_convert"; + ot->idname = "OBJECT_OT_convert"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= convert_exec; - ot->poll= convert_poll; + ot->invoke = WM_menu_invoke; + ot->exec = convert_exec; + ot->poll = convert_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "target", convert_target_items, OB_MESH, "Target", "Type of object to convert to"); + ot->prop = RNA_def_enum(ot->srna, "target", convert_target_items, OB_MESH, "Target", "Type of object to convert to"); RNA_def_boolean(ot->srna, "keep_original", 0, "Keep Original", "Keep original objects instead of replacing them"); } @@ -1910,16 +1910,16 @@ void OBJECT_OT_duplicate(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Duplicate Objects"; + ot->name = "Duplicate Objects"; ot->description = "Duplicate selected objects"; - ot->idname= "OBJECT_OT_duplicate"; + ot->idname = "OBJECT_OT_duplicate"; /* api callbacks */ - ot->exec= duplicate_exec; - ot->poll= ED_operator_objectmode; + ot->exec = duplicate_exec; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* to give to transform */ RNA_def_boolean(ot->srna, "linked", 0, "Linked", "Duplicate object but not object data, linking to the original data"); @@ -1981,16 +1981,16 @@ static int add_named_exec(bContext *C, wmOperator *op) void OBJECT_OT_add_named(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Named Object"; + ot->name = "Add Named Object"; ot->description = "Add named object"; - ot->idname= "OBJECT_OT_add_named"; + ot->idname = "OBJECT_OT_add_named"; /* api callbacks */ - ot->exec= add_named_exec; - ot->poll= ED_operator_objectmode; + ot->exec = add_named_exec; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "linked", 0, "Linked", "Duplicate object but not object data, linking to the original data"); RNA_def_string(ot->srna, "name", "Cube", MAX_ID_NAME-2, "Name", "Object name to add"); @@ -2039,16 +2039,16 @@ static int join_exec(bContext *C, wmOperator *op) void OBJECT_OT_join(wmOperatorType *ot) { /* identifiers */ - ot->name= "Join"; + ot->name = "Join"; ot->description = "Join selected objects into active object"; - ot->idname= "OBJECT_OT_join"; + ot->idname = "OBJECT_OT_join"; /* api callbacks */ - ot->exec= join_exec; - ot->poll= join_poll; + ot->exec = join_exec; + ot->poll = join_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /**************************** Join as Shape Key*************************/ @@ -2088,14 +2088,14 @@ static int join_shapes_exec(bContext *C, wmOperator *op) void OBJECT_OT_join_shapes(wmOperatorType *ot) { /* identifiers */ - ot->name= "Join as Shapes"; + ot->name = "Join as Shapes"; ot->description = "Merge selected objects to shapes of active object"; - ot->idname= "OBJECT_OT_join_shapes"; + ot->idname = "OBJECT_OT_join_shapes"; /* api callbacks */ - ot->exec= join_shapes_exec; - ot->poll= join_shapes_poll; + ot->exec = join_shapes_exec; + ot->poll = join_shapes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index b9cbc653c19..4f64a64607e 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -1536,12 +1536,12 @@ static int bake_image_exec(bContext *C, wmOperator *op) void OBJECT_OT_bake_image(wmOperatorType *ot) { /* identifiers */ - ot->name= "Bake"; - ot->description= "Bake image textures of selected objects"; - ot->idname= "OBJECT_OT_bake_image"; + ot->name = "Bake"; + ot->description = "Bake image textures of selected objects"; + ot->idname = "OBJECT_OT_bake_image"; /* api callbacks */ - ot->exec= bake_image_exec; - ot->invoke= objects_bake_render_invoke; - ot->modal= objects_bake_render_modal; + ot->exec = bake_image_exec; + ot->invoke = objects_bake_render_invoke; + ot->modal = objects_bake_render_modal; } diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 2529b6f518f..e1dca0278f4 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -644,16 +644,16 @@ static int stretchto_reset_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e void CONSTRAINT_OT_stretchto_reset (wmOperatorType *ot) { /* identifiers */ - ot->name= "Reset Original Length"; - ot->idname= "CONSTRAINT_OT_stretchto_reset"; - ot->description= "Reset original length of bone for Stretch To Constraint"; + ot->name = "Reset Original Length"; + ot->idname = "CONSTRAINT_OT_stretchto_reset"; + ot->description = "Reset original length of bone for Stretch To Constraint"; - ot->exec= stretchto_reset_exec; - ot->invoke= stretchto_reset_invoke; - ot->poll= edit_constraint_poll; + ot->exec = stretchto_reset_exec; + ot->invoke = stretchto_reset_invoke; + ot->poll = edit_constraint_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_constraint_properties(ot); } @@ -687,16 +687,16 @@ static int limitdistance_reset_invoke(bContext *C, wmOperator *op, wmEvent *UNUS void CONSTRAINT_OT_limitdistance_reset (wmOperatorType *ot) { /* identifiers */ - ot->name= "Reset Distance"; - ot->idname= "CONSTRAINT_OT_limitdistance_reset"; - ot->description= "Reset limiting distance for Limit Distance Constraint"; + ot->name = "Reset Distance"; + ot->idname = "CONSTRAINT_OT_limitdistance_reset"; + ot->description = "Reset limiting distance for Limit Distance Constraint"; - ot->exec= limitdistance_reset_exec; - ot->invoke= limitdistance_reset_invoke; - ot->poll= edit_constraint_poll; + ot->exec = limitdistance_reset_exec; + ot->invoke = limitdistance_reset_invoke; + ot->poll = edit_constraint_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_constraint_properties(ot); } @@ -813,16 +813,16 @@ static int childof_set_inverse_invoke(bContext *C, wmOperator *op, wmEvent *UNUS void CONSTRAINT_OT_childof_set_inverse (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Inverse"; - ot->idname= "CONSTRAINT_OT_childof_set_inverse"; - ot->description= "Set inverse correction for ChildOf constraint"; + ot->name = "Set Inverse"; + ot->idname = "CONSTRAINT_OT_childof_set_inverse"; + ot->description = "Set inverse correction for ChildOf constraint"; - ot->exec= childof_set_inverse_exec; - ot->invoke= childof_set_inverse_invoke; - ot->poll= edit_constraint_poll; + ot->exec = childof_set_inverse_exec; + ot->invoke = childof_set_inverse_invoke; + ot->poll = edit_constraint_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_constraint_properties(ot); } @@ -857,16 +857,16 @@ static int childof_clear_inverse_invoke(bContext *C, wmOperator *op, wmEvent *UN void CONSTRAINT_OT_childof_clear_inverse (wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Inverse"; - ot->idname= "CONSTRAINT_OT_childof_clear_inverse"; - ot->description= "Clear inverse correction for ChildOf constraint"; + ot->name = "Clear Inverse"; + ot->idname = "CONSTRAINT_OT_childof_clear_inverse"; + ot->description = "Clear inverse correction for ChildOf constraint"; - ot->exec= childof_clear_inverse_exec; - ot->invoke= childof_clear_inverse_invoke; - ot->poll= edit_constraint_poll; + ot->exec = childof_clear_inverse_exec; + ot->invoke = childof_clear_inverse_invoke; + ot->poll = edit_constraint_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_constraint_properties(ot); } @@ -904,16 +904,16 @@ static int objectsolver_set_inverse_invoke(bContext *C, wmOperator *op, wmEvent void CONSTRAINT_OT_objectsolver_set_inverse (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Inverse"; - ot->idname= "CONSTRAINT_OT_objectsolver_set_inverse"; - ot->description= "Set inverse correction for ObjectSolver constraint"; + ot->name = "Set Inverse"; + ot->idname = "CONSTRAINT_OT_objectsolver_set_inverse"; + ot->description = "Set inverse correction for ObjectSolver constraint"; - ot->exec= objectsolver_set_inverse_exec; - ot->invoke= objectsolver_set_inverse_invoke; - ot->poll= edit_constraint_poll; + ot->exec = objectsolver_set_inverse_exec; + ot->invoke = objectsolver_set_inverse_invoke; + ot->poll = edit_constraint_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_constraint_properties(ot); } @@ -947,16 +947,16 @@ static int objectsolver_clear_inverse_invoke(bContext *C, wmOperator *op, wmEven void CONSTRAINT_OT_objectsolver_clear_inverse (wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Inverse"; - ot->idname= "CONSTRAINT_OT_objectsolver_clear_inverse"; - ot->description= "Clear inverse correction for ObjectSolver constraint"; + ot->name = "Clear Inverse"; + ot->idname = "CONSTRAINT_OT_objectsolver_clear_inverse"; + ot->description = "Clear inverse correction for ObjectSolver constraint"; - ot->exec= objectsolver_clear_inverse_exec; - ot->invoke= objectsolver_clear_inverse_invoke; - ot->poll= edit_constraint_poll; + ot->exec = objectsolver_clear_inverse_exec; + ot->invoke = objectsolver_clear_inverse_invoke; + ot->poll = edit_constraint_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_constraint_properties(ot); } @@ -1033,16 +1033,16 @@ static int constraint_delete_exec (bContext *C, wmOperator *UNUSED(op)) void CONSTRAINT_OT_delete (wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Constraint"; - ot->idname= "CONSTRAINT_OT_delete"; - ot->description= "Remove constraint from constraint stack"; + ot->name = "Delete Constraint"; + ot->idname = "CONSTRAINT_OT_delete"; + ot->description = "Remove constraint from constraint stack"; /* callbacks */ - ot->exec= constraint_delete_exec; - ot->poll= constraint_poll; + ot->exec = constraint_delete_exec; + ot->poll = constraint_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int constraint_move_down_exec (bContext *C, wmOperator *op) @@ -1078,17 +1078,17 @@ static int constraint_move_down_invoke(bContext *C, wmOperator *op, wmEvent *UNU void CONSTRAINT_OT_move_down (wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Constraint Down"; - ot->idname= "CONSTRAINT_OT_move_down"; - ot->description= "Move constraint down in constraint stack"; + ot->name = "Move Constraint Down"; + ot->idname = "CONSTRAINT_OT_move_down"; + ot->description = "Move constraint down in constraint stack"; /* callbacks */ - ot->exec= constraint_move_down_exec; - ot->invoke= constraint_move_down_invoke; - ot->poll= edit_constraint_poll; + ot->exec = constraint_move_down_exec; + ot->invoke = constraint_move_down_invoke; + ot->poll = edit_constraint_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_constraint_properties(ot); } @@ -1125,17 +1125,17 @@ static int constraint_move_up_invoke(bContext *C, wmOperator *op, wmEvent *UNUSE void CONSTRAINT_OT_move_up (wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Constraint Up"; - ot->idname= "CONSTRAINT_OT_move_up"; - ot->description= "Move constraint up in constraint stack"; + ot->name = "Move Constraint Up"; + ot->idname = "CONSTRAINT_OT_move_up"; + ot->description = "Move constraint up in constraint stack"; /* callbacks */ - ot->exec= constraint_move_up_exec; - ot->invoke= constraint_move_up_invoke; - ot->poll= edit_constraint_poll; + ot->exec = constraint_move_up_exec; + ot->invoke = constraint_move_up_invoke; + ot->poll = edit_constraint_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_constraint_properties(ot); } @@ -1173,12 +1173,12 @@ void POSE_OT_constraints_clear(wmOperatorType *ot) { /* identifiers */ ot->name = "Clear Pose Constraints"; - ot->idname= "POSE_OT_constraints_clear"; - ot->description= "Clear all the constraints for the selected bones"; + ot->idname = "POSE_OT_constraints_clear"; + ot->description = "Clear all the constraints for the selected bones"; /* callbacks */ - ot->exec= pose_constraints_clear_exec; - ot->poll= ED_operator_posemode; // XXX - do we want to ensure there are selected bones too? + ot->exec = pose_constraints_clear_exec; + ot->poll = ED_operator_posemode; // XXX - do we want to ensure there are selected bones too? } @@ -1208,12 +1208,12 @@ void OBJECT_OT_constraints_clear(wmOperatorType *ot) { /* identifiers */ ot->name = "Clear Object Constraints"; - ot->idname= "OBJECT_OT_constraints_clear"; - ot->description= "Clear all the constraints for the active Object only"; + ot->idname = "OBJECT_OT_constraints_clear"; + ot->description = "Clear all the constraints for the active Object only"; /* callbacks */ - ot->exec= object_constraints_clear_exec; - ot->poll= ED_operator_object_active_editable; + ot->exec = object_constraints_clear_exec; + ot->poll = ED_operator_object_active_editable; } /************************ copy all constraints operators *********************/ @@ -1253,16 +1253,16 @@ static int pose_constraint_copy_exec(bContext *C, wmOperator *op) void POSE_OT_constraints_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Constraints to Selected"; - ot->idname= "POSE_OT_constraints_copy"; + ot->name = "Copy Constraints to Selected"; + ot->idname = "POSE_OT_constraints_copy"; ot->description = "Copy constraints to other selected bones"; /* api callbacks */ - ot->exec= pose_constraint_copy_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_constraint_copy_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int object_constraint_copy_exec(bContext *C, wmOperator *UNUSED(op)) @@ -1294,16 +1294,16 @@ static int object_constraint_copy_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_constraints_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Constraints to Selected"; - ot->idname= "OBJECT_OT_constraints_copy"; + ot->name = "Copy Constraints to Selected"; + ot->idname = "OBJECT_OT_constraints_copy"; ot->description = "Copy constraints to other selected objects"; /* api callbacks */ - ot->exec= object_constraint_copy_exec; - ot->poll= ED_operator_object_active_editable; + ot->exec = object_constraint_copy_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /************************ add constraint operators *********************/ @@ -1609,77 +1609,77 @@ static int pose_constraint_add_exec(bContext *C, wmOperator *op) void OBJECT_OT_constraint_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Constraint"; + ot->name = "Add Constraint"; ot->description = "Add a constraint to the active object"; - ot->idname= "OBJECT_OT_constraint_add"; + ot->idname = "OBJECT_OT_constraint_add"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= object_constraint_add_exec; - ot->poll= ED_operator_object_active_editable; + ot->invoke = WM_menu_invoke; + ot->exec = object_constraint_add_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", constraint_type_items, 0, "Type", ""); } void OBJECT_OT_constraint_add_with_targets(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Constraint (with Targets)"; + ot->name = "Add Constraint (with Targets)"; ot->description = "Add a constraint to the active object, with target (where applicable) set to the selected Objects/Bones"; - ot->idname= "OBJECT_OT_constraint_add_with_targets"; + ot->idname = "OBJECT_OT_constraint_add_with_targets"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= object_constraint_add_exec; - ot->poll= ED_operator_object_active_editable; + ot->invoke = WM_menu_invoke; + ot->exec = object_constraint_add_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", constraint_type_items, 0, "Type", ""); } void POSE_OT_constraint_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Constraint"; + ot->name = "Add Constraint"; ot->description = "Add a constraint to the active bone"; - ot->idname= "POSE_OT_constraint_add"; + ot->idname = "POSE_OT_constraint_add"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= pose_constraint_add_exec; - ot->poll= ED_operator_posemode; + ot->invoke = WM_menu_invoke; + ot->exec = pose_constraint_add_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", constraint_type_items, 0, "Type", ""); } void POSE_OT_constraint_add_with_targets(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Constraint (with Targets)"; + ot->name = "Add Constraint (with Targets)"; ot->description = "Add a constraint to the active bone, with target (where applicable) set to the selected Objects/Bones"; - ot->idname= "POSE_OT_constraint_add_with_targets"; + ot->idname = "POSE_OT_constraint_add_with_targets"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= pose_constraint_add_exec; - ot->poll= ED_operator_posemode; + ot->invoke = WM_menu_invoke; + ot->exec = pose_constraint_add_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", constraint_type_items, 0, "Type", ""); } /************************ IK Constraint operators *********************/ @@ -1752,17 +1752,17 @@ static int pose_ik_add_exec(bContext *C, wmOperator *op) void POSE_OT_ik_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add IK to Bone"; - ot->description= "Add IK Constraint to the active Bone"; - ot->idname= "POSE_OT_ik_add"; + ot->name = "Add IK to Bone"; + ot->description = "Add IK Constraint to the active Bone"; + ot->idname = "POSE_OT_ik_add"; /* api callbacks */ - ot->invoke= pose_ik_add_invoke; - ot->exec= pose_ik_add_exec; - ot->poll= ED_operator_posemode; + ot->invoke = pose_ik_add_invoke; + ot->exec = pose_ik_add_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "with_targets", 1, "With Targets", "Assign IK Constraint with targets derived from the select bones/objects"); @@ -1803,15 +1803,15 @@ static int pose_ik_clear_exec(bContext *C, wmOperator *UNUSED(op)) void POSE_OT_ik_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove IK"; - ot->description= "Remove all IK Constraints from selected bones"; - ot->idname= "POSE_OT_ik_clear"; + ot->name = "Remove IK"; + ot->description = "Remove all IK Constraints from selected bones"; + ot->idname = "POSE_OT_ik_clear"; /* api callbacks */ - ot->exec= pose_ik_clear_exec; - ot->poll= ED_operator_posemode; + ot->exec = pose_ik_clear_exec; + ot->poll = ED_operator_posemode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index e456e6f0796..10f30818931 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -161,16 +161,16 @@ void OBJECT_OT_hide_view_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Restrict View"; + ot->name = "Clear Restrict View"; ot->description = "Reveal the object by setting the hide flag"; - ot->idname= "OBJECT_OT_hide_view_clear"; + ot->idname = "OBJECT_OT_hide_view_clear"; /* api callbacks */ - ot->exec= object_hide_view_clear_exec; - ot->poll= ED_operator_view3d_active; + ot->exec = object_hide_view_clear_exec; + ot->poll = ED_operator_view3d_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int object_hide_view_set_exec(bContext *C, wmOperator *op) @@ -215,16 +215,16 @@ static int object_hide_view_set_exec(bContext *C, wmOperator *op) void OBJECT_OT_hide_view_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Restrict View"; + ot->name = "Set Restrict View"; ot->description = "Hide the object by setting the hide flag"; - ot->idname= "OBJECT_OT_hide_view_set"; + ot->idname = "OBJECT_OT_hide_view_set"; /* api callbacks */ - ot->exec= object_hide_view_set_exec; - ot->poll= ED_operator_view3d_active; + ot->exec = object_hide_view_set_exec; + ot->poll = ED_operator_view3d_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected objects"); @@ -254,16 +254,16 @@ void OBJECT_OT_hide_render_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Restrict Render"; + ot->name = "Clear Restrict Render"; ot->description = "Reveal the render object by setting the hide render flag"; - ot->idname= "OBJECT_OT_hide_render_clear"; + ot->idname = "OBJECT_OT_hide_render_clear"; /* api callbacks */ - ot->exec= object_hide_render_clear_exec; - ot->poll= ED_operator_view3d_active; + ot->exec = object_hide_render_clear_exec; + ot->poll = ED_operator_view3d_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int object_hide_render_set_exec(bContext *C, wmOperator *op) @@ -290,16 +290,16 @@ static int object_hide_render_set_exec(bContext *C, wmOperator *op) void OBJECT_OT_hide_render_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Restrict Render"; + ot->name = "Set Restrict Render"; ot->description = "Hide the render object by setting the hide render flag"; - ot->idname= "OBJECT_OT_hide_render_set"; + ot->idname = "OBJECT_OT_hide_render_set"; /* api callbacks */ - ot->exec= object_hide_render_set_exec; - ot->poll= ED_operator_view3d_active; + ot->exec = object_hide_render_set_exec; + ot->poll = ED_operator_view3d_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected objects"); } @@ -547,17 +547,17 @@ void OBJECT_OT_editmode_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Editmode"; + ot->name = "Toggle Editmode"; ot->description = "Toggle object's editmode"; - ot->idname= "OBJECT_OT_editmode_toggle"; + ot->idname = "OBJECT_OT_editmode_toggle"; /* api callbacks */ - ot->exec= editmode_toggle_exec; + ot->exec = editmode_toggle_exec; - ot->poll= editmode_toggle_poll; + ot->poll = editmode_toggle_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* *************************** */ @@ -585,16 +585,16 @@ static int posemode_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_posemode_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Pose Mode"; - ot->idname= "OBJECT_OT_posemode_toggle"; - ot->description= "Enable or disable posing/selecting bones"; + ot->name = "Toggle Pose Mode"; + ot->idname = "OBJECT_OT_posemode_toggle"; + ot->description = "Enable or disable posing/selecting bones"; /* api callbacks */ - ot->exec= posemode_exec; - ot->poll= ED_operator_object_active_editable; + ot->exec = posemode_exec; + ot->poll = ED_operator_object_active_editable; /* flag */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static void copymenu_properties(Scene *scene, View3D *v3d, Object *ob) @@ -1071,16 +1071,16 @@ void OBJECT_OT_forcefield_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Force Field"; + ot->name = "Toggle Force Field"; ot->description = "Toggle object's force field"; - ot->idname= "OBJECT_OT_forcefield_toggle"; + ot->idname = "OBJECT_OT_forcefield_toggle"; /* api callbacks */ - ot->exec= forcefield_toggle_exec; - ot->poll= ED_operator_object_active_editable; + ot->exec = forcefield_toggle_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ********************************************** */ @@ -1137,16 +1137,16 @@ static int object_calculate_paths_exec (bContext *C, wmOperator *op) void OBJECT_OT_paths_calculate (wmOperatorType *ot) { /* identifiers */ - ot->name= "Calculate Object Paths"; - ot->idname= "OBJECT_OT_paths_calculate"; - ot->description= "Calculate paths for the selected bones"; + ot->name = "Calculate Object Paths"; + ot->idname = "OBJECT_OT_paths_calculate"; + ot->description = "Calculate paths for the selected bones"; /* api callbacks */ - ot->exec= object_calculate_paths_exec; - ot->poll= ED_operator_object_active_editable; + ot->exec = object_calculate_paths_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* --------- */ @@ -1181,13 +1181,13 @@ static int object_clear_paths_exec (bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_paths_clear (wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Object Paths"; - ot->idname= "OBJECT_OT_paths_clear"; - ot->description= "Clear path caches for selected bones"; + ot->name = "Clear Object Paths"; + ot->idname = "OBJECT_OT_paths_clear"; + ot->description = "Clear path caches for selected bones"; /* api callbacks */ - ot->exec= object_clear_paths_exec; - ot->poll= ED_operator_object_active_editable; + ot->exec = object_clear_paths_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1240,31 +1240,31 @@ static int shade_poll(bContext *C) void OBJECT_OT_shade_flat(wmOperatorType *ot) { /* identifiers */ - ot->name= "Shade Flat"; - ot->description= "Display faces 'flat'"; - ot->idname= "OBJECT_OT_shade_flat"; + ot->name = "Shade Flat"; + ot->description = "Display faces 'flat'"; + ot->idname = "OBJECT_OT_shade_flat"; /* api callbacks */ - ot->poll= shade_poll; - ot->exec= shade_smooth_exec; + ot->poll = shade_poll; + ot->exec = shade_smooth_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } void OBJECT_OT_shade_smooth(wmOperatorType *ot) { /* identifiers */ - ot->name= "Shade Smooth"; - ot->description= "Display faces 'smooth' (using vertex normals)"; - ot->idname= "OBJECT_OT_shade_smooth"; + ot->name = "Shade Smooth"; + ot->description = "Display faces 'smooth' (using vertex normals)"; + ot->idname = "OBJECT_OT_shade_smooth"; /* api callbacks */ - ot->poll= shade_poll; - ot->exec= shade_smooth_exec; + ot->poll = shade_poll; + ot->exec = shade_smooth_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ********************** */ @@ -1450,17 +1450,17 @@ void OBJECT_OT_mode_set(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Set Object Mode"; + ot->name = "Set Object Mode"; ot->description = "Sets the object interaction mode"; - ot->idname= "OBJECT_OT_mode_set"; + ot->idname = "OBJECT_OT_mode_set"; /* api callbacks */ - ot->exec= object_mode_set_exec; + ot->exec = object_mode_set_exec; - ot->poll= ED_operator_object_active_editable; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= 0; /* no register/undo here, leave it to operators being called */ + ot->flag = 0; /* no register/undo here, leave it to operators being called */ prop= RNA_def_enum(ot->srna, "mode", object_mode_items, OB_MODE_OBJECT, "Mode", ""); RNA_def_enum_funcs(prop, object_mode_set_itemsf); @@ -1515,16 +1515,16 @@ static int game_property_new(bContext *C, wmOperator *op) void OBJECT_OT_game_property_new(wmOperatorType *ot) { /* identifiers */ - ot->name= "New Game Property"; - ot->description= "Create a new property available to the game engine"; - ot->idname= "OBJECT_OT_game_property_new"; + ot->name = "New Game Property"; + ot->description = "Create a new property available to the game engine"; + ot->idname = "OBJECT_OT_game_property_new"; /* api callbacks */ - ot->exec= game_property_new; - ot->poll= ED_operator_object_active_editable; + ot->exec = game_property_new; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_enum(ot->srna, "type", gameproperty_type_items, GPROP_FLOAT, "Type", "Type of game property to add"); RNA_def_string(ot->srna, "name", "", MAX_NAME, "Name", "Name of the game property to add"); @@ -1556,16 +1556,16 @@ static int game_property_remove(bContext *C, wmOperator *op) void OBJECT_OT_game_property_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Game Property"; - ot->description= "Remove game property"; - ot->idname= "OBJECT_OT_game_property_remove"; + ot->name = "Remove Game Property"; + ot->description = "Remove game property"; + ot->idname = "OBJECT_OT_game_property_remove"; /* api callbacks */ - ot->exec= game_property_remove; - ot->poll= ED_operator_object_active_editable; + ot->exec = game_property_remove; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "Property index to remove ", 0, INT_MAX); } @@ -1647,20 +1647,20 @@ void OBJECT_OT_game_property_copy(wmOperatorType *ot) { PropertyRNA *prop; /* identifiers */ - ot->name= "Copy Game Property"; - ot->idname= "OBJECT_OT_game_property_copy"; + ot->name = "Copy Game Property"; + ot->idname = "OBJECT_OT_game_property_copy"; /* api callbacks */ - ot->exec= game_property_copy_exec; - ot->poll= ED_operator_object_active_editable; + ot->exec = game_property_copy_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_enum(ot->srna, "operation", game_properties_copy_operations, 3, "Operation", ""); prop=RNA_def_enum(ot->srna, "property", gameprops_items, 0, "Property", "Properties to copy"); RNA_def_enum_funcs(prop, gameprops_itemf); - ot->prop=prop; + ot->prop = prop; } static int game_property_clear_exec(bContext *C, wmOperator *UNUSED(op)) @@ -1676,15 +1676,15 @@ static int game_property_clear_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_game_property_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Game Property"; - ot->idname= "OBJECT_OT_game_property_clear"; + ot->name = "Clear Game Property"; + ot->idname = "OBJECT_OT_game_property_clear"; /* api callbacks */ - ot->exec= game_property_clear_exec; - ot->poll= ED_operator_object_active_editable; + ot->exec = game_property_clear_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /************************ Copy Logic Bricks ***********************/ @@ -1733,16 +1733,16 @@ static int logicbricks_copy_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_logic_bricks_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Logic Bricks to Selected"; + ot->name = "Copy Logic Bricks to Selected"; ot->description = "Copy logic bricks to other selected objects"; - ot->idname= "OBJECT_OT_logic_bricks_copy"; + ot->idname = "OBJECT_OT_logic_bricks_copy"; /* api callbacks */ - ot->exec= logicbricks_copy_exec; - ot->poll= ED_operator_object_active_editable; + ot->exec = logicbricks_copy_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int game_physics_copy_exec(bContext *C, wmOperator *UNUSED(op)) @@ -1781,14 +1781,14 @@ static int game_physics_copy_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_game_physics_copy(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Game Physics Properties to Selected"; + ot->name = "Copy Game Physics Properties to Selected"; ot->description = "Copy game physics properties to other selected objects"; - ot->idname= "OBJECT_OT_game_physics_copy"; + ot->idname = "OBJECT_OT_game_physics_copy"; /* api callbacks */ - ot->exec= game_physics_copy_exec; - ot->poll= ED_operator_object_active_editable; + ot->exec = game_physics_copy_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } diff --git a/source/blender/editors/object/object_group.c b/source/blender/editors/object/object_group.c index d5dfbda8696..fd664275259 100644 --- a/source/blender/editors/object/object_group.c +++ b/source/blender/editors/object/object_group.c @@ -94,16 +94,16 @@ static int objects_add_active_exec(bContext *C, wmOperator *op) void GROUP_OT_objects_add_active(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Selected To Active Group"; + ot->name = "Add Selected To Active Group"; ot->description = "Add the object to an object group that contains the active object"; - ot->idname= "GROUP_OT_objects_add_active"; + ot->idname = "GROUP_OT_objects_add_active"; /* api callbacks */ - ot->exec= objects_add_active_exec; - ot->poll= ED_operator_objectmode; + ot->exec = objects_add_active_exec; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int objects_remove_active_exec(bContext *C, wmOperator *op) @@ -141,16 +141,16 @@ static int objects_remove_active_exec(bContext *C, wmOperator *op) void GROUP_OT_objects_remove_active(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Selected From Active Group"; + ot->name = "Remove Selected From Active Group"; ot->description = "Remove the object from an object group that contains the active object"; - ot->idname= "GROUP_OT_objects_remove_active"; + ot->idname = "GROUP_OT_objects_remove_active"; /* api callbacks */ - ot->exec= objects_remove_active_exec; - ot->poll= ED_operator_objectmode; + ot->exec = objects_remove_active_exec; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int group_objects_remove_exec(bContext *C, wmOperator *UNUSED(op)) @@ -175,16 +175,16 @@ static int group_objects_remove_exec(bContext *C, wmOperator *UNUSED(op)) void GROUP_OT_objects_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove From Groups"; + ot->name = "Remove From Groups"; ot->description = "Remove selected objects from all groups"; - ot->idname= "GROUP_OT_objects_remove"; + ot->idname = "GROUP_OT_objects_remove"; /* api callbacks */ - ot->exec= group_objects_remove_exec; - ot->poll= ED_operator_objectmode; + ot->exec = group_objects_remove_exec; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int group_create_exec(bContext *C, wmOperator *op) @@ -212,16 +212,16 @@ static int group_create_exec(bContext *C, wmOperator *op) void GROUP_OT_create(wmOperatorType *ot) { /* identifiers */ - ot->name= "Create New Group"; + ot->name = "Create New Group"; ot->description = "Create an object group from selected objects"; - ot->idname= "GROUP_OT_create"; + ot->idname = "GROUP_OT_create"; /* api callbacks */ - ot->exec= group_create_exec; - ot->poll= ED_operator_objectmode; + ot->exec = group_create_exec; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_string(ot->srna, "name", "Group", MAX_ID_NAME-2, "Name", "Name of the new group"); } @@ -248,15 +248,15 @@ static int group_add_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_group_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add to Group"; - ot->idname= "OBJECT_OT_group_add"; + ot->name = "Add to Group"; + ot->idname = "OBJECT_OT_group_add"; ot->description = "Add an object to a new group"; /* api callbacks */ - ot->exec= group_add_exec; + ot->exec = group_add_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int group_link_exec(bContext *C, wmOperator *op) @@ -280,21 +280,21 @@ void OBJECT_OT_group_link(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Link to Group"; - ot->idname= "OBJECT_OT_group_link"; + ot->name = "Link to Group"; + ot->idname = "OBJECT_OT_group_link"; ot->description = "Add an object to an existing group"; /* api callbacks */ - ot->exec= group_link_exec; - ot->invoke= WM_enum_search_invoke; + ot->exec = group_link_exec; + ot->invoke = WM_enum_search_invoke; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ prop= RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", ""); RNA_def_enum_funcs(prop, RNA_group_local_itemf); - ot->prop= prop; + ot->prop = prop; } static int group_remove_exec(bContext *C, wmOperator *UNUSED(op)) @@ -316,13 +316,13 @@ static int group_remove_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_group_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Group"; - ot->idname= "OBJECT_OT_group_remove"; + ot->name = "Remove Group"; + ot->idname = "OBJECT_OT_group_remove"; /* api callbacks */ - ot->exec= group_remove_exec; + ot->exec = group_remove_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index eb128ad3025..13294a3e240 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -505,16 +505,16 @@ static int object_add_hook_selob_exec(bContext *C, wmOperator *op) void OBJECT_OT_hook_add_selobj(wmOperatorType *ot) { /* identifiers */ - ot->name= "Hook to Selected Object"; - ot->description= "Hook selected vertices to the first selected Object"; - ot->idname= "OBJECT_OT_hook_add_selob"; + ot->name = "Hook to Selected Object"; + ot->description = "Hook selected vertices to the first selected Object"; + ot->idname = "OBJECT_OT_hook_add_selob"; /* api callbacks */ - ot->exec= object_add_hook_selob_exec; - ot->poll= hook_op_edit_poll; + ot->exec = object_add_hook_selob_exec; + ot->poll = hook_op_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int object_add_hook_newob_exec(bContext *C, wmOperator *UNUSED(op)) @@ -533,16 +533,16 @@ static int object_add_hook_newob_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_hook_add_newobj(wmOperatorType *ot) { /* identifiers */ - ot->name= "Hook to New Object"; - ot->description= "Hook selected vertices to the first selected Object"; - ot->idname= "OBJECT_OT_hook_add_newob"; + ot->name = "Hook to New Object"; + ot->description = "Hook selected vertices to the first selected Object"; + ot->idname = "OBJECT_OT_hook_add_newob"; /* api callbacks */ - ot->exec= object_add_hook_newob_exec; - ot->poll= hook_op_edit_poll; + ot->exec = object_add_hook_newob_exec; + ot->poll = hook_op_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int object_hook_remove_exec(bContext *C, wmOperator *op) @@ -602,24 +602,24 @@ void OBJECT_OT_hook_remove(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Remove Hook"; - ot->idname= "OBJECT_OT_hook_remove"; - ot->description= "Remove a hook from the active object"; + ot->name = "Remove Hook"; + ot->idname = "OBJECT_OT_hook_remove"; + ot->description = "Remove a hook from the active object"; /* api callbacks */ - ot->exec= object_hook_remove_exec; - ot->invoke= WM_menu_invoke; - ot->poll= hook_op_edit_poll; + ot->exec = object_hook_remove_exec; + ot->invoke = WM_menu_invoke; + ot->poll = hook_op_edit_poll; /* flags */ /* this operator removes modifier which isn't stored in local undo stack, * so redoing it from redo panel gives totally weird results */ - ot->flag= /*OPTYPE_REGISTER|*/OPTYPE_UNDO; + ot->flag = /*OPTYPE_REGISTER|*/OPTYPE_UNDO; /* properties */ prop= RNA_def_enum(ot->srna, "modifier", DummyRNA_NULL_items, 0, "Modifier", "Modifier number to remove"); RNA_def_enum_funcs(prop, hook_mod_itemf); - ot->prop= prop; + ot->prop = prop; } static int object_hook_reset_exec(bContext *C, wmOperator *op) @@ -672,16 +672,16 @@ void OBJECT_OT_hook_reset(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Reset Hook"; - ot->description= "Recalculate and clear offset transformation"; - ot->idname= "OBJECT_OT_hook_reset"; + ot->name = "Reset Hook"; + ot->description = "Recalculate and clear offset transformation"; + ot->idname = "OBJECT_OT_hook_reset"; /* callbacks */ - ot->exec= object_hook_reset_exec; - ot->poll= hook_op_edit_poll; + ot->exec = object_hook_reset_exec; + ot->poll = hook_op_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ prop= RNA_def_enum(ot->srna, "modifier", DummyRNA_NULL_items, 0, "Modifier", "Modifier number to assign to"); @@ -728,16 +728,16 @@ void OBJECT_OT_hook_recenter(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Recenter Hook"; - ot->description= "Set hook center to cursor position"; - ot->idname= "OBJECT_OT_hook_recenter"; + ot->name = "Recenter Hook"; + ot->description = "Set hook center to cursor position"; + ot->idname = "OBJECT_OT_hook_recenter"; /* callbacks */ - ot->exec= object_hook_recenter_exec; - ot->poll= hook_op_edit_poll; + ot->exec = object_hook_recenter_exec; + ot->poll = hook_op_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ prop= RNA_def_enum(ot->srna, "modifier", DummyRNA_NULL_items, 0, "Modifier", "Modifier number to assign to"); @@ -792,18 +792,18 @@ void OBJECT_OT_hook_assign(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Assign to Hook"; - ot->description= "Assign the selected vertices to a hook"; - ot->idname= "OBJECT_OT_hook_assign"; + ot->name = "Assign to Hook"; + ot->description = "Assign the selected vertices to a hook"; + ot->idname = "OBJECT_OT_hook_assign"; /* callbacks */ - ot->exec= object_hook_assign_exec; - ot->poll= hook_op_edit_poll; + ot->exec = object_hook_assign_exec; + ot->poll = hook_op_edit_poll; /* flags */ /* this operator changes data stored in modifier which doesn't get pushed to undo stack, * so redoing it from redo panel gives totally weird results */ - ot->flag= /*OPTYPE_REGISTER|*/OPTYPE_UNDO; + ot->flag = /*OPTYPE_REGISTER|*/OPTYPE_UNDO; /* properties */ prop= RNA_def_enum(ot->srna, "modifier", DummyRNA_NULL_items, 0, "Modifier", "Modifier number to assign to"); @@ -843,16 +843,16 @@ void OBJECT_OT_hook_select(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Select Hook"; - ot->description= "Select affected vertices on mesh"; - ot->idname= "OBJECT_OT_hook_select"; + ot->name = "Select Hook"; + ot->description = "Select affected vertices on mesh"; + ot->idname = "OBJECT_OT_hook_select"; /* callbacks */ - ot->exec= object_hook_select_exec; - ot->poll= hook_op_edit_poll; + ot->exec = object_hook_select_exec; + ot->poll = hook_op_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ prop= RNA_def_enum(ot->srna, "modifier", DummyRNA_NULL_items, 0, "Modifier", "Modifier number to remove"); diff --git a/source/blender/editors/object/object_lattice.c b/source/blender/editors/object/object_lattice.c index 67fdb1777b0..8d83bd6f9be 100644 --- a/source/blender/editors/object/object_lattice.c +++ b/source/blender/editors/object/object_lattice.c @@ -240,16 +240,16 @@ static int lattice_select_all_exec(bContext *C, wmOperator *op) void LATTICE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "(De)select All"; - ot->description= "Change selection of all UVW control points"; - ot->idname= "LATTICE_OT_select_all"; + ot->name = "(De)select All"; + ot->description = "Change selection of all UVW control points"; + ot->idname = "LATTICE_OT_select_all"; /* api callbacks */ - ot->exec= lattice_select_all_exec; - ot->poll= ED_operator_editlattice; + ot->exec = lattice_select_all_exec; + ot->poll = ED_operator_editlattice; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_select_all(ot); } @@ -288,16 +288,16 @@ static int make_regular_exec(bContext *C, wmOperator *UNUSED(op)) void LATTICE_OT_make_regular(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Regular"; - ot->description= "Set UVW control points a uniform distance apart"; - ot->idname= "LATTICE_OT_make_regular"; + ot->name = "Make Regular"; + ot->description = "Set UVW control points a uniform distance apart"; + ot->idname = "LATTICE_OT_make_regular"; /* api callbacks */ - ot->exec= make_regular_exec; - ot->poll= make_regular_poll; + ot->exec = make_regular_exec; + ot->poll = make_regular_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /****************************** Mouse Selection *************************/ diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index c420b214a7a..56c150bc662 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -687,22 +687,22 @@ void OBJECT_OT_modifier_add(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Add Modifier"; + ot->name = "Add Modifier"; ot->description = "Add a modifier to the active object"; - ot->idname= "OBJECT_OT_modifier_add"; + ot->idname = "OBJECT_OT_modifier_add"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= modifier_add_exec; - ot->poll= ED_operator_object_active_editable; + ot->invoke = WM_menu_invoke; + ot->exec = modifier_add_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ prop= RNA_def_enum(ot->srna, "type", modifier_type_items, eModifierType_Subsurf, "Type", ""); RNA_def_enum_funcs(prop, modifier_add_itemf); - ot->prop= prop; + ot->prop = prop; } /************************ generic functions for operators using mod names and data context *********************/ @@ -794,16 +794,16 @@ static int modifier_remove_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e void OBJECT_OT_modifier_remove(wmOperatorType *ot) { - ot->name= "Remove Modifier"; - ot->description= "Remove a modifier from the active object"; - ot->idname= "OBJECT_OT_modifier_remove"; + ot->name = "Remove Modifier"; + ot->description = "Remove a modifier from the active object"; + ot->idname = "OBJECT_OT_modifier_remove"; - ot->invoke= modifier_remove_invoke; - ot->exec= modifier_remove_exec; - ot->poll= edit_modifier_poll; + ot->invoke = modifier_remove_invoke; + ot->exec = modifier_remove_exec; + ot->poll = edit_modifier_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_modifier_properties(ot); } @@ -833,16 +833,16 @@ static int modifier_move_up_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED( void OBJECT_OT_modifier_move_up(wmOperatorType *ot) { - ot->name= "Move Up Modifier"; - ot->description= "Move modifier up in the stack"; - ot->idname= "OBJECT_OT_modifier_move_up"; + ot->name = "Move Up Modifier"; + ot->description = "Move modifier up in the stack"; + ot->idname = "OBJECT_OT_modifier_move_up"; - ot->invoke= modifier_move_up_invoke; - ot->exec= modifier_move_up_exec; - ot->poll= edit_modifier_poll; + ot->invoke = modifier_move_up_invoke; + ot->exec = modifier_move_up_exec; + ot->poll = edit_modifier_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_modifier_properties(ot); } @@ -872,16 +872,16 @@ static int modifier_move_down_invoke(bContext *C, wmOperator *op, wmEvent *UNUSE void OBJECT_OT_modifier_move_down(wmOperatorType *ot) { - ot->name= "Move Down Modifier"; - ot->description= "Move modifier down in the stack"; - ot->idname= "OBJECT_OT_modifier_move_down"; + ot->name = "Move Down Modifier"; + ot->description = "Move modifier down in the stack"; + ot->idname = "OBJECT_OT_modifier_move_down"; - ot->invoke= modifier_move_down_invoke; - ot->exec= modifier_move_down_exec; - ot->poll= edit_modifier_poll; + ot->invoke = modifier_move_down_invoke; + ot->exec = modifier_move_down_exec; + ot->poll = edit_modifier_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_modifier_properties(ot); } @@ -919,16 +919,16 @@ static EnumPropertyItem modifier_apply_as_items[] = { void OBJECT_OT_modifier_apply(wmOperatorType *ot) { - ot->name= "Apply Modifier"; - ot->description= "Apply modifier and remove from the stack"; - ot->idname= "OBJECT_OT_modifier_apply"; + ot->name = "Apply Modifier"; + ot->description = "Apply modifier and remove from the stack"; + ot->idname = "OBJECT_OT_modifier_apply"; - ot->invoke= modifier_apply_invoke; - ot->exec= modifier_apply_exec; - ot->poll= edit_modifier_poll; + ot->invoke = modifier_apply_invoke; + ot->exec = modifier_apply_exec; + ot->poll = edit_modifier_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_enum(ot->srna, "apply_as", modifier_apply_as_items, MODIFIER_APPLY_DATA, "Apply as", "How to apply the modifier to the geometry"); edit_modifier_properties(ot); @@ -962,16 +962,16 @@ static int modifier_convert_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED( void OBJECT_OT_modifier_convert(wmOperatorType *ot) { - ot->name= "Convert Modifier"; - ot->description= "Convert particles to a mesh object"; - ot->idname= "OBJECT_OT_modifier_convert"; + ot->name = "Convert Modifier"; + ot->description = "Convert particles to a mesh object"; + ot->idname = "OBJECT_OT_modifier_convert"; - ot->invoke= modifier_convert_invoke; - ot->exec= modifier_convert_exec; - ot->poll= edit_modifier_poll; + ot->invoke = modifier_convert_invoke; + ot->exec = modifier_convert_exec; + ot->poll = edit_modifier_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_modifier_properties(ot); } @@ -1001,16 +1001,16 @@ static int modifier_copy_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve void OBJECT_OT_modifier_copy(wmOperatorType *ot) { - ot->name= "Copy Modifier"; - ot->description= "Duplicate modifier at the same position in the stack"; - ot->idname= "OBJECT_OT_modifier_copy"; + ot->name = "Copy Modifier"; + ot->description = "Duplicate modifier at the same position in the stack"; + ot->idname = "OBJECT_OT_modifier_copy"; - ot->invoke= modifier_copy_invoke; - ot->exec= modifier_copy_exec; - ot->poll= edit_modifier_poll; + ot->invoke = modifier_copy_invoke; + ot->exec = modifier_copy_exec; + ot->poll = edit_modifier_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_modifier_properties(ot); } @@ -1046,16 +1046,16 @@ static int multires_higher_levels_delete_invoke(bContext *C, wmOperator *op, wmE void OBJECT_OT_multires_higher_levels_delete(wmOperatorType *ot) { - ot->name= "Delete Higher Levels"; - ot->description= "Deletes the higher resolution mesh, potential loss of detail"; - ot->idname= "OBJECT_OT_multires_higher_levels_delete"; + ot->name = "Delete Higher Levels"; + ot->description = "Deletes the higher resolution mesh, potential loss of detail"; + ot->idname = "OBJECT_OT_multires_higher_levels_delete"; - ot->poll= multires_poll; - ot->invoke= multires_higher_levels_delete_invoke; - ot->exec= multires_higher_levels_delete_exec; + ot->poll = multires_poll; + ot->invoke = multires_higher_levels_delete_invoke; + ot->exec = multires_higher_levels_delete_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_modifier_properties(ot); } @@ -1087,16 +1087,16 @@ static int multires_subdivide_invoke(bContext *C, wmOperator *op, wmEvent *UNUSE void OBJECT_OT_multires_subdivide(wmOperatorType *ot) { - ot->name= "Multires Subdivide"; - ot->description= "Add a new level of subdivision"; - ot->idname= "OBJECT_OT_multires_subdivide"; + ot->name = "Multires Subdivide"; + ot->description = "Add a new level of subdivision"; + ot->idname = "OBJECT_OT_multires_subdivide"; - ot->poll= multires_poll; - ot->invoke= multires_subdivide_invoke; - ot->exec= multires_subdivide_exec; + ot->poll = multires_poll; + ot->invoke = multires_subdivide_invoke; + ot->exec = multires_subdivide_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_modifier_properties(ot); } @@ -1150,16 +1150,16 @@ static int multires_reshape_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED( void OBJECT_OT_multires_reshape(wmOperatorType *ot) { - ot->name= "Multires Reshape"; - ot->description= "Copy vertex coordinates from other object"; - ot->idname= "OBJECT_OT_multires_reshape"; + ot->name = "Multires Reshape"; + ot->description = "Copy vertex coordinates from other object"; + ot->idname = "OBJECT_OT_multires_reshape"; - ot->poll= multires_poll; - ot->invoke= multires_reshape_invoke; - ot->exec= multires_reshape_exec; + ot->poll = multires_poll; + ot->invoke = multires_reshape_invoke; + ot->exec = multires_reshape_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_modifier_properties(ot); } @@ -1224,17 +1224,17 @@ static int multires_external_save_invoke(bContext *C, wmOperator *op, wmEvent *U void OBJECT_OT_multires_external_save(wmOperatorType *ot) { - ot->name= "Multires Save External"; - ot->description= "Save displacements to an external file"; - ot->idname= "OBJECT_OT_multires_external_save"; + ot->name = "Multires Save External"; + ot->description = "Save displacements to an external file"; + ot->idname = "OBJECT_OT_multires_external_save"; - // XXX modifier no longer in context after file browser .. ot->poll= multires_poll; - ot->exec= multires_external_save_exec; - ot->invoke= multires_external_save_invoke; - ot->poll= multires_poll; + // XXX modifier no longer in context after file browser .. ot->poll = multires_poll; + ot->exec = multires_external_save_exec; + ot->invoke = multires_external_save_invoke; + ot->poll = multires_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_filesel(ot, FOLDERFILE|BTXFILE, FILE_SPECIAL, FILE_SAVE, WM_FILESEL_FILEPATH|WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY); edit_modifier_properties(ot); @@ -1258,15 +1258,15 @@ static int multires_external_pack_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_multires_external_pack(wmOperatorType *ot) { - ot->name= "Multires Pack External"; - ot->description= "Pack displacements from an external file"; - ot->idname= "OBJECT_OT_multires_external_pack"; + ot->name = "Multires Pack External"; + ot->description = "Pack displacements from an external file"; + ot->idname = "OBJECT_OT_multires_external_pack"; - ot->poll= multires_poll; - ot->exec= multires_external_pack_exec; + ot->poll = multires_poll; + ot->exec = multires_external_pack_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************* multires apply base ***********************/ @@ -1297,16 +1297,16 @@ static int multires_base_apply_invoke(bContext *C, wmOperator *op, wmEvent *UNUS void OBJECT_OT_multires_base_apply(wmOperatorType *ot) { - ot->name= "Multires Apply Base"; - ot->description= "Modify the base mesh to conform to the displaced mesh"; - ot->idname= "OBJECT_OT_multires_base_apply"; + ot->name = "Multires Apply Base"; + ot->description = "Modify the base mesh to conform to the displaced mesh"; + ot->idname = "OBJECT_OT_multires_base_apply"; - ot->poll= multires_poll; - ot->invoke= multires_base_apply_invoke; - ot->exec= multires_base_apply_exec; + ot->poll = multires_poll; + ot->invoke = multires_base_apply_invoke; + ot->exec = multires_base_apply_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_modifier_properties(ot); } @@ -1391,17 +1391,17 @@ static int meshdeform_bind_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e void OBJECT_OT_meshdeform_bind(wmOperatorType *ot) { /* identifiers */ - ot->name= "Mesh Deform Bind"; + ot->name = "Mesh Deform Bind"; ot->description = "Bind mesh to cage in mesh deform modifier"; - ot->idname= "OBJECT_OT_meshdeform_bind"; + ot->idname = "OBJECT_OT_meshdeform_bind"; /* api callbacks */ - ot->poll= meshdeform_poll; - ot->invoke= meshdeform_bind_invoke; - ot->exec= meshdeform_bind_exec; + ot->poll = meshdeform_poll; + ot->invoke = meshdeform_bind_invoke; + ot->exec = meshdeform_bind_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_modifier_properties(ot); } @@ -1439,16 +1439,16 @@ static int explode_refresh_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e void OBJECT_OT_explode_refresh(wmOperatorType *ot) { - ot->name= "Explode Refresh"; - ot->description= "Refresh data in the Explode modifier"; - ot->idname= "OBJECT_OT_explode_refresh"; + ot->name = "Explode Refresh"; + ot->description = "Refresh data in the Explode modifier"; + ot->idname = "OBJECT_OT_explode_refresh"; - ot->poll= explode_poll; - ot->invoke= explode_refresh_invoke; - ot->exec= explode_refresh_exec; + ot->poll = explode_poll; + ot->invoke = explode_refresh_invoke; + ot->exec = explode_refresh_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_modifier_properties(ot); } @@ -1654,16 +1654,16 @@ static int ocean_bake_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event) void OBJECT_OT_ocean_bake(wmOperatorType *ot) { - ot->name= "Bake Ocean"; - ot->description= "Bake an image sequence of ocean data"; - ot->idname= "OBJECT_OT_ocean_bake"; + ot->name = "Bake Ocean"; + ot->description = "Bake an image sequence of ocean data"; + ot->idname = "OBJECT_OT_ocean_bake"; - ot->poll= ocean_bake_poll; - ot->invoke= ocean_bake_invoke; - ot->exec= ocean_bake_exec; + ot->poll = ocean_bake_poll; + ot->invoke = ocean_bake_invoke; + ot->exec = ocean_bake_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_modifier_properties(ot); RNA_def_boolean(ot->srna, "free", FALSE, "Free", "Free the bake, rather than generating it"); diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index a388e465a21..8754aa2ca5a 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -260,17 +260,17 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_parent_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Vertex Parent"; + ot->name = "Make Vertex Parent"; ot->description = "Parent selected objects to the selected vertices"; - ot->idname= "OBJECT_OT_vertex_parent_set"; + ot->idname = "OBJECT_OT_vertex_parent_set"; /* api callbacks */ - ot->invoke= WM_operator_confirm; - ot->poll= vertex_parent_set_poll; - ot->exec= vertex_parent_set_exec; + ot->invoke = WM_operator_confirm; + ot->poll = vertex_parent_set_poll; + ot->exec = vertex_parent_set_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** Make Proxy Operator *************************/ @@ -396,22 +396,22 @@ void OBJECT_OT_proxy_make (wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Make Proxy"; - ot->idname= "OBJECT_OT_proxy_make"; - ot->description= "Add empty object to become local replacement data of a library-linked object"; + ot->name = "Make Proxy"; + ot->idname = "OBJECT_OT_proxy_make"; + ot->description = "Add empty object to become local replacement data of a library-linked object"; /* callbacks */ - ot->invoke= make_proxy_invoke; - ot->exec= make_proxy_exec; - ot->poll= ED_operator_object_active; + ot->invoke = make_proxy_invoke; + ot->exec = make_proxy_exec; + ot->poll = ED_operator_object_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ prop= RNA_def_enum(ot->srna, "object", DummyRNA_DEFAULT_items, 0, "Proxy Object", "Name of lib-linked/grouped object to make a proxy for"); /* XXX, relies on hard coded ID at the moment */ RNA_def_enum_funcs(prop, proxy_group_object_itemf); - ot->prop= prop; + ot->prop = prop; } /********************** Clear Parent Operator ******************* */ @@ -464,20 +464,20 @@ static int parent_clear_exec(bContext *C, wmOperator *op) void OBJECT_OT_parent_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Parent"; + ot->name = "Clear Parent"; ot->description = "Clear the object's parenting"; - ot->idname= "OBJECT_OT_parent_clear"; + ot->idname = "OBJECT_OT_parent_clear"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= parent_clear_exec; + ot->invoke = WM_menu_invoke; + ot->exec = parent_clear_exec; - ot->poll= ED_operator_object_active_editable; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; - ot->prop= RNA_def_enum(ot->srna, "type", prop_clear_parent_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_clear_parent_types, 0, "Type", ""); } /* ******************** Make Parent Operator *********************** */ @@ -730,18 +730,18 @@ static int parent_set_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *UNUSE void OBJECT_OT_parent_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Parent"; + ot->name = "Make Parent"; ot->description = "Set the object's parenting"; - ot->idname= "OBJECT_OT_parent_set"; + ot->idname = "OBJECT_OT_parent_set"; /* api callbacks */ - ot->invoke= parent_set_invoke; - ot->exec= parent_set_exec; + ot->invoke = parent_set_invoke; + ot->exec = parent_set_exec; - ot->poll= ED_operator_object_active; + ot->poll = ED_operator_object_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_enum(ot->srna, "type", prop_make_parent_types, 0, "Type", ""); } @@ -787,17 +787,17 @@ static int parent_noinv_set_exec(bContext *C, wmOperator *op) void OBJECT_OT_parent_no_inverse_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Parent without Inverse"; + ot->name = "Make Parent without Inverse"; ot->description = "Set the object's parenting without setting the inverse parent correction"; - ot->idname= "OBJECT_OT_parent_no_inverse_set"; + ot->idname = "OBJECT_OT_parent_no_inverse_set"; /* api callbacks */ - ot->invoke= WM_operator_confirm; - ot->exec= parent_noinv_set_exec; - ot->poll= ED_operator_object_active_editable; + ot->invoke = WM_operator_confirm; + ot->exec = parent_noinv_set_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /************************ Clear Slow Parent Operator *********************/ @@ -829,17 +829,17 @@ void OBJECT_OT_slow_parent_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Slow Parent"; + ot->name = "Clear Slow Parent"; ot->description = "Clear the object's slow parent"; - ot->idname= "OBJECT_OT_slow_parent_clear"; + ot->idname = "OBJECT_OT_slow_parent_clear"; /* api callbacks */ - ot->invoke= WM_operator_confirm; - ot->exec= object_slow_parent_clear_exec; - ot->poll= ED_operator_view3d_active; + ot->invoke = WM_operator_confirm; + ot->exec = object_slow_parent_clear_exec; + ot->poll = ED_operator_view3d_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** Make Slow Parent Operator *********************/ @@ -868,17 +868,17 @@ void OBJECT_OT_slow_parent_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Slow Parent"; + ot->name = "Set Slow Parent"; ot->description = "Set the object's slow parent"; - ot->idname= "OBJECT_OT_slow_parent_set"; + ot->idname = "OBJECT_OT_slow_parent_set"; /* api callbacks */ - ot->invoke= WM_operator_confirm; - ot->exec= object_slow_parent_set_exec; - ot->poll= ED_operator_view3d_active; + ot->invoke = WM_operator_confirm; + ot->exec = object_slow_parent_set_exec; + ot->poll = ED_operator_view3d_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************** Clear Track Operator ******************* */ @@ -929,20 +929,20 @@ static int object_track_clear_exec(bContext *C, wmOperator *op) void OBJECT_OT_track_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear track"; + ot->name = "Clear track"; ot->description = "Clear tracking constraint or flag from object"; - ot->idname= "OBJECT_OT_track_clear"; + ot->idname = "OBJECT_OT_track_clear"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= object_track_clear_exec; + ot->invoke = WM_menu_invoke; + ot->exec = object_track_clear_exec; - ot->poll= ED_operator_objectmode; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; - ot->prop= RNA_def_enum(ot->srna, "type", prop_clear_track_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_clear_track_types, 0, "Type", ""); } /************************** Make Track Operator *****************************/ @@ -1034,21 +1034,21 @@ static int track_set_exec(bContext *C, wmOperator *op) void OBJECT_OT_track_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Track"; + ot->name = "Make Track"; ot->description = "Make the object track another object, either by constraint or old way or locked track"; - ot->idname= "OBJECT_OT_track_set"; + ot->idname = "OBJECT_OT_track_set"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= track_set_exec; + ot->invoke = WM_menu_invoke; + ot->exec = track_set_exec; - ot->poll= ED_operator_objectmode; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_make_track_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_make_track_types, 0, "Type", ""); } /************************** Move to Layer Operator *****************************/ @@ -1145,17 +1145,17 @@ static int move_to_layer_exec(bContext *C, wmOperator *op) void OBJECT_OT_move_to_layer(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move to Layer"; + ot->name = "Move to Layer"; ot->description = "Move the object to different layers"; - ot->idname= "OBJECT_OT_move_to_layer"; + ot->idname = "OBJECT_OT_move_to_layer"; /* api callbacks */ - ot->invoke= move_to_layer_invoke; - ot->exec= move_to_layer_exec; - ot->poll= ED_operator_objectmode; + ot->invoke = move_to_layer_invoke; + ot->exec = move_to_layer_exec; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean_layer_member(ot->srna, "layers", 20, NULL, "Layer", ""); @@ -1323,22 +1323,22 @@ void OBJECT_OT_make_links_scene(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Link Objects to Scene"; + ot->name = "Link Objects to Scene"; ot->description = "Link selection to another scene"; - ot->idname= "OBJECT_OT_make_links_scene"; + ot->idname = "OBJECT_OT_make_links_scene"; /* api callbacks */ - ot->invoke= WM_enum_search_invoke; - ot->exec= make_links_scene_exec; + ot->invoke = WM_enum_search_invoke; + ot->exec = make_links_scene_exec; /* better not run the poll check */ /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ prop= RNA_def_enum(ot->srna, "scene", DummyRNA_NULL_items, 0, "Scene", ""); RNA_def_enum_funcs(prop, RNA_scene_local_itemf); - ot->prop= prop; + ot->prop = prop; } void OBJECT_OT_make_links_data(wmOperatorType *ot) @@ -1352,19 +1352,19 @@ void OBJECT_OT_make_links_data(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Link Data"; + ot->name = "Link Data"; ot->description = "Make links from the active object to other selected objects"; - ot->idname= "OBJECT_OT_make_links_data"; + ot->idname = "OBJECT_OT_make_links_data"; /* api callbacks */ - ot->exec= make_links_data_exec; - ot->poll= ED_operator_object_active; + ot->exec = make_links_data_exec; + ot->poll = ED_operator_object_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", make_links_items, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", make_links_items, 0, "Type", ""); } @@ -1812,20 +1812,20 @@ void OBJECT_OT_make_local(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Make Local"; + ot->name = "Make Local"; ot->description = "Make library linked datablocks local to this file"; - ot->idname= "OBJECT_OT_make_local"; + ot->idname = "OBJECT_OT_make_local"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= make_local_exec; - ot->poll= ED_operator_objectmode; + ot->invoke = WM_menu_invoke; + ot->exec = make_local_exec; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", type_items, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", type_items, 0, "Type", ""); } static int make_single_user_exec(bContext *C, wmOperator *op) @@ -1865,20 +1865,20 @@ void OBJECT_OT_make_single_user(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Make Single User"; + ot->name = "Make Single User"; ot->description = "Make linked data local to each object"; - ot->idname= "OBJECT_OT_make_single_user"; + ot->idname = "OBJECT_OT_make_single_user"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= make_single_user_exec; - ot->poll= ED_operator_objectmode; + ot->invoke = WM_menu_invoke; + ot->exec = make_single_user_exec; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", type_items, SELECT, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", type_items, SELECT, "Type", ""); RNA_def_boolean(ot->srna, "object", 0, "Object", "Make single user objects"); RNA_def_boolean(ot->srna, "obdata", 0, "Object Data", "Make single user object data"); @@ -1913,16 +1913,16 @@ void OBJECT_OT_drop_named_material(wmOperatorType *ot) { /* identifiers */ - ot->name= "Drop Named Material on Object"; + ot->name = "Drop Named Material on Object"; ot->description = ""; - ot->idname= "OBJECT_OT_drop_named_material"; + ot->idname = "OBJECT_OT_drop_named_material"; /* api callbacks */ - ot->invoke= drop_named_material_invoke; - ot->poll= ED_operator_objectmode; + ot->invoke = drop_named_material_invoke; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; /* properties */ RNA_def_string(ot->srna, "name", "Material", MAX_ID_NAME-2, "Name", "Material name to assign"); diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index 66fe2b98968..aff9fe1ac61 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -165,21 +165,21 @@ static int object_select_by_type_exec(bContext *C, wmOperator *op) void OBJECT_OT_select_by_type(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select By Type"; + ot->name = "Select By Type"; ot->description = "Select all visible objects that are of a type"; - ot->idname= "OBJECT_OT_select_by_type"; + ot->idname = "OBJECT_OT_select_by_type"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= object_select_by_type_exec; - ot->poll= objects_selectable_poll; + ot->invoke = WM_menu_invoke; + ot->exec = object_select_by_type_exec; + ot->poll = objects_selectable_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "extend", FALSE, "Extend", "Extend selection instead of deselecting everything first"); - ot->prop= RNA_def_enum(ot->srna, "type", object_type_items, 1, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", object_type_items, 1, "Type", ""); } /*********************** Selection by Links *********************/ @@ -347,21 +347,21 @@ static int object_select_linked_exec(bContext *C, wmOperator *op) void OBJECT_OT_select_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Linked"; + ot->name = "Select Linked"; ot->description = "Select all visible objects that are linked"; - ot->idname= "OBJECT_OT_select_linked"; + ot->idname = "OBJECT_OT_select_linked"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= object_select_linked_exec; - ot->poll= objects_selectable_poll; + ot->invoke = WM_menu_invoke; + ot->exec = object_select_linked_exec; + ot->poll = objects_selectable_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "extend", FALSE, "Extend", "Extend selection instead of deselecting everything first"); - ot->prop= RNA_def_enum(ot->srna, "type", prop_select_linked_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_select_linked_types, 0, "Type", ""); } /*********************** Selected Grouped ********************/ @@ -673,21 +673,21 @@ static int object_select_grouped_exec(bContext *C, wmOperator *op) void OBJECT_OT_select_grouped(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Grouped"; + ot->name = "Select Grouped"; ot->description = "Select all visible objects grouped by various properties"; - ot->idname= "OBJECT_OT_select_grouped"; + ot->idname = "OBJECT_OT_select_grouped"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= object_select_grouped_exec; - ot->poll= objects_selectable_poll; + ot->invoke = WM_menu_invoke; + ot->exec = object_select_grouped_exec; + ot->poll = objects_selectable_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "extend", FALSE, "Extend", "Extend selection instead of deselecting everything first"); - ot->prop= RNA_def_enum(ot->srna, "type", prop_select_grouped_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_select_grouped_types, 0, "Type", ""); } /************************* Select by Layer **********************/ @@ -722,17 +722,17 @@ static int object_select_by_layer_exec(bContext *C, wmOperator *op) void OBJECT_OT_select_by_layer(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select by Layer"; + ot->name = "Select by Layer"; ot->description = "Select all visible objects on a layer"; - ot->idname= "OBJECT_OT_select_by_layer"; + ot->idname = "OBJECT_OT_select_by_layer"; /* api callbacks */ /*ot->invoke = XXX - need a int grid popup*/ - ot->exec= object_select_by_layer_exec; - ot->poll= objects_selectable_poll; + ot->exec = object_select_by_layer_exec; + ot->poll = objects_selectable_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "extend", FALSE, "Extend", "Extend selection instead of deselecting everything first"); @@ -787,16 +787,16 @@ void OBJECT_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "(De)select All"; + ot->name = "(De)select All"; ot->description = "Change selection of all visible objects in scene"; - ot->idname= "OBJECT_OT_select_all"; + ot->idname = "OBJECT_OT_select_all"; /* api callbacks */ - ot->exec= object_select_all_exec; - ot->poll= objects_selectable_poll; + ot->exec = object_select_all_exec; + ot->poll = objects_selectable_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_select_all(ot); } @@ -836,16 +836,16 @@ void OBJECT_OT_select_same_group(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Same Group"; + ot->name = "Select Same Group"; ot->description = "Select object in the same group"; - ot->idname= "OBJECT_OT_select_same_group"; + ot->idname = "OBJECT_OT_select_same_group"; /* api callbacks */ - ot->exec= object_select_same_group_exec; - ot->poll= objects_selectable_poll; + ot->exec = object_select_same_group_exec; + ot->poll = objects_selectable_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_string(ot->srna, "group", "", MAX_ID_NAME, "Group", "Name of the group to select"); } @@ -889,16 +889,16 @@ void OBJECT_OT_select_mirror(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Mirror"; + ot->name = "Select Mirror"; ot->description = "Select the Mirror objects of the selected object eg. L.sword -> R.sword"; - ot->idname= "OBJECT_OT_select_mirror"; + ot->idname = "OBJECT_OT_select_mirror"; /* api callbacks */ - ot->exec= object_select_mirror_exec; - ot->poll= objects_selectable_poll; + ot->exec = object_select_mirror_exec; + ot->poll = objects_selectable_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everything first"); } @@ -936,17 +936,17 @@ static int object_select_random_exec(bContext *C, wmOperator *op) void OBJECT_OT_select_random(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Random"; + ot->name = "Select Random"; ot->description = "Set select on random visible objects"; - ot->idname= "OBJECT_OT_select_random"; + ot->idname = "OBJECT_OT_select_random"; /* api callbacks */ - /*ot->invoke= object_select_random_invoke XXX - need a number popup ;*/ + /*ot->invoke = object_select_random_invoke XXX - need a number popup ;*/ ot->exec = object_select_random_exec; - ot->poll= objects_selectable_poll; + ot->poll = objects_selectable_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_float_percentage(ot->srna, "percent", 50.f, 0.0f, 100.0f, "Percent", "Percentage of objects to select randomly", 0.f, 100.0f); diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index 87a058334c0..b6a775650d4 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -296,16 +296,16 @@ static int shape_key_add_exec(bContext *C, wmOperator *op) void OBJECT_OT_shape_key_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Shape Key"; - ot->idname= "OBJECT_OT_shape_key_add"; - ot->description= "Add shape key to the object"; + ot->name = "Add Shape Key"; + ot->idname = "OBJECT_OT_shape_key_add"; + ot->description = "Add shape key to the object"; /* api callbacks */ - ot->poll= shape_key_mode_poll; - ot->exec= shape_key_add_exec; + ot->poll = shape_key_mode_poll; + ot->exec = shape_key_add_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "from_mix", 1, "From Mix", "Create the new shape key from the existing mix of keys"); @@ -324,16 +324,16 @@ static int shape_key_remove_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_shape_key_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Shape Key"; - ot->idname= "OBJECT_OT_shape_key_remove"; - ot->description= "Remove shape key from the object"; + ot->name = "Remove Shape Key"; + ot->idname = "OBJECT_OT_shape_key_remove"; + ot->description = "Remove shape key from the object"; /* api callbacks */ - ot->poll= shape_key_mode_poll; - ot->exec= shape_key_remove_exec; + ot->poll = shape_key_mode_poll; + ot->exec = shape_key_remove_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int shape_key_clear_exec(bContext *C, wmOperator *UNUSED(op)) @@ -357,16 +357,16 @@ static int shape_key_clear_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_shape_key_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Shape Keys"; - ot->description= "Clear weights for all shape keys"; - ot->idname= "OBJECT_OT_shape_key_clear"; + ot->name = "Clear Shape Keys"; + ot->description = "Clear weights for all shape keys"; + ot->idname = "OBJECT_OT_shape_key_clear"; /* api callbacks */ - ot->poll= shape_key_poll; - ot->exec= shape_key_clear_exec; + ot->poll = shape_key_poll; + ot->exec = shape_key_clear_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int shape_key_mirror_exec(bContext *C, wmOperator *UNUSED(op)) @@ -382,15 +382,15 @@ static int shape_key_mirror_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_shape_key_mirror(wmOperatorType *ot) { /* identifiers */ - ot->name= "Mirror Shape Key"; - ot->idname= "OBJECT_OT_shape_key_mirror"; + ot->name = "Mirror Shape Key"; + ot->idname = "OBJECT_OT_shape_key_mirror"; /* api callbacks */ - ot->poll= shape_key_mode_poll; - ot->exec= shape_key_mirror_exec; + ot->poll = shape_key_mode_poll; + ot->exec = shape_key_mirror_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -451,15 +451,15 @@ void OBJECT_OT_shape_key_move(wmOperatorType *ot) }; /* identifiers */ - ot->name= "Move Shape Key"; - ot->idname= "OBJECT_OT_shape_key_move"; + ot->name = "Move Shape Key"; + ot->idname = "OBJECT_OT_shape_key_move"; /* api callbacks */ - ot->poll= shape_key_mode_poll; - ot->exec= shape_key_move_exec; + ot->poll = shape_key_mode_poll; + ot->exec = shape_key_move_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_enum(ot->srna, "type", slot_move, 0, "Type", ""); } diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 0f64e69d9f8..93b1724308e 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -260,16 +260,16 @@ static int object_location_clear_exec(bContext *C, wmOperator *op) void OBJECT_OT_location_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Location"; + ot->name = "Clear Location"; ot->description = "Clear the object's location"; - ot->idname= "OBJECT_OT_location_clear"; + ot->idname = "OBJECT_OT_location_clear"; /* api callbacks */ - ot->exec= object_location_clear_exec; - ot->poll= ED_operator_scene_editable; + ot->exec = object_location_clear_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int object_rotation_clear_exec(bContext *C, wmOperator *op) @@ -280,16 +280,16 @@ static int object_rotation_clear_exec(bContext *C, wmOperator *op) void OBJECT_OT_rotation_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Rotation"; + ot->name = "Clear Rotation"; ot->description = "Clear the object's rotation"; - ot->idname= "OBJECT_OT_rotation_clear"; + ot->idname = "OBJECT_OT_rotation_clear"; /* api callbacks */ - ot->exec= object_rotation_clear_exec; - ot->poll= ED_operator_scene_editable; + ot->exec = object_rotation_clear_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int object_scale_clear_exec(bContext *C, wmOperator *op) @@ -300,16 +300,16 @@ static int object_scale_clear_exec(bContext *C, wmOperator *op) void OBJECT_OT_scale_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Scale"; + ot->name = "Clear Scale"; ot->description = "Clear the object's scale"; - ot->idname= "OBJECT_OT_scale_clear"; + ot->idname = "OBJECT_OT_scale_clear"; /* api callbacks */ - ot->exec= object_scale_clear_exec; - ot->poll= ED_operator_scene_editable; + ot->exec = object_scale_clear_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* --------------- */ @@ -346,16 +346,16 @@ static int object_origin_clear_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_origin_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Origin"; + ot->name = "Clear Origin"; ot->description = "Clear the object's origin"; - ot->idname= "OBJECT_OT_origin_clear"; + ot->idname = "OBJECT_OT_origin_clear"; /* api callbacks */ - ot->exec= object_origin_clear_exec; - ot->poll= ED_operator_scene_editable; + ot->exec = object_origin_clear_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /*************************** Apply Transformation ****************************/ @@ -591,16 +591,16 @@ static int visual_transform_apply_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_visual_transform_apply(wmOperatorType *ot) { /* identifiers */ - ot->name= "Apply Visual Transform"; + ot->name = "Apply Visual Transform"; ot->description = "Apply the object's visual transformation to its data"; - ot->idname= "OBJECT_OT_visual_transform_apply"; + ot->idname = "OBJECT_OT_visual_transform_apply"; /* api callbacks */ - ot->exec= visual_transform_apply_exec; - ot->poll= ED_operator_scene_editable; + ot->exec = visual_transform_apply_exec; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int object_transform_apply_exec(bContext *C, wmOperator *op) @@ -620,16 +620,16 @@ static int object_transform_apply_exec(bContext *C, wmOperator *op) void OBJECT_OT_transform_apply(wmOperatorType *ot) { /* identifiers */ - ot->name= "Apply Object Transform"; + ot->name = "Apply Object Transform"; ot->description = "Apply the object's transformation to its data"; - ot->idname= "OBJECT_OT_transform_apply"; + ot->idname = "OBJECT_OT_transform_apply"; /* api callbacks */ - ot->exec= object_transform_apply_exec; - ot->poll= ED_operator_objectmode; + ot->exec = object_transform_apply_exec; + ot->poll = ED_operator_objectmode; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "location", 0, "Location", ""); RNA_def_boolean(ot->srna, "rotation", 0, "Rotation", ""); @@ -957,20 +957,20 @@ void OBJECT_OT_origin_set(wmOperatorType *ot) }; /* identifiers */ - ot->name= "Set Origin"; + ot->name = "Set Origin"; ot->description = "Set the object's origin, by either moving the data, or set to center of data, or use 3d cursor"; - ot->idname= "OBJECT_OT_origin_set"; + ot->idname = "OBJECT_OT_origin_set"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= object_origin_set_exec; + ot->invoke = WM_menu_invoke; + ot->exec = object_origin_set_exec; - ot->poll= ED_operator_scene_editable; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; - ot->prop= RNA_def_enum(ot->srna, "type", prop_set_center_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_set_center_types, 0, "Type", ""); RNA_def_enum(ot->srna, "center", prop_set_bounds_types, V3D_CENTROID, "Center", ""); } diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 1e4d32de003..0555ddc69a8 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -2073,15 +2073,15 @@ static int vertex_group_add_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Vertex Group"; - ot->idname= "OBJECT_OT_vertex_group_add"; + ot->name = "Add Vertex Group"; + ot->idname = "OBJECT_OT_vertex_group_add"; /* api callbacks */ - ot->poll= vertex_group_poll; - ot->exec= vertex_group_add_exec; + ot->poll = vertex_group_poll; + ot->exec = vertex_group_add_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int vertex_group_remove_exec(bContext *C, wmOperator *op) @@ -2103,18 +2103,18 @@ static int vertex_group_remove_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Vertex Group"; - ot->idname= "OBJECT_OT_vertex_group_remove"; + ot->name = "Remove Vertex Group"; + ot->idname = "OBJECT_OT_vertex_group_remove"; /* api callbacks */ - ot->poll= vertex_group_poll; - ot->exec= vertex_group_remove_exec; + ot->poll = vertex_group_poll; + ot->exec = vertex_group_remove_exec; /* flags */ /* redo operator will fail in this case because vertex groups aren't stored * in local edit mode stack and toggling "all" property will lead to * all groups deleted without way to restore them (see [#29527], sergey) */ - ot->flag= /*OPTYPE_REGISTER|*/OPTYPE_UNDO; + ot->flag = /*OPTYPE_REGISTER|*/OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "all", 0, "All", "Remove from all vertex groups"); @@ -2138,18 +2138,18 @@ static int vertex_group_assign_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_assign(wmOperatorType *ot) { /* identifiers */ - ot->name= "Assign Vertex Group"; - ot->idname= "OBJECT_OT_vertex_group_assign"; + ot->name = "Assign Vertex Group"; + ot->idname = "OBJECT_OT_vertex_group_assign"; /* api callbacks */ - ot->poll= vertex_group_poll_edit_or_wpaint_vert_select; - ot->exec= vertex_group_assign_exec; + ot->poll = vertex_group_poll_edit_or_wpaint_vert_select; + ot->exec = vertex_group_assign_exec; /* flags */ /* redo operator will fail in this case because vertex group assignment * isn't stored in local edit mode stack and toggling "new" property will * lead to creating plenty of new vertex groups (see [#29527], sergey) */ - ot->flag= /*OPTYPE_REGISTER|*/OPTYPE_UNDO; + ot->flag = /*OPTYPE_REGISTER|*/OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "new", 0, "New", "Assign vertex to new vertex group"); @@ -2180,18 +2180,18 @@ static int vertex_group_remove_from_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_remove_from(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove from Vertex Group"; - ot->idname= "OBJECT_OT_vertex_group_remove_from"; + ot->name = "Remove from Vertex Group"; + ot->idname = "OBJECT_OT_vertex_group_remove_from"; /* api callbacks */ - ot->poll= vertex_group_poll_edit_or_wpaint_vert_select; - ot->exec= vertex_group_remove_from_exec; + ot->poll = vertex_group_poll_edit_or_wpaint_vert_select; + ot->exec = vertex_group_remove_from_exec; /* flags */ /* redo operator will fail in this case because vertex groups assignment * isn't stored in local edit mode stack and toggling "all" property will lead to * removing vertices from all groups (see [#29527], sergey) */ - ot->flag= /*OPTYPE_REGISTER|*/OPTYPE_UNDO; + ot->flag = /*OPTYPE_REGISTER|*/OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "all", 0, "All", "Remove from all vertex groups"); @@ -2213,15 +2213,15 @@ static int vertex_group_select_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Vertex Group"; - ot->idname= "OBJECT_OT_vertex_group_select"; + ot->name = "Select Vertex Group"; + ot->idname = "OBJECT_OT_vertex_group_select"; /* api callbacks */ - ot->poll= vertex_group_poll_edit_or_wpaint_vert_select; - ot->exec= vertex_group_select_exec; + ot->poll = vertex_group_poll_edit_or_wpaint_vert_select; + ot->exec = vertex_group_select_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int vertex_group_deselect_exec(bContext *C, wmOperator *UNUSED(op)) @@ -2237,15 +2237,15 @@ static int vertex_group_deselect_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_deselect(wmOperatorType *ot) { /* identifiers */ - ot->name= "Deselect Vertex Group"; - ot->idname= "OBJECT_OT_vertex_group_deselect"; + ot->name = "Deselect Vertex Group"; + ot->idname = "OBJECT_OT_vertex_group_deselect"; /* api callbacks */ - ot->poll= vertex_group_poll_edit_or_wpaint_vert_select; - ot->exec= vertex_group_deselect_exec; + ot->poll = vertex_group_poll_edit_or_wpaint_vert_select; + ot->exec = vertex_group_deselect_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int vertex_group_copy_exec(bContext *C, wmOperator *UNUSED(op)) @@ -2263,15 +2263,15 @@ static int vertex_group_copy_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Vertex Group"; - ot->idname= "OBJECT_OT_vertex_group_copy"; + ot->name = "Copy Vertex Group"; + ot->idname = "OBJECT_OT_vertex_group_copy"; /* api callbacks */ - ot->poll= vertex_group_poll; - ot->exec= vertex_group_copy_exec; + ot->poll = vertex_group_poll; + ot->exec = vertex_group_copy_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int vertex_group_levels_exec(bContext *C, wmOperator *op) @@ -2293,15 +2293,15 @@ static int vertex_group_levels_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_levels(wmOperatorType *ot) { /* identifiers */ - ot->name= "Vertex Group Levels"; - ot->idname= "OBJECT_OT_vertex_group_levels"; + ot->name = "Vertex Group Levels"; + ot->idname = "OBJECT_OT_vertex_group_levels"; /* api callbacks */ - ot->poll= vertex_group_poll; - ot->exec= vertex_group_levels_exec; + ot->poll = vertex_group_poll; + ot->exec = vertex_group_levels_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_float(ot->srna, "offset", 0.f, -1.0, 1.0, "Offset", "Value to add to weights", -1.0f, 1.f); RNA_def_float(ot->srna, "gain", 1.f, 0.f, FLT_MAX, "Gain", "Value to multiply weights by", 0.0f, 10.f); @@ -2323,15 +2323,15 @@ static int vertex_group_normalize_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_normalize(wmOperatorType *ot) { /* identifiers */ - ot->name= "Normalize Vertex Group"; - ot->idname= "OBJECT_OT_vertex_group_normalize"; + ot->name = "Normalize Vertex Group"; + ot->idname = "OBJECT_OT_vertex_group_normalize"; /* api callbacks */ - ot->poll= vertex_group_poll; - ot->exec= vertex_group_normalize_exec; + ot->poll = vertex_group_poll; + ot->exec = vertex_group_normalize_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int vertex_group_normalize_all_exec(bContext *C, wmOperator *op) @@ -2351,15 +2351,15 @@ static int vertex_group_normalize_all_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_normalize_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Normalize All Vertex Groups"; - ot->idname= "OBJECT_OT_vertex_group_normalize_all"; + ot->name = "Normalize All Vertex Groups"; + ot->idname = "OBJECT_OT_vertex_group_normalize_all"; /* api callbacks */ - ot->poll= vertex_group_poll; - ot->exec= vertex_group_normalize_all_exec; + ot->poll = vertex_group_poll; + ot->exec = vertex_group_normalize_all_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "lock_active", TRUE, "Lock Active", "Keep the values of the active group while normalizing others"); @@ -2398,17 +2398,17 @@ static int vertex_group_fix_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_fix(wmOperatorType *ot) { /* identifiers */ - ot->name= "Fix Vertex Group Deform"; - ot->idname= "OBJECT_OT_vertex_group_fix"; - ot->description= "Modify the position of selected vertices by changing only their respective " + ot->name = "Fix Vertex Group Deform"; + ot->idname = "OBJECT_OT_vertex_group_fix"; + ot->description = "Modify the position of selected vertices by changing only their respective " "groups' weights (this tool may be slow for many vertices)"; /* api callbacks */ - ot->poll= vertex_group_poll; - ot->exec= vertex_group_fix_exec; + ot->poll = vertex_group_poll; + ot->exec = vertex_group_fix_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_float(ot->srna, "dist", 0.0f, -FLT_MAX, FLT_MAX, "Distance", "The distance to move to", -10.0f, 10.0f); RNA_def_float(ot->srna, "strength", 1.f, -2.0f, FLT_MAX, "Strength", "The distance moved can be changed by this multiplier", -2.0f, 2.0f); @@ -2431,15 +2431,15 @@ static int vertex_group_lock_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_lock(wmOperatorType *ot) { /* identifiers */ - ot->name= "Change the Lock On Vertex Groups"; - ot->idname= "OBJECT_OT_vertex_group_lock"; + ot->name = "Change the Lock On Vertex Groups"; + ot->idname = "OBJECT_OT_vertex_group_lock"; /* api callbacks */ - ot->poll= vertex_group_poll; - ot->exec= vertex_group_lock_exec; + ot->poll = vertex_group_poll; + ot->exec = vertex_group_lock_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_select_all(ot); } @@ -2461,15 +2461,15 @@ static int vertex_group_invert_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_invert(wmOperatorType *ot) { /* identifiers */ - ot->name= "Invert Vertex Group"; - ot->idname= "OBJECT_OT_vertex_group_invert"; + ot->name = "Invert Vertex Group"; + ot->idname = "OBJECT_OT_vertex_group_invert"; /* api callbacks */ - ot->poll= vertex_group_poll; - ot->exec= vertex_group_invert_exec; + ot->poll = vertex_group_poll; + ot->exec = vertex_group_invert_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "auto_assign", TRUE, "Add Weights", "Add verts from groups that have zero weight before inverting"); @@ -2494,16 +2494,16 @@ static int vertex_group_blend_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_blend(wmOperatorType *ot) { /* identifiers */ - ot->name= "Blend Vertex Group"; - ot->idname= "OBJECT_OT_vertex_group_blend"; - ot->description= ""; + ot->name = "Blend Vertex Group"; + ot->idname = "OBJECT_OT_vertex_group_blend"; + ot->description = ""; /* api callbacks */ - ot->poll= vertex_group_poll_edit; /* TODO - add object mode support */ - ot->exec= vertex_group_blend_exec; + ot->poll = vertex_group_poll_edit; /* TODO - add object mode support */ + ot->exec = vertex_group_blend_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -2528,16 +2528,16 @@ static int vertex_group_clean_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_clean(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clean Vertex Group"; - ot->idname= "OBJECT_OT_vertex_group_clean"; - ot->description= "Remove Vertex Group assignments which aren't required"; + ot->name = "Clean Vertex Group"; + ot->idname = "OBJECT_OT_vertex_group_clean"; + ot->description = "Remove Vertex Group assignments which aren't required"; /* api callbacks */ - ot->poll= vertex_group_poll; - ot->exec= vertex_group_clean_exec; + ot->poll = vertex_group_poll; + ot->exec = vertex_group_clean_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_float(ot->srna, "limit", 0.01f, 0.0f, 1.0, "Limit", "Remove weights under this limit", 0.001f, 0.99f); RNA_def_boolean(ot->srna, "all_groups", FALSE, "All Groups", "Clean all vertex groups"); @@ -2565,17 +2565,17 @@ static int vertex_group_mirror_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_mirror(wmOperatorType *ot) { /* identifiers */ - ot->name= "Mirror Vertex Group"; - ot->idname= "OBJECT_OT_vertex_group_mirror"; - ot->description= "Mirror all vertex groups, flip weights and/or names, editing only selected vertices, " + ot->name = "Mirror Vertex Group"; + ot->idname = "OBJECT_OT_vertex_group_mirror"; + ot->description = "Mirror all vertex groups, flip weights and/or names, editing only selected vertices, " "flipping when both sides are selected otherwise copy from unselected"; /* api callbacks */ - ot->poll= vertex_group_poll; - ot->exec= vertex_group_mirror_exec; + ot->poll = vertex_group_poll; + ot->exec = vertex_group_mirror_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "mirror_weights", TRUE, "Mirror Weights", "Mirror weights"); @@ -2613,16 +2613,16 @@ static int vertex_group_copy_to_linked_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_copy_to_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Vertex Groups to Linked"; - ot->idname= "OBJECT_OT_vertex_group_copy_to_linked"; - ot->description= "Copy Vertex Groups to all users of the same Geometry data"; + ot->name = "Copy Vertex Groups to Linked"; + ot->idname = "OBJECT_OT_vertex_group_copy_to_linked"; + ot->description = "Copy Vertex Groups to all users of the same Geometry data"; /* api callbacks */ - ot->poll= vertex_group_poll; - ot->exec= vertex_group_copy_to_linked_exec; + ot->poll = vertex_group_poll; + ot->exec = vertex_group_copy_to_linked_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int vertex_group_copy_to_selected_exec(bContext *C, wmOperator *op) @@ -2653,16 +2653,16 @@ static int vertex_group_copy_to_selected_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_copy_to_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Vertex Group to Selected"; - ot->idname= "OBJECT_OT_vertex_group_copy_to_selected"; - ot->description= "Copy Vertex Groups to other selected objects with matching indices"; + ot->name = "Copy Vertex Group to Selected"; + ot->idname = "OBJECT_OT_vertex_group_copy_to_selected"; + ot->description = "Copy Vertex Groups to other selected objects with matching indices"; /* api callbacks */ - ot->poll= vertex_group_poll; - ot->exec= vertex_group_copy_to_selected_exec; + ot->poll = vertex_group_poll; + ot->exec = vertex_group_copy_to_selected_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static EnumPropertyItem vgroup_items[]= { @@ -2712,22 +2712,22 @@ void OBJECT_OT_vertex_group_set_active(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Set Active Vertex Group"; - ot->idname= "OBJECT_OT_vertex_group_set_active"; - ot->description= "Set the active vertex group"; + ot->name = "Set Active Vertex Group"; + ot->idname = "OBJECT_OT_vertex_group_set_active"; + ot->description = "Set the active vertex group"; /* api callbacks */ - ot->poll= vertex_group_poll; - ot->exec= set_active_group_exec; - ot->invoke= WM_menu_invoke; + ot->poll = vertex_group_poll; + ot->exec = set_active_group_exec; + ot->invoke = WM_menu_invoke; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ prop= RNA_def_enum(ot->srna, "group", vgroup_items, 0, "Group", "Vertex group to set as active"); RNA_def_enum_funcs(prop, vgroup_itemf); - ot->prop= prop; + ot->prop = prop; } /* creates the name_array parameter for vgroup_do_remap, call this before fiddling @@ -2851,16 +2851,16 @@ static int vertex_group_sort_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_sort(wmOperatorType *ot) { - ot->name= "Sort Vertex Groups"; - ot->idname= "OBJECT_OT_vertex_group_sort"; - ot->description= "Sorts vertex groups alphabetically"; + ot->name = "Sort Vertex Groups"; + ot->idname = "OBJECT_OT_vertex_group_sort"; + ot->description = "Sorts vertex groups alphabetically"; /* api callbacks */ - ot->poll= vertex_group_poll; - ot->exec= vertex_group_sort_exec; + ot->poll = vertex_group_poll; + ot->exec = vertex_group_sort_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int vgroup_move_exec(bContext *C, wmOperator *op) @@ -2910,15 +2910,15 @@ void OBJECT_OT_vertex_group_move(wmOperatorType *ot) }; /* identifiers */ - ot->name= "Move Vertex Group"; - ot->idname= "OBJECT_OT_vertex_group_move"; + ot->name = "Move Vertex Group"; + ot->idname = "OBJECT_OT_vertex_group_move"; /* api callbacks */ - ot->poll= vertex_group_poll; - ot->exec= vgroup_move_exec; + ot->poll = vertex_group_poll; + ot->exec = vgroup_move_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_enum(ot->srna, "direction", vgroup_slot_move, 0, "Direction", "Direction to move, UP or DOWN"); } diff --git a/source/blender/editors/physics/dynamicpaint_ops.c b/source/blender/editors/physics/dynamicpaint_ops.c index abb596e450f..41600bdb728 100644 --- a/source/blender/editors/physics/dynamicpaint_ops.c +++ b/source/blender/editors/physics/dynamicpaint_ops.c @@ -85,16 +85,16 @@ static int surface_slot_add_exec(bContext *C, wmOperator *UNUSED(op)) void DPAINT_OT_surface_slot_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Surface Slot"; - ot->idname= "DPAINT_OT_surface_slot_add"; - ot->description="Add a new Dynamic Paint surface slot"; + ot->name = "Add Surface Slot"; + ot->idname = "DPAINT_OT_surface_slot_add"; + ot->description = "Add a new Dynamic Paint surface slot"; /* api callbacks */ - ot->exec= surface_slot_add_exec; - ot->poll= ED_operator_object_active_editable; + ot->exec = surface_slot_add_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int surface_slot_remove_exec(bContext *C, wmOperator *UNUSED(op)) @@ -133,16 +133,16 @@ static int surface_slot_remove_exec(bContext *C, wmOperator *UNUSED(op)) void DPAINT_OT_surface_slot_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Surface Slot"; - ot->idname= "DPAINT_OT_surface_slot_remove"; - ot->description="Remove the selected surface slot"; + ot->name = "Remove Surface Slot"; + ot->idname = "DPAINT_OT_surface_slot_remove"; + ot->description = "Remove the selected surface slot"; /* api callbacks */ - ot->exec= surface_slot_remove_exec; - ot->poll= ED_operator_object_active_editable; + ot->exec = surface_slot_remove_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int type_toggle_exec(bContext *C, wmOperator *op) @@ -181,20 +181,20 @@ void DPAINT_OT_type_toggle(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Toggle Type Active"; - ot->idname= "DPAINT_OT_type_toggle"; + ot->name = "Toggle Type Active"; + ot->idname = "DPAINT_OT_type_toggle"; ot->description = "Toggle whether given type is active or not"; /* api callbacks */ - ot->exec= type_toggle_exec; - ot->poll= ED_operator_object_active_editable; + ot->exec = type_toggle_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ prop= RNA_def_enum(ot->srna, "type", prop_dynamicpaint_type_items, MOD_DYNAMICPAINT_TYPE_CANVAS, "Type", ""); - ot->prop= prop; + ot->prop = prop; } static int output_toggle_exec(bContext *C, wmOperator *op) @@ -249,19 +249,19 @@ void DPAINT_OT_output_toggle(wmOperatorType *ot) }; /* identifiers */ - ot->name= "Toggle Output Layer"; - ot->idname= "DPAINT_OT_output_toggle"; + ot->name = "Toggle Output Layer"; + ot->idname = "DPAINT_OT_output_toggle"; ot->description = "Add or remove Dynamic Paint output data layer"; /* api callbacks */ - ot->exec= output_toggle_exec; - ot->poll= ED_operator_object_active_editable; + ot->exec = output_toggle_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "output", prop_output_toggle_types, 0, "Output Toggle", ""); + ot->prop = RNA_def_enum(ot->srna, "output", prop_output_toggle_types, 0, "Output Toggle", ""); } @@ -417,11 +417,11 @@ static int dynamicpaint_bake_exec(bContext *C, wmOperator *op) void DPAINT_OT_bake(wmOperatorType *ot) { /* identifiers */ - ot->name= "Dynamic Paint Bake"; - ot->description= "Bake dynamic paint image sequence surface"; - ot->idname= "DPAINT_OT_bake"; + ot->name = "Dynamic Paint Bake"; + ot->description = "Bake dynamic paint image sequence surface"; + ot->idname = "DPAINT_OT_bake"; /* api callbacks */ - ot->exec= dynamicpaint_bake_exec; - ot->poll= ED_operator_object_active_editable; + ot->exec = dynamicpaint_bake_exec; + ot->poll = ED_operator_object_active_editable; } diff --git a/source/blender/editors/physics/particle_boids.c b/source/blender/editors/physics/particle_boids.c index 54bd19164e0..8440b7144a5 100644 --- a/source/blender/editors/physics/particle_boids.c +++ b/source/blender/editors/physics/particle_boids.c @@ -90,18 +90,18 @@ static int rule_add_exec(bContext *C, wmOperator *op) void BOID_OT_rule_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Boid Rule"; + ot->name = "Add Boid Rule"; ot->description = "Add a boid rule to the current boid state"; - ot->idname= "BOID_OT_rule_add"; + ot->idname = "BOID_OT_rule_add"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= rule_add_exec; + ot->invoke = WM_menu_invoke; + ot->exec = rule_add_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; - ot->prop= RNA_def_enum(ot->srna, "type", boidrule_type_items, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", boidrule_type_items, 0, "Type", ""); } static int rule_del_exec(bContext *C, wmOperator *UNUSED(op)) { @@ -143,14 +143,14 @@ static int rule_del_exec(bContext *C, wmOperator *UNUSED(op)) void BOID_OT_rule_del(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Boid Rule"; - ot->idname= "BOID_OT_rule_del"; + ot->name = "Remove Boid Rule"; + ot->idname = "BOID_OT_rule_del"; /* api callbacks */ - ot->exec= rule_del_exec; + ot->exec = rule_del_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /************************ move up/down boid rule operators *********************/ @@ -182,14 +182,14 @@ static int rule_move_up_exec(bContext *C, wmOperator *UNUSED(op)) void BOID_OT_rule_move_up(wmOperatorType *ot) { - ot->name= "Move Up Boid Rule"; - ot->description= "Move boid rule up in the list"; - ot->idname= "BOID_OT_rule_move_up"; + ot->name = "Move Up Boid Rule"; + ot->description = "Move boid rule up in the list"; + ot->idname = "BOID_OT_rule_move_up"; - ot->exec= rule_move_up_exec; + ot->exec = rule_move_up_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int rule_move_down_exec(bContext *C, wmOperator *UNUSED(op)) @@ -220,14 +220,14 @@ static int rule_move_down_exec(bContext *C, wmOperator *UNUSED(op)) void BOID_OT_rule_move_down(wmOperatorType *ot) { - ot->name= "Move Down Boid Rule"; - ot->description= "Move boid rule down in the list"; - ot->idname= "BOID_OT_rule_move_down"; + ot->name = "Move Down Boid Rule"; + ot->description = "Move boid rule down in the list"; + ot->idname = "BOID_OT_rule_move_down"; - ot->exec= rule_move_down_exec; + ot->exec = rule_move_down_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -261,15 +261,15 @@ static int state_add_exec(bContext *C, wmOperator *UNUSED(op)) void BOID_OT_state_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Boid State"; + ot->name = "Add Boid State"; ot->description = "Add a boid state to the particle system"; - ot->idname= "BOID_OT_state_add"; + ot->idname = "BOID_OT_state_add"; /* api callbacks */ - ot->exec= state_add_exec; + ot->exec = state_add_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int state_del_exec(bContext *C, wmOperator *UNUSED(op)) { @@ -316,14 +316,14 @@ static int state_del_exec(bContext *C, wmOperator *UNUSED(op)) void BOID_OT_state_del(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Boid State"; - ot->idname= "BOID_OT_state_del"; + ot->name = "Remove Boid State"; + ot->idname = "BOID_OT_state_del"; /* api callbacks */ - ot->exec= state_del_exec; + ot->exec = state_del_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /************************ move up/down boid state operators *********************/ @@ -354,14 +354,14 @@ static int state_move_up_exec(bContext *C, wmOperator *UNUSED(op)) void BOID_OT_state_move_up(wmOperatorType *ot) { - ot->name= "Move Up Boid State"; - ot->description= "Move boid state up in the list"; - ot->idname= "BOID_OT_state_move_up"; + ot->name = "Move Up Boid State"; + ot->description = "Move boid state up in the list"; + ot->idname = "BOID_OT_state_move_up"; - ot->exec= state_move_up_exec; + ot->exec = state_move_up_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int state_move_down_exec(bContext *C, wmOperator *UNUSED(op)) @@ -390,13 +390,13 @@ static int state_move_down_exec(bContext *C, wmOperator *UNUSED(op)) void BOID_OT_state_move_down(wmOperatorType *ot) { - ot->name= "Move Down Boid State"; - ot->description= "Move boid state down in the list"; - ot->idname= "BOID_OT_state_move_down"; + ot->name = "Move Down Boid State"; + ot->description = "Move boid state down in the list"; + ot->idname = "BOID_OT_state_move_down"; - ot->exec= state_move_down_exec; + ot->exec = state_move_down_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index dfec87b0da4..15f2006e2b8 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -1360,15 +1360,15 @@ static int pe_select_all_exec(bContext *C, wmOperator *op) void PARTICLE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "(De)select All"; - ot->idname= "PARTICLE_OT_select_all"; + ot->name = "(De)select All"; + ot->idname = "PARTICLE_OT_select_all"; /* api callbacks */ - ot->exec= pe_select_all_exec; - ot->poll= PE_poll; + ot->exec = pe_select_all_exec; + ot->poll = PE_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_select_all(ot); } @@ -1434,15 +1434,15 @@ static int select_roots_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_select_roots(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Roots"; - ot->idname= "PARTICLE_OT_select_roots"; + ot->name = "Select Roots"; + ot->idname = "PARTICLE_OT_select_roots"; /* api callbacks */ - ot->exec= select_roots_exec; - ot->poll= PE_poll; + ot->exec = select_roots_exec; + ot->poll = PE_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /************************ select last operator ************************/ @@ -1474,15 +1474,15 @@ static int select_tips_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_select_tips(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Tips"; - ot->idname= "PARTICLE_OT_select_tips"; + ot->name = "Select Tips"; + ot->idname = "PARTICLE_OT_select_tips"; /* api callbacks */ - ot->exec= select_tips_exec; - ot->poll= PE_poll; + ot->exec = select_tips_exec; + ot->poll = PE_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /************************ select linked operator ************************/ @@ -1518,16 +1518,16 @@ static int select_linked_invoke(bContext *C, wmOperator *op, wmEvent *event) void PARTICLE_OT_select_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Linked"; - ot->idname= "PARTICLE_OT_select_linked"; + ot->name = "Select Linked"; + ot->idname = "PARTICLE_OT_select_linked"; /* api callbacks */ - ot->exec= select_linked_exec; - ot->invoke= select_linked_invoke; - ot->poll= PE_poll_view3d; + ot->exec = select_linked_exec; + ot->invoke = select_linked_invoke; + ot->poll = PE_poll_view3d; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", "Deselect linked keys rather than selecting them"); @@ -1706,15 +1706,15 @@ static int hide_exec(bContext *C, wmOperator *op) void PARTICLE_OT_hide(wmOperatorType *ot) { /* identifiers */ - ot->name= "Hide Selected"; - ot->idname= "PARTICLE_OT_hide"; + ot->name = "Hide Selected"; + ot->idname = "PARTICLE_OT_hide"; /* api callbacks */ - ot->exec= hide_exec; - ot->poll= PE_poll; + ot->exec = hide_exec; + ot->poll = PE_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected"); @@ -1748,15 +1748,15 @@ static int reveal_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_reveal(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reveal"; - ot->idname= "PARTICLE_OT_reveal"; + ot->name = "Reveal"; + ot->idname = "PARTICLE_OT_reveal"; /* api callbacks */ - ot->exec= reveal_exec; - ot->poll= PE_poll; + ot->exec = reveal_exec; + ot->poll = PE_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /************************ select less operator ************************/ @@ -1806,15 +1806,15 @@ static int select_less_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_select_less(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Less"; - ot->idname= "PARTICLE_OT_select_less"; + ot->name = "Select Less"; + ot->idname = "PARTICLE_OT_select_less"; /* api callbacks */ - ot->exec= select_less_exec; - ot->poll= PE_poll; + ot->exec = select_less_exec; + ot->poll = PE_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /************************ select more operator ************************/ @@ -1867,15 +1867,15 @@ static int select_more_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_select_more(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select More"; - ot->idname= "PARTICLE_OT_select_more"; + ot->name = "Select More"; + ot->idname = "PARTICLE_OT_select_more"; /* api callbacks */ - ot->exec= select_more_exec; - ot->poll= PE_poll; + ot->exec = select_more_exec; + ot->poll = PE_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /************************ rekey operator ************************/ @@ -1963,16 +1963,16 @@ static int rekey_exec(bContext *C, wmOperator *op) void PARTICLE_OT_rekey(wmOperatorType *ot) { /* identifiers */ - ot->name= "Rekey"; - ot->idname= "PARTICLE_OT_rekey"; + ot->name = "Rekey"; + ot->idname = "PARTICLE_OT_rekey"; /* api callbacks */ - ot->exec= rekey_exec; - ot->invoke= WM_operator_props_popup; - ot->poll= PE_hair_poll; + ot->exec = rekey_exec; + ot->invoke = WM_operator_props_popup; + ot->poll = PE_hair_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_int(ot->srna, "keys", 2, 2, INT_MAX, "Number of Keys", "", 2, 100); @@ -2293,15 +2293,15 @@ static int subdivide_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_subdivide(wmOperatorType *ot) { /* identifiers */ - ot->name= "Subdivide"; - ot->idname= "PARTICLE_OT_subdivide"; + ot->name = "Subdivide"; + ot->idname = "PARTICLE_OT_subdivide"; /* api callbacks */ - ot->exec= subdivide_exec; - ot->poll= PE_hair_poll; + ot->exec = subdivide_exec; + ot->poll = PE_hair_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /************************ remove doubles opertor *********************/ @@ -2381,15 +2381,15 @@ static int remove_doubles_exec(bContext *C, wmOperator *op) void PARTICLE_OT_remove_doubles(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Doubles"; - ot->idname= "PARTICLE_OT_remove_doubles"; + ot->name = "Remove Doubles"; + ot->idname = "PARTICLE_OT_remove_doubles"; /* api callbacks */ - ot->exec= remove_doubles_exec; - ot->poll= PE_hair_poll; + ot->exec = remove_doubles_exec; + ot->poll = PE_hair_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_float(ot->srna, "threshold", 0.0002f, 0.0f, FLT_MAX, "Threshold", "Threshold distance withing which particles are removed", 0.00001f, 0.1f); @@ -2431,15 +2431,15 @@ static int weight_set_exec(bContext *C, wmOperator *op) void PARTICLE_OT_weight_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Weight Set"; - ot->idname= "PARTICLE_OT_weight_set"; + ot->name = "Weight Set"; + ot->idname = "PARTICLE_OT_weight_set"; /* api callbacks */ - ot->exec= weight_set_exec; - ot->poll= PE_hair_poll; + ot->exec = weight_set_exec; + ot->poll = PE_hair_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_float(ot->srna, "factor", 1, 0, 1, "Factor", "", 0, 1); } @@ -2534,19 +2534,19 @@ static int delete_exec(bContext *C, wmOperator *op) void PARTICLE_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete"; - ot->idname= "PARTICLE_OT_delete"; + ot->name = "Delete"; + ot->idname = "PARTICLE_OT_delete"; /* api callbacks */ - ot->exec= delete_exec; - ot->invoke= WM_menu_invoke; - ot->poll= PE_hair_poll; + ot->exec = delete_exec; + ot->invoke = WM_menu_invoke; + ot->poll = PE_hair_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", delete_type_items, DEL_PARTICLE, "Type", "Delete a full particle or only keys"); + ot->prop = RNA_def_enum(ot->srna, "type", delete_type_items, DEL_PARTICLE, "Type", "Delete a full particle or only keys"); } /*************************** mirror operator **************************/ @@ -2696,15 +2696,15 @@ static int mirror_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_mirror(wmOperatorType *ot) { /* identifiers */ - ot->name= "Mirror"; - ot->idname= "PARTICLE_OT_mirror"; + ot->name = "Mirror"; + ot->idname = "PARTICLE_OT_mirror"; /* api callbacks */ - ot->exec= mirror_exec; - ot->poll= PE_hair_poll; + ot->exec = mirror_exec; + ot->poll = PE_hair_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /************************* brush edit callbacks ********************/ @@ -3725,18 +3725,18 @@ static int brush_edit_cancel(bContext *UNUSED(C), wmOperator *op) void PARTICLE_OT_brush_edit(wmOperatorType *ot) { /* identifiers */ - ot->name= "Brush Edit"; - ot->idname= "PARTICLE_OT_brush_edit"; + ot->name = "Brush Edit"; + ot->idname = "PARTICLE_OT_brush_edit"; /* api callbacks */ - ot->exec= brush_edit_exec; - ot->invoke= brush_edit_invoke; - ot->modal= brush_edit_modal; - ot->cancel= brush_edit_cancel; - ot->poll= PE_poll_view3d; + ot->exec = brush_edit_exec; + ot->invoke = brush_edit_invoke; + ot->modal = brush_edit_modal; + ot->cancel = brush_edit_cancel; + ot->poll = PE_poll_view3d; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; /* properties */ RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", ""); @@ -4215,15 +4215,15 @@ static int particle_edit_toggle_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_particle_edit_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Particle Edit Toggle"; - ot->idname= "PARTICLE_OT_particle_edit_toggle"; + ot->name = "Particle Edit Toggle"; + ot->idname = "PARTICLE_OT_particle_edit_toggle"; /* api callbacks */ - ot->exec= particle_edit_toggle_exec; - ot->poll= particle_edit_toggle_poll; + ot->exec = particle_edit_toggle_exec; + ot->poll = particle_edit_toggle_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -4264,14 +4264,14 @@ static int clear_edited_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_edited_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Edited"; - ot->idname= "PARTICLE_OT_edited_clear"; + ot->name = "Clear Edited"; + ot->idname = "PARTICLE_OT_edited_clear"; /* api callbacks */ - ot->exec= clear_edited_exec; - ot->poll= particle_edit_toggle_poll; + ot->exec = clear_edited_exec; + ot->poll = particle_edit_toggle_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index da3f7e1f7c1..964f83d8d9f 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -84,16 +84,16 @@ static int particle_system_add_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_particle_system_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Particle System Slot"; - ot->idname= "OBJECT_OT_particle_system_add"; - ot->description="Add a particle system"; + ot->name = "Add Particle System Slot"; + ot->idname = "OBJECT_OT_particle_system_add"; + ot->description = "Add a particle system"; /* api callbacks */ - ot->poll= ED_operator_object_active_editable; - ot->exec= particle_system_add_exec; + ot->poll = ED_operator_object_active_editable; + ot->exec = particle_system_add_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int particle_system_remove_exec(bContext *C, wmOperator *UNUSED(op)) @@ -123,16 +123,16 @@ static int particle_system_remove_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_particle_system_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Particle System Slot"; - ot->idname= "OBJECT_OT_particle_system_remove"; - ot->description="Remove the selected particle system"; + ot->name = "Remove Particle System Slot"; + ot->idname = "OBJECT_OT_particle_system_remove"; + ot->description = "Remove the selected particle system"; /* api callbacks */ - ot->poll= ED_operator_object_active_editable; - ot->exec= particle_system_remove_exec; + ot->poll = ED_operator_object_active_editable; + ot->exec = particle_system_remove_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** new particle settings operator *********************/ @@ -182,16 +182,16 @@ static int new_particle_settings_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_new(wmOperatorType *ot) { /* identifiers */ - ot->name= "New Particle Settings"; - ot->idname= "PARTICLE_OT_new"; - ot->description="Add new particle settings"; + ot->name = "New Particle Settings"; + ot->idname = "PARTICLE_OT_new"; + ot->description = "Add new particle settings"; /* api callbacks */ - ot->exec= new_particle_settings_exec; - ot->poll= psys_poll; + ot->exec = new_particle_settings_exec; + ot->poll = psys_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** keyed particle target operators *********************/ @@ -231,15 +231,15 @@ static int new_particle_target_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_new_target(wmOperatorType *ot) { /* identifiers */ - ot->name= "New Particle Target"; - ot->idname= "PARTICLE_OT_new_target"; - ot->description="Add a new particle target"; + ot->name = "New Particle Target"; + ot->idname = "PARTICLE_OT_new_target"; + ot->description = "Add a new particle target"; /* api callbacks */ - ot->exec= new_particle_target_exec; + ot->exec = new_particle_target_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int remove_particle_target_exec(bContext *C, wmOperator *UNUSED(op)) @@ -280,15 +280,15 @@ static int remove_particle_target_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_target_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Particle Target"; - ot->idname= "PARTICLE_OT_target_remove"; - ot->description="Remove the selected particle target"; + ot->name = "Remove Particle Target"; + ot->idname = "PARTICLE_OT_target_remove"; + ot->description = "Remove the selected particle target"; /* api callbacks */ - ot->exec= remove_particle_target_exec; + ot->exec = remove_particle_target_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /************************ move up particle target operator *********************/ @@ -320,14 +320,14 @@ static int target_move_up_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_target_move_up(wmOperatorType *ot) { - ot->name= "Move Up Target"; - ot->idname= "PARTICLE_OT_target_move_up"; - ot->description= "Move particle target up in the list"; + ot->name = "Move Up Target"; + ot->idname = "PARTICLE_OT_target_move_up"; + ot->description = "Move particle target up in the list"; - ot->exec= target_move_up_exec; + ot->exec = target_move_up_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /************************ move down particle target operator *********************/ @@ -358,14 +358,14 @@ static int target_move_down_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_target_move_down(wmOperatorType *ot) { - ot->name= "Move Down Target"; - ot->idname= "PARTICLE_OT_target_move_down"; - ot->description= "Move particle target down in the list"; + ot->name = "Move Down Target"; + ot->idname = "PARTICLE_OT_target_move_down"; + ot->description = "Move particle target down in the list"; - ot->exec= target_move_down_exec; + ot->exec = target_move_down_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /************************ move up particle dupliweight operator *********************/ @@ -396,14 +396,14 @@ static int dupliob_move_up_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_dupliob_move_up(wmOperatorType *ot) { - ot->name= "Move Up Dupli Object"; - ot->idname= "PARTICLE_OT_dupliob_move_up"; - ot->description= "Move dupli object up in the list"; + ot->name = "Move Up Dupli Object"; + ot->idname = "PARTICLE_OT_dupliob_move_up"; + ot->description = "Move dupli object up in the list"; - ot->exec= dupliob_move_up_exec; + ot->exec = dupliob_move_up_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** particle dupliweight operators *********************/ @@ -436,15 +436,15 @@ static int copy_particle_dupliob_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_dupliob_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Particle Dupliob"; - ot->idname= "PARTICLE_OT_dupliob_copy"; - ot->description="Duplicate the current dupliobject"; + ot->name = "Copy Particle Dupliob"; + ot->idname = "PARTICLE_OT_dupliob_copy"; + ot->description = "Duplicate the current dupliobject"; /* api callbacks */ - ot->exec= copy_particle_dupliob_exec; + ot->exec = copy_particle_dupliob_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int remove_particle_dupliob_exec(bContext *C, wmOperator *UNUSED(op)) @@ -479,15 +479,15 @@ static int remove_particle_dupliob_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_dupliob_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Particle Dupliobject"; - ot->idname= "PARTICLE_OT_dupliob_remove"; - ot->description="Remove the selected dupliobject"; + ot->name = "Remove Particle Dupliobject"; + ot->idname = "PARTICLE_OT_dupliob_remove"; + ot->description = "Remove the selected dupliobject"; /* api callbacks */ - ot->exec= remove_particle_dupliob_exec; + ot->exec = remove_particle_dupliob_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /************************ move down particle dupliweight operator *********************/ @@ -518,14 +518,14 @@ static int dupliob_move_down_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_dupliob_move_down(wmOperatorType *ot) { - ot->name= "Move Down Dupli Object"; - ot->idname= "PARTICLE_OT_dupliob_move_down"; - ot->description= "Move dupli object down in the list"; + ot->name = "Move Down Dupli Object"; + ot->idname = "PARTICLE_OT_dupliob_move_down"; + ot->description = "Move dupli object down in the list"; - ot->exec= dupliob_move_down_exec; + ot->exec = dupliob_move_down_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /************************ connect/disconnect hair operators *********************/ @@ -608,14 +608,14 @@ static int disconnect_hair_exec(bContext *C, wmOperator *op) void PARTICLE_OT_disconnect_hair(wmOperatorType *ot) { - ot->name= "Disconnect Hair"; - ot->description= "Disconnect hair from the emitter mesh"; - ot->idname= "PARTICLE_OT_disconnect_hair"; + ot->name = "Disconnect Hair"; + ot->description = "Disconnect hair from the emitter mesh"; + ot->idname = "PARTICLE_OT_disconnect_hair"; - ot->exec= disconnect_hair_exec; + ot->exec = disconnect_hair_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "all", 0, "All hair", "Disconnect all hair systems from the emitter mesh"); } @@ -750,14 +750,14 @@ static int connect_hair_exec(bContext *C, wmOperator *op) void PARTICLE_OT_connect_hair(wmOperatorType *ot) { - ot->name= "Connect Hair"; - ot->description= "Connect hair to the emitter mesh"; - ot->idname= "PARTICLE_OT_connect_hair"; + ot->name = "Connect Hair"; + ot->description = "Connect hair to the emitter mesh"; + ot->idname = "PARTICLE_OT_connect_hair"; - ot->exec= connect_hair_exec; + ot->exec = connect_hair_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "all", 0, "All hair", "Connect all hair systems to the emitter mesh"); } diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 43b1a4517ad..af229fc4cb1 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -1159,13 +1159,13 @@ static int fluid_bake_exec(bContext *C, wmOperator *op) void FLUID_OT_bake(wmOperatorType *ot) { /* identifiers */ - ot->name= "Fluid Simulation Bake"; - ot->description= "Bake fluid simulation"; - ot->idname= "FLUID_OT_bake"; + ot->name = "Fluid Simulation Bake"; + ot->description = "Bake fluid simulation"; + ot->idname = "FLUID_OT_bake"; /* api callbacks */ - ot->invoke= fluid_bake_invoke; - ot->exec= fluid_bake_exec; - ot->poll= ED_operator_object_active_editable; + ot->invoke = fluid_bake_invoke; + ot->exec = fluid_bake_exec; + ot->poll = ED_operator_object_active_editable; } diff --git a/source/blender/editors/physics/physics_pointcache.c b/source/blender/editors/physics/physics_pointcache.c index 62e0e5e201d..9501dee30db 100644 --- a/source/blender/editors/physics/physics_pointcache.c +++ b/source/blender/editors/physics/physics_pointcache.c @@ -154,31 +154,31 @@ static int ptcache_free_bake_all_exec(bContext *C, wmOperator *UNUSED(op)) void PTCACHE_OT_bake_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Bake All Physics"; - ot->description= "Bake all physics"; - ot->idname= "PTCACHE_OT_bake_all"; + ot->name = "Bake All Physics"; + ot->description = "Bake all physics"; + ot->idname = "PTCACHE_OT_bake_all"; /* api callbacks */ - ot->exec= ptcache_bake_all_exec; - ot->poll= ptcache_bake_all_poll; + ot->exec = ptcache_bake_all_exec; + ot->poll = ptcache_bake_all_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "bake", 1, "Bake", ""); } void PTCACHE_OT_free_bake_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Free All Physics Bakes"; - ot->idname= "PTCACHE_OT_free_bake_all"; + ot->name = "Free All Physics Bakes"; + ot->idname = "PTCACHE_OT_free_bake_all"; /* api callbacks */ - ot->exec= ptcache_free_bake_all_exec; - ot->poll= ptcache_bake_all_poll; + ot->exec = ptcache_free_bake_all_exec; + ot->poll = ptcache_bake_all_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int ptcache_bake_exec(bContext *C, wmOperator *op) { @@ -267,46 +267,46 @@ static int ptcache_bake_from_cache_exec(bContext *C, wmOperator *UNUSED(op)) void PTCACHE_OT_bake(wmOperatorType *ot) { /* identifiers */ - ot->name= "Bake Physics"; - ot->description= "Bake physics"; - ot->idname= "PTCACHE_OT_bake"; + ot->name = "Bake Physics"; + ot->description = "Bake physics"; + ot->idname = "PTCACHE_OT_bake"; /* api callbacks */ - ot->exec= ptcache_bake_exec; - ot->poll= ptcache_poll; + ot->exec = ptcache_bake_exec; + ot->poll = ptcache_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "bake", 0, "Bake", ""); } void PTCACHE_OT_free_bake(wmOperatorType *ot) { /* identifiers */ - ot->name= "Free Physics Bake"; - ot->description= "Free physics bake"; - ot->idname= "PTCACHE_OT_free_bake"; + ot->name = "Free Physics Bake"; + ot->description = "Free physics bake"; + ot->idname = "PTCACHE_OT_free_bake"; /* api callbacks */ - ot->exec= ptcache_free_bake_exec; - ot->poll= ptcache_poll; + ot->exec = ptcache_free_bake_exec; + ot->poll = ptcache_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } void PTCACHE_OT_bake_from_cache(wmOperatorType *ot) { /* identifiers */ - ot->name= "Bake From Cache"; - ot->description= "Bake from cache"; - ot->idname= "PTCACHE_OT_bake_from_cache"; + ot->name = "Bake From Cache"; + ot->description = "Bake from cache"; + ot->idname = "PTCACHE_OT_bake_from_cache"; /* api callbacks */ - ot->exec= ptcache_bake_from_cache_exec; - ot->poll= ptcache_poll; + ot->exec = ptcache_bake_from_cache_exec; + ot->poll = ptcache_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int ptcache_add_new_exec(bContext *C, wmOperator *UNUSED(op)) @@ -369,29 +369,29 @@ static int ptcache_remove_exec(bContext *C, wmOperator *UNUSED(op)) void PTCACHE_OT_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add New Cache"; - ot->description= "Add new cache"; - ot->idname= "PTCACHE_OT_add"; + ot->name = "Add New Cache"; + ot->description = "Add new cache"; + ot->idname = "PTCACHE_OT_add"; /* api callbacks */ - ot->exec= ptcache_add_new_exec; - ot->poll= ptcache_poll; // ptcache_bake_all_poll; + ot->exec = ptcache_add_new_exec; + ot->poll = ptcache_poll; // ptcache_bake_all_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } void PTCACHE_OT_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Current Cache"; - ot->description= "Delete current cache"; - ot->idname= "PTCACHE_OT_remove"; + ot->name = "Delete Current Cache"; + ot->description = "Delete current cache"; + ot->idname = "PTCACHE_OT_remove"; /* api callbacks */ - ot->exec= ptcache_remove_exec; - ot->poll= ptcache_poll; + ot->exec = ptcache_remove_exec; + ot->poll = ptcache_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index c104b498095..7459ac09aec 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -600,16 +600,16 @@ static int screen_render_invoke(bContext *C, wmOperator *op, wmEvent *event) void RENDER_OT_render(wmOperatorType *ot) { /* identifiers */ - ot->name= "Render"; - ot->description= "Render active scene"; - ot->idname= "RENDER_OT_render"; + ot->name = "Render"; + ot->description = "Render active scene"; + ot->idname = "RENDER_OT_render"; /* api callbacks */ - ot->invoke= screen_render_invoke; - ot->modal= screen_render_modal; - ot->exec= screen_render_exec; + ot->invoke = screen_render_invoke; + ot->modal = screen_render_modal; + ot->exec = screen_render_exec; - /*ot->poll= ED_operator_screenactive;*/ /* this isn't needed, causes failer in background mode */ + /*ot->poll = ED_operator_screenactive;*/ /* this isn't needed, causes failer in background mode */ RNA_def_boolean(ot->srna, "animation", 0, "Animation", "Render files from the animation range of this scene"); RNA_def_boolean(ot->srna, "write_still", 0, "Write Image", "Save rendered the image to the output path (used only when animation is disabled)"); diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index c36ec5a90dd..53c4b232326 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -639,17 +639,17 @@ static int screen_opengl_render_exec(bContext *C, wmOperator *op) void RENDER_OT_opengl(wmOperatorType *ot) { /* identifiers */ - ot->name= "OpenGL Render"; - ot->description= "OpenGL render active viewport"; - ot->idname= "RENDER_OT_opengl"; + ot->name = "OpenGL Render"; + ot->description = "OpenGL render active viewport"; + ot->idname = "RENDER_OT_opengl"; /* api callbacks */ - ot->invoke= screen_opengl_render_invoke; - ot->exec= screen_opengl_render_exec; /* blocking */ - ot->modal= screen_opengl_render_modal; - ot->cancel= screen_opengl_render_cancel; + ot->invoke = screen_opengl_render_invoke; + ot->exec = screen_opengl_render_exec; /* blocking */ + ot->modal = screen_opengl_render_modal; + ot->cancel = screen_opengl_render_cancel; - ot->poll= ED_operator_screenactive; + ot->poll = ED_operator_screenactive; RNA_def_boolean(ot->srna, "animation", 0, "Animation", "Render files from the animation range of this scene"); RNA_def_boolean(ot->srna, "write_still", 0, "Write Image", "Save rendered the image to the output path (used only when animation is disabled)"); diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index b98eb330e42..2529e91d301 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -108,16 +108,16 @@ static int material_slot_add_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_material_slot_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Material Slot"; - ot->idname= "OBJECT_OT_material_slot_add"; - ot->description="Add a new material slot"; + ot->name = "Add Material Slot"; + ot->idname = "OBJECT_OT_material_slot_add"; + ot->description = "Add a new material slot"; /* api callbacks */ - ot->exec= material_slot_add_exec; - ot->poll= ED_operator_object_active_editable; + ot->exec = material_slot_add_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int material_slot_remove_exec(bContext *C, wmOperator *op) @@ -144,16 +144,16 @@ static int material_slot_remove_exec(bContext *C, wmOperator *op) void OBJECT_OT_material_slot_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Material Slot"; - ot->idname= "OBJECT_OT_material_slot_remove"; - ot->description="Remove the selected material slot"; + ot->name = "Remove Material Slot"; + ot->idname = "OBJECT_OT_material_slot_remove"; + ot->description = "Remove the selected material slot"; /* api callbacks */ - ot->exec= material_slot_remove_exec; - ot->poll= ED_operator_object_active_editable; + ot->exec = material_slot_remove_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int material_slot_assign_exec(bContext *C, wmOperator *UNUSED(op)) @@ -206,16 +206,16 @@ static int material_slot_assign_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_material_slot_assign(wmOperatorType *ot) { /* identifiers */ - ot->name= "Assign Material Slot"; - ot->idname= "OBJECT_OT_material_slot_assign"; - ot->description="Assign the material in the selected material slot to the selected vertices"; + ot->name = "Assign Material Slot"; + ot->idname = "OBJECT_OT_material_slot_assign"; + ot->description = "Assign the material in the selected material slot to the selected vertices"; /* api callbacks */ - ot->exec= material_slot_assign_exec; - ot->poll= ED_operator_object_active_editable; + ot->exec = material_slot_assign_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int material_slot_de_select(bContext *C, int select) @@ -290,15 +290,15 @@ static int material_slot_select_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_material_slot_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Material Slot"; - ot->idname= "OBJECT_OT_material_slot_select"; - ot->description="Select vertices assigned to the selected material slot"; + ot->name = "Select Material Slot"; + ot->idname = "OBJECT_OT_material_slot_select"; + ot->description = "Select vertices assigned to the selected material slot"; /* api callbacks */ - ot->exec= material_slot_select_exec; + ot->exec = material_slot_select_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int material_slot_deselect_exec(bContext *C, wmOperator *UNUSED(op)) @@ -309,15 +309,15 @@ static int material_slot_deselect_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_material_slot_deselect(wmOperatorType *ot) { /* identifiers */ - ot->name= "Deselect Material Slot"; - ot->idname= "OBJECT_OT_material_slot_deselect"; - ot->description="Deselect vertices assigned to the selected material slot"; + ot->name = "Deselect Material Slot"; + ot->idname = "OBJECT_OT_material_slot_deselect"; + ot->description = "Deselect vertices assigned to the selected material slot"; /* api callbacks */ - ot->exec= material_slot_deselect_exec; + ot->exec = material_slot_deselect_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -349,15 +349,15 @@ static int material_slot_copy_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_material_slot_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Material to Others"; - ot->idname= "OBJECT_OT_material_slot_copy"; - ot->description="Copies materials to other selected objects"; + ot->name = "Copy Material to Others"; + ot->idname = "OBJECT_OT_material_slot_copy"; + ot->description = "Copies materials to other selected objects"; /* api callbacks */ - ot->exec= material_slot_copy_exec; + ot->exec = material_slot_copy_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** new material operator *********************/ @@ -403,15 +403,15 @@ static int new_material_exec(bContext *C, wmOperator *UNUSED(op)) void MATERIAL_OT_new(wmOperatorType *ot) { /* identifiers */ - ot->name= "New Material"; - ot->idname= "MATERIAL_OT_new"; - ot->description="Add a new material"; + ot->name = "New Material"; + ot->idname = "MATERIAL_OT_new"; + ot->description = "Add a new material"; /* api callbacks */ - ot->exec= new_material_exec; + ot->exec = new_material_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** new texture operator *********************/ @@ -449,15 +449,15 @@ static int new_texture_exec(bContext *C, wmOperator *UNUSED(op)) void TEXTURE_OT_new(wmOperatorType *ot) { /* identifiers */ - ot->name= "New Texture"; - ot->idname= "TEXTURE_OT_new"; - ot->description="Add a new texture"; + ot->name = "New Texture"; + ot->idname = "TEXTURE_OT_new"; + ot->description = "Add a new texture"; /* api callbacks */ - ot->exec= new_texture_exec; + ot->exec = new_texture_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** new world operator *********************/ @@ -503,15 +503,15 @@ static int new_world_exec(bContext *C, wmOperator *UNUSED(op)) void WORLD_OT_new(wmOperatorType *ot) { /* identifiers */ - ot->name= "New World"; - ot->idname= "WORLD_OT_new"; - ot->description= "Add a new world"; + ot->name = "New World"; + ot->idname = "WORLD_OT_new"; + ot->description = "Add a new world"; /* api callbacks */ - ot->exec= new_world_exec; + ot->exec = new_world_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** render layer operators *********************/ @@ -531,15 +531,15 @@ static int render_layer_add_exec(bContext *C, wmOperator *UNUSED(op)) void SCENE_OT_render_layer_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Render Layer"; - ot->idname= "SCENE_OT_render_layer_add"; - ot->description="Add a render layer"; + ot->name = "Add Render Layer"; + ot->idname = "SCENE_OT_render_layer_add"; + ot->description = "Add a render layer"; /* api callbacks */ - ot->exec= render_layer_add_exec; + ot->exec = render_layer_add_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int render_layer_remove_exec(bContext *C, wmOperator *UNUSED(op)) @@ -558,15 +558,15 @@ static int render_layer_remove_exec(bContext *C, wmOperator *UNUSED(op)) void SCENE_OT_render_layer_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Render Layer"; - ot->idname= "SCENE_OT_render_layer_remove"; - ot->description="Remove the selected render layer"; + ot->name = "Remove Render Layer"; + ot->idname = "SCENE_OT_render_layer_remove"; + ot->description = "Remove the selected render layer"; /* api callbacks */ - ot->exec= render_layer_remove_exec; + ot->exec = render_layer_remove_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int texture_slot_move(bContext *C, wmOperator *op) @@ -642,15 +642,15 @@ void TEXTURE_OT_slot_move(wmOperatorType *ot) }; /* identifiers */ - ot->name= "Move Texture Slot"; - ot->idname= "TEXTURE_OT_slot_move"; - ot->description="Move texture slots up and down"; + ot->name = "Move Texture Slot"; + ot->idname = "TEXTURE_OT_slot_move"; + ot->description = "Move texture slots up and down"; /* api callbacks */ - ot->exec= texture_slot_move; + ot->exec = texture_slot_move; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_enum(ot->srna, "type", slot_move, 0, "Type", ""); } @@ -733,17 +733,17 @@ void TEXTURE_OT_envmap_save(wmOperatorType *ot) { PropertyRNA *prop; /* identifiers */ - ot->name= "Save Environment Map"; - ot->idname= "TEXTURE_OT_envmap_save"; - ot->description="Save the current generated Environment map to an image file"; + ot->name = "Save Environment Map"; + ot->idname = "TEXTURE_OT_envmap_save"; + ot->description = "Save the current generated Environment map to an image file"; /* api callbacks */ - ot->exec= envmap_save_exec; - ot->invoke= envmap_save_invoke; - ot->poll= envmap_save_poll; + ot->exec = envmap_save_exec; + ot->invoke = envmap_save_invoke; + ot->poll = envmap_save_poll; /* flags */ - ot->flag= OPTYPE_REGISTER; /* no undo since this doesnt modify the env-map */ + ot->flag = OPTYPE_REGISTER; /* no undo since this doesnt modify the env-map */ /* properties */ prop= RNA_def_float_array(ot->srna, "layout", 12, default_envmap_layout, 0.0f, 0.0f, "File layout", "Flat array describing the X,Y position of each cube face in the output image, where 1 is the size of a face - order is [+Z -Z +Y -X -Y +X] (use -1 to skip a face)", 0.0f, 0.0f); @@ -780,16 +780,16 @@ static int envmap_clear_poll(bContext *C) void TEXTURE_OT_envmap_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Environment Map"; - ot->idname= "TEXTURE_OT_envmap_clear"; - ot->description="Discard the environment map and free it from memory"; + ot->name = "Clear Environment Map"; + ot->idname = "TEXTURE_OT_envmap_clear"; + ot->description = "Discard the environment map and free it from memory"; /* api callbacks */ - ot->exec= envmap_clear_exec; - ot->poll= envmap_clear_poll; + ot->exec = envmap_clear_exec; + ot->poll = envmap_clear_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int envmap_clear_all_exec(bContext *C, wmOperator *UNUSED(op)) @@ -809,16 +809,16 @@ static int envmap_clear_all_exec(bContext *C, wmOperator *UNUSED(op)) void TEXTURE_OT_envmap_clear_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear All Environment Maps"; - ot->idname= "TEXTURE_OT_envmap_clear_all"; - ot->description="Discard all environment maps in the .blend file and free them from memory"; + ot->name = "Clear All Environment Maps"; + ot->idname = "TEXTURE_OT_envmap_clear_all"; + ot->description = "Discard all environment maps in the .blend file and free them from memory"; /* api callbacks */ - ot->exec= envmap_clear_all_exec; - ot->poll= envmap_clear_poll; + ot->exec = envmap_clear_all_exec; + ot->poll = envmap_clear_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** material operators *********************/ @@ -839,15 +839,15 @@ static int copy_material_exec(bContext *C, wmOperator *UNUSED(op)) void MATERIAL_OT_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Material"; - ot->idname= "MATERIAL_OT_copy"; - ot->description="Copy the material settings and nodes"; + ot->name = "Copy Material"; + ot->idname = "MATERIAL_OT_copy"; + ot->description = "Copy the material settings and nodes"; /* api callbacks */ - ot->exec= copy_material_exec; + ot->exec = copy_material_exec; /* flags */ - ot->flag= OPTYPE_REGISTER; /* no undo needed since no changes are made to the material */ + ot->flag = OPTYPE_REGISTER; /* no undo needed since no changes are made to the material */ } static int paste_material_exec(bContext *C, wmOperator *UNUSED(op)) @@ -867,15 +867,15 @@ static int paste_material_exec(bContext *C, wmOperator *UNUSED(op)) void MATERIAL_OT_paste(wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste Material"; - ot->idname= "MATERIAL_OT_paste"; - ot->description="Paste the material settings and nodes"; + ot->name = "Paste Material"; + ot->idname = "MATERIAL_OT_paste"; + ot->description = "Paste the material settings and nodes"; /* api callbacks */ - ot->exec= paste_material_exec; + ot->exec = paste_material_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -984,16 +984,16 @@ static int copy_mtex_poll(bContext *C) void TEXTURE_OT_slot_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Texture Slot Settings"; - ot->idname= "TEXTURE_OT_slot_copy"; - ot->description="Copy the material texture settings and nodes"; + ot->name = "Copy Texture Slot Settings"; + ot->idname = "TEXTURE_OT_slot_copy"; + ot->description = "Copy the material texture settings and nodes"; /* api callbacks */ - ot->exec= copy_mtex_exec; - ot->poll= copy_mtex_poll; + ot->exec = copy_mtex_exec; + ot->poll = copy_mtex_poll; /* flags */ - ot->flag= OPTYPE_REGISTER; /* no undo needed since no changes are made to the mtex */ + ot->flag = OPTYPE_REGISTER; /* no undo needed since no changes are made to the mtex */ } static int paste_mtex_exec(bContext *C, wmOperator *UNUSED(op)) @@ -1029,14 +1029,14 @@ static int paste_mtex_exec(bContext *C, wmOperator *UNUSED(op)) void TEXTURE_OT_slot_paste(wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste Texture Slot Settings"; - ot->idname= "TEXTURE_OT_slot_paste"; - ot->description="Copy the texture settings and nodes"; + ot->name = "Paste Texture Slot Settings"; + ot->idname = "TEXTURE_OT_slot_paste"; + ot->description = "Copy the texture settings and nodes"; /* api callbacks */ - ot->exec= paste_mtex_exec; + ot->exec = paste_mtex_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c index 8850bef286d..65fc283ff3a 100644 --- a/source/blender/editors/render/render_view.c +++ b/source/blender/editors/render/render_view.c @@ -263,13 +263,13 @@ static int render_view_cancel_exec(bContext *C, wmOperator *UNUSED(op)) void RENDER_OT_view_cancel(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Cancel Render View"; - ot->description= "Cancel show render view"; - ot->idname= "RENDER_OT_view_cancel"; + ot->name = "Cancel Render View"; + ot->description = "Cancel show render view"; + ot->idname = "RENDER_OT_view_cancel"; /* api callbacks */ - ot->exec= render_view_cancel_exec; - ot->poll= ED_operator_image_active; + ot->exec = render_view_cancel_exec; + ot->poll = ED_operator_image_active; } /************************* show render viewer *****************/ @@ -330,12 +330,12 @@ static int render_view_show_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent void RENDER_OT_view_show(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Show/Hide Render View"; - ot->description= "Toggle show render view"; - ot->idname= "RENDER_OT_view_show"; + ot->name = "Show/Hide Render View"; + ot->description = "Toggle show render view"; + ot->idname = "RENDER_OT_view_show"; /* api callbacks */ - ot->invoke= render_view_show_invoke; - ot->poll= ED_operator_screenactive; + ot->invoke = render_view_show_invoke; + ot->poll = ED_operator_screenactive; } diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 697f40a507a..ac98c988862 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -646,16 +646,16 @@ static int actionzone_cancel(bContext *UNUSED(C), wmOperator *op) static void SCREEN_OT_actionzone(wmOperatorType *ot) { /* identifiers */ - ot->name= "Handle area action zones"; - ot->description= "Handle area action zones for mouse actions/gestures"; - ot->idname= "SCREEN_OT_actionzone"; + ot->name = "Handle area action zones"; + ot->description = "Handle area action zones for mouse actions/gestures"; + ot->idname = "SCREEN_OT_actionzone"; - ot->invoke= actionzone_invoke; - ot->modal= actionzone_modal; - ot->poll= actionzone_area_poll; - ot->cancel= actionzone_cancel; + ot->invoke = actionzone_invoke; + ot->modal = actionzone_modal; + ot->poll = actionzone_area_poll; + ot->cancel = actionzone_cancel; - ot->flag= OPTYPE_BLOCKING; + ot->flag = OPTYPE_BLOCKING; RNA_def_int(ot->srna, "modifier", 0, 0, 2, "Modifier", "Modifier state", 0, 2); } @@ -768,16 +768,16 @@ static int area_swap_modal(bContext *C, wmOperator *op, wmEvent *event) static void SCREEN_OT_area_swap(wmOperatorType *ot) { - ot->name= "Swap areas"; - ot->description= "Swap selected areas screen positions"; - ot->idname= "SCREEN_OT_area_swap"; + ot->name = "Swap areas"; + ot->description = "Swap selected areas screen positions"; + ot->idname = "SCREEN_OT_area_swap"; - ot->invoke= area_swap_invoke; - ot->modal= area_swap_modal; - ot->poll= ED_operator_areaactive; - ot->cancel= area_swap_cancel; + ot->invoke = area_swap_invoke; + ot->modal = area_swap_modal; + ot->poll = ED_operator_areaactive; + ot->cancel = area_swap_cancel; - ot->flag= OPTYPE_BLOCKING; + ot->flag = OPTYPE_BLOCKING; } /* *********** Duplicate area as new window operator ****************** */ @@ -836,12 +836,12 @@ static int area_dupli_invoke(bContext *C, wmOperator *op, wmEvent *event) static void SCREEN_OT_area_dupli(wmOperatorType *ot) { - ot->name= "Duplicate Area into New Window"; - ot->description= "Duplicate selected area into new window"; - ot->idname= "SCREEN_OT_area_dupli"; + ot->name = "Duplicate Area into New Window"; + ot->description = "Duplicate selected area into new window"; + ot->idname = "SCREEN_OT_area_dupli"; - ot->invoke= area_dupli_invoke; - ot->poll= ED_operator_areaactive; + ot->invoke = area_dupli_invoke; + ot->poll = ED_operator_areaactive; } @@ -1083,17 +1083,17 @@ static int area_move_modal(bContext *C, wmOperator *op, wmEvent *event) static void SCREEN_OT_area_move(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move area edges"; - ot->description= "Move selected area edges"; - ot->idname= "SCREEN_OT_area_move"; + ot->name = "Move area edges"; + ot->description = "Move selected area edges"; + ot->idname = "SCREEN_OT_area_move"; - ot->exec= area_move_exec; - ot->invoke= area_move_invoke; - ot->cancel= area_move_cancel; - ot->modal= area_move_modal; - ot->poll= ED_operator_screen_mainwinactive; /* when mouse is over area-edge */ + ot->exec = area_move_exec; + ot->invoke = area_move_invoke; + ot->cancel = area_move_cancel; + ot->modal = area_move_modal; + ot->poll = ED_operator_screen_mainwinactive; /* when mouse is over area-edge */ - ot->flag= OPTYPE_BLOCKING; + ot->flag = OPTYPE_BLOCKING; /* rna */ RNA_def_int(ot->srna, "x", 0, INT_MIN, INT_MAX, "X", "", INT_MIN, INT_MAX); @@ -1535,16 +1535,16 @@ static EnumPropertyItem prop_direction_items[] = { static void SCREEN_OT_area_split(wmOperatorType *ot) { ot->name = "Split area"; - ot->description= "Split selected area into new windows"; + ot->description = "Split selected area into new windows"; ot->idname = "SCREEN_OT_area_split"; - ot->exec= area_split_exec; - ot->invoke= area_split_invoke; - ot->modal= area_split_modal; - ot->cancel= area_split_cancel; + ot->exec = area_split_exec; + ot->invoke = area_split_invoke; + ot->modal = area_split_modal; + ot->cancel = area_split_cancel; - ot->poll= screen_active_editable; - ot->flag= OPTYPE_BLOCKING; + ot->poll = screen_active_editable; + ot->flag = OPTYPE_BLOCKING; /* rna */ RNA_def_enum(ot->srna, "direction", prop_direction_items, 'h', "Direction", ""); @@ -1792,17 +1792,17 @@ static int region_scale_cancel(bContext *UNUSED(C), wmOperator *op) static void SCREEN_OT_region_scale(wmOperatorType *ot) { /* identifiers */ - ot->name= "Scale Region Size"; - ot->description= "Scale selected area"; - ot->idname= "SCREEN_OT_region_scale"; + ot->name = "Scale Region Size"; + ot->description = "Scale selected area"; + ot->idname = "SCREEN_OT_region_scale"; - ot->invoke= region_scale_invoke; - ot->modal= region_scale_modal; - ot->cancel= region_scale_cancel; + ot->invoke = region_scale_invoke; + ot->modal = region_scale_modal; + ot->cancel = region_scale_cancel; - ot->poll= ED_operator_areaactive; + ot->poll = ED_operator_areaactive; - ot->flag= OPTYPE_BLOCKING; + ot->flag = OPTYPE_BLOCKING; } @@ -1833,10 +1833,10 @@ static void SCREEN_OT_frame_offset(wmOperatorType *ot) ot->name = "Frame Offset"; ot->idname = "SCREEN_OT_frame_offset"; - ot->exec= frame_offset_exec; + ot->exec = frame_offset_exec; - ot->poll= ED_operator_screenactive_norender; - ot->flag= 0; + ot->poll = ED_operator_screenactive_norender; + ot->flag = 0; /* rna */ RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, "Delta", "", INT_MIN, INT_MAX); @@ -1881,13 +1881,13 @@ static int frame_jump_exec(bContext *C, wmOperator *op) static void SCREEN_OT_frame_jump(wmOperatorType *ot) { ot->name = "Jump to Endpoint"; - ot->description= "Jump to first/last frame in frame range"; + ot->description = "Jump to first/last frame in frame range"; ot->idname = "SCREEN_OT_frame_jump"; - ot->exec= frame_jump_exec; + ot->exec = frame_jump_exec; - ot->poll= ED_operator_screenactive_norender; - ot->flag= OPTYPE_UNDO; + ot->poll = ED_operator_screenactive_norender; + ot->flag = OPTYPE_UNDO; /* rna */ RNA_def_boolean(ot->srna, "end", 0, "Last Frame", "Jump to the last frame of the frame range"); @@ -1964,13 +1964,13 @@ static int keyframe_jump_exec(bContext *C, wmOperator *op) static void SCREEN_OT_keyframe_jump(wmOperatorType *ot) { ot->name = "Jump to Keyframe"; - ot->description= "Jump to previous/next keyframe"; + ot->description = "Jump to previous/next keyframe"; ot->idname = "SCREEN_OT_keyframe_jump"; - ot->exec= keyframe_jump_exec; + ot->exec = keyframe_jump_exec; - ot->poll= ED_operator_screenactive_norender; - ot->flag= OPTYPE_UNDO; + ot->poll = ED_operator_screenactive_norender; + ot->flag = OPTYPE_UNDO; /* rna */ RNA_def_boolean(ot->srna, "next", 1, "Next Keyframe", ""); @@ -2028,11 +2028,11 @@ static int screen_set_exec(bContext *C, wmOperator *op) static void SCREEN_OT_screen_set(wmOperatorType *ot) { ot->name = "Set Screen"; - ot->description= "Cycle through available screens"; + ot->description = "Cycle through available screens"; ot->idname = "SCREEN_OT_screen_set"; - ot->exec= screen_set_exec; - ot->poll= ED_operator_screenactive; + ot->exec = screen_set_exec; + ot->poll = ED_operator_screenactive; /* rna */ RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, "Delta", "", INT_MIN, INT_MAX); @@ -2062,12 +2062,12 @@ static int screen_full_area_exec(bContext *C, wmOperator *UNUSED(op)) static void SCREEN_OT_screen_full_area(wmOperatorType *ot) { ot->name = "Toggle Full Screen"; - ot->description= "Toggle display selected area as fullscreen"; + ot->description = "Toggle display selected area as fullscreen"; ot->idname = "SCREEN_OT_screen_full_area"; - ot->exec= screen_full_area_exec; - ot->poll= ED_operator_areaactive; - ot->flag= 0; + ot->exec = screen_full_area_exec; + ot->poll = ED_operator_areaactive; + ot->flag = 0; } @@ -2348,18 +2348,18 @@ static int area_join_modal(bContext *C, wmOperator *op, wmEvent *event) static void SCREEN_OT_area_join(wmOperatorType *ot) { /* identifiers */ - ot->name= "Join area"; - ot->description= "Join selected areas into new window"; - ot->idname= "SCREEN_OT_area_join"; + ot->name = "Join area"; + ot->description = "Join selected areas into new window"; + ot->idname = "SCREEN_OT_area_join"; /* api callbacks */ - ot->exec= area_join_exec; - ot->invoke= area_join_invoke; - ot->modal= area_join_modal; - ot->poll= screen_active_editable; - ot->cancel= area_join_cancel; + ot->exec = area_join_exec; + ot->invoke = area_join_invoke; + ot->modal = area_join_modal; + ot->poll = screen_active_editable; + ot->cancel = area_join_cancel; - ot->flag= OPTYPE_BLOCKING|OPTYPE_INTERNAL; + ot->flag = OPTYPE_BLOCKING|OPTYPE_INTERNAL; /* rna */ RNA_def_int(ot->srna, "min_x", -100, INT_MIN, INT_MAX, "X 1", "", INT_MIN, INT_MAX); @@ -2407,14 +2407,14 @@ static int screen_area_options_invoke(bContext *C, wmOperator *op, wmEvent *even static void SCREEN_OT_area_options(wmOperatorType *ot) { /* identifiers */ - ot->name= "Area Options"; - ot->description= "Operations for splitting and merging"; - ot->idname= "SCREEN_OT_area_options"; + ot->name = "Area Options"; + ot->description = "Operations for splitting and merging"; + ot->idname = "SCREEN_OT_area_options"; /* api callbacks */ - ot->invoke= screen_area_options_invoke; + ot->invoke = screen_area_options_invoke; - ot->poll= ED_operator_screen_mainwinactive; + ot->poll = ED_operator_screen_mainwinactive; } @@ -2448,13 +2448,13 @@ static int spacedata_cleanup(bContext *C, wmOperator *op) static void SCREEN_OT_spacedata_cleanup(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clean-up space-data"; - ot->description= "Remove unused settings for invisible editors"; - ot->idname= "SCREEN_OT_spacedata_cleanup"; + ot->name = "Clean-up space-data"; + ot->description = "Remove unused settings for invisible editors"; + ot->idname = "SCREEN_OT_spacedata_cleanup"; /* api callbacks */ - ot->exec= spacedata_cleanup; - ot->poll= WM_operator_winactive; + ot->exec = spacedata_cleanup; + ot->poll = WM_operator_winactive; } @@ -2473,14 +2473,14 @@ static int repeat_last_exec(bContext *C, wmOperator *UNUSED(op)) static void SCREEN_OT_repeat_last(wmOperatorType *ot) { /* identifiers */ - ot->name= "Repeat Last"; - ot->description= "Repeat last action"; - ot->idname= "SCREEN_OT_repeat_last"; + ot->name = "Repeat Last"; + ot->description = "Repeat last action"; + ot->idname = "SCREEN_OT_repeat_last"; /* api callbacks */ - ot->exec= repeat_last_exec; + ot->exec = repeat_last_exec; - ot->poll= ED_operator_screenactive; + ot->poll = ED_operator_screenactive; } @@ -2526,15 +2526,15 @@ static int repeat_history_exec(bContext *C, wmOperator *op) static void SCREEN_OT_repeat_history(wmOperatorType *ot) { /* identifiers */ - ot->name= "Repeat History"; - ot->description= "Display menu for previous actions performed"; - ot->idname= "SCREEN_OT_repeat_history"; + ot->name = "Repeat History"; + ot->description = "Display menu for previous actions performed"; + ot->idname = "SCREEN_OT_repeat_history"; /* api callbacks */ - ot->invoke= repeat_history_invoke; - ot->exec= repeat_history_exec; + ot->invoke = repeat_history_invoke; + ot->exec = repeat_history_exec; - ot->poll= ED_operator_screenactive; + ot->poll = ED_operator_screenactive; RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "", 0, 1000); } @@ -2554,14 +2554,14 @@ static int redo_last_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *UNUSED static void SCREEN_OT_redo_last(wmOperatorType *ot) { /* identifiers */ - ot->name= "Redo Last"; - ot->description= "Display menu for last action performed"; - ot->idname= "SCREEN_OT_redo_last"; + ot->name = "Redo Last"; + ot->description = "Display menu for last action performed"; + ot->idname = "SCREEN_OT_redo_last"; /* api callbacks */ - ot->invoke= redo_last_invoke; + ot->invoke = redo_last_invoke; - ot->poll= ED_operator_screenactive; + ot->poll = ED_operator_screenactive; } /* ************** region four-split operator ***************************** */ @@ -2657,15 +2657,15 @@ static int region_quadview_exec(bContext *C, wmOperator *op) static void SCREEN_OT_region_quadview(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Quad View"; - ot->description= "Split selected area into camera, front, right & top views"; - ot->idname= "SCREEN_OT_region_quadview"; + ot->name = "Toggle Quad View"; + ot->description = "Split selected area into camera, front, right & top views"; + ot->idname = "SCREEN_OT_region_quadview"; /* api callbacks */ - // ot->invoke= WM_operator_confirm; - ot->exec= region_quadview_exec; - ot->poll= ED_operator_region_view3d_active; - ot->flag= 0; + // ot->invoke = WM_operator_confirm; + ot->exec = region_quadview_exec; + ot->poll = ED_operator_region_view3d_active; + ot->flag = 0; } @@ -2699,13 +2699,13 @@ static int region_flip_exec(bContext *C, wmOperator *UNUSED(op)) static void SCREEN_OT_region_flip(wmOperatorType *ot) { /* identifiers */ - ot->name= "Flip Region"; - ot->idname= "SCREEN_OT_region_flip"; + ot->name = "Flip Region"; + ot->idname = "SCREEN_OT_region_flip"; /* api callbacks */ - ot->exec= region_flip_exec; - ot->poll= ED_operator_areaactive; - ot->flag= 0; + ot->exec = region_flip_exec; + ot->poll = ED_operator_areaactive; + ot->flag = 0; } /* ************** header flip operator ***************************** */ @@ -2748,14 +2748,14 @@ static int header_flip_exec(bContext *C, wmOperator *UNUSED(op)) static void SCREEN_OT_header_flip(wmOperatorType *ot) { /* identifiers */ - ot->name= "Flip Header Region"; - ot->idname= "SCREEN_OT_header_flip"; + ot->name = "Flip Header Region"; + ot->idname = "SCREEN_OT_header_flip"; /* api callbacks */ - ot->exec= header_flip_exec; + ot->exec = header_flip_exec; - ot->poll= ED_operator_areaactive; - ot->flag= 0; + ot->poll = ED_operator_areaactive; + ot->flag = 0; } /* ************** header tools operator ***************************** */ @@ -2794,12 +2794,12 @@ static int header_toolbox_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *U static void SCREEN_OT_header_toolbox(wmOperatorType *ot) { /* identifiers */ - ot->name= "Header Toolbox"; - ot->description="Display header region toolbox"; - ot->idname= "SCREEN_OT_header_toolbox"; + ot->name = "Header Toolbox"; + ot->description = "Display header region toolbox"; + ot->idname = "SCREEN_OT_header_toolbox"; /* api callbacks */ - ot->invoke= header_toolbox_invoke; + ot->invoke = header_toolbox_invoke; } /* ****************** anim player, with timer ***************** */ @@ -3014,14 +3014,14 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), wmEvent *e static void SCREEN_OT_animation_step(wmOperatorType *ot) { /* identifiers */ - ot->name= "Animation Step"; - ot->description= "Step through animation by position"; - ot->idname= "SCREEN_OT_animation_step"; + ot->name = "Animation Step"; + ot->description = "Step through animation by position"; + ot->idname = "SCREEN_OT_animation_step"; /* api callbacks */ - ot->invoke= screen_animation_step; + ot->invoke = screen_animation_step; - ot->poll= ED_operator_screenactive_norender; + ot->poll = ED_operator_screenactive_norender; } @@ -3071,14 +3071,14 @@ static int screen_animation_play_exec(bContext *C, wmOperator *op) static void SCREEN_OT_animation_play(wmOperatorType *ot) { /* identifiers */ - ot->name= "Play Animation"; - ot->description= "Play animation"; - ot->idname= "SCREEN_OT_animation_play"; + ot->name = "Play Animation"; + ot->description = "Play animation"; + ot->idname = "SCREEN_OT_animation_play"; /* api callbacks */ - ot->exec= screen_animation_play_exec; + ot->exec = screen_animation_play_exec; - ot->poll= ED_operator_screenactive_norender; + ot->poll = ED_operator_screenactive_norender; RNA_def_boolean(ot->srna, "reverse", 0, "Play in Reverse", "Animation is played backwards"); RNA_def_boolean(ot->srna, "sync", 0, "Sync", "Drop frames to maintain framerate"); @@ -3111,14 +3111,14 @@ static int screen_animation_cancel_exec(bContext *C, wmOperator *op) static void SCREEN_OT_animation_cancel(wmOperatorType *ot) { /* identifiers */ - ot->name= "Cancel Animation"; - ot->description= "Cancel animation, returning to the original frame"; - ot->idname= "SCREEN_OT_animation_cancel"; + ot->name = "Cancel Animation"; + ot->description = "Cancel animation, returning to the original frame"; + ot->idname = "SCREEN_OT_animation_cancel"; /* api callbacks */ - ot->exec= screen_animation_cancel_exec; + ot->exec = screen_animation_cancel_exec; - ot->poll= ED_operator_screenactive; + ot->poll = ED_operator_screenactive; RNA_def_boolean(ot->srna, "restore_frame", TRUE, "Restore Frame", "Restore the frame when animation was initialized"); } @@ -3161,16 +3161,16 @@ static int border_select_do(bContext *C, wmOperator *op) static void SCREEN_OT_border_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border select"; - ot->idname= "SCREEN_OT_border_select"; + ot->name = "Border select"; + ot->idname = "SCREEN_OT_border_select"; /* api callbacks */ - ot->exec= border_select_do; - ot->invoke= WM_border_select_invoke; - ot->modal= WM_border_select_modal; - ot->cancel= WM_border_select_cancel; + ot->exec = border_select_do; + ot->invoke = WM_border_select_invoke; + ot->modal = WM_border_select_modal; + ot->cancel = WM_border_select_cancel; - ot->poll= ED_operator_areaactive; + ot->poll = ED_operator_areaactive; /* rna */ RNA_def_int(ot->srna, "event_type", 0, INT_MIN, INT_MAX, "Event Type", "", INT_MIN, INT_MAX); @@ -3207,13 +3207,13 @@ static int fullscreen_back_exec(bContext *C, wmOperator *op) static void SCREEN_OT_back_to_previous(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Back to Previous Screen"; - ot->description= "Revert back to the original screen layout, before fullscreen area overlay"; - ot->idname= "SCREEN_OT_back_to_previous"; + ot->name = "Back to Previous Screen"; + ot->description = "Revert back to the original screen layout, before fullscreen area overlay"; + ot->idname = "SCREEN_OT_back_to_previous"; /* api callbacks */ - ot->exec= fullscreen_back_exec; - ot->poll= ED_operator_screenactive; + ot->exec = fullscreen_back_exec; + ot->poll = ED_operator_screenactive; } /* *********** show user pref window ****** */ @@ -3242,13 +3242,13 @@ static int userpref_show_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *ev static void SCREEN_OT_userpref_show(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Show/Hide User Preferences"; - ot->description= "Show/hide user preferences"; - ot->idname= "SCREEN_OT_userpref_show"; + ot->name = "Show/Hide User Preferences"; + ot->description = "Show/hide user preferences"; + ot->idname = "SCREEN_OT_userpref_show"; /* api callbacks */ - ot->invoke= userpref_show_invoke; - ot->poll= ED_operator_screenactive; + ot->invoke = userpref_show_invoke; + ot->poll = ED_operator_screenactive; } /********************* new screen operator *********************/ @@ -3267,16 +3267,16 @@ static int screen_new_exec(bContext *C, wmOperator *UNUSED(op)) static void SCREEN_OT_new(wmOperatorType *ot) { /* identifiers */ - ot->name= "New Screen"; - ot->description= "Add a new screen"; - ot->idname= "SCREEN_OT_new"; + ot->name = "New Screen"; + ot->description = "Add a new screen"; + ot->idname = "SCREEN_OT_new"; /* api callbacks */ - ot->exec= screen_new_exec; - ot->poll= WM_operator_winactive; + ot->exec = screen_new_exec; + ot->poll = WM_operator_winactive; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************* delete screen operator *********************/ @@ -3293,15 +3293,15 @@ static int screen_delete_exec(bContext *C, wmOperator *UNUSED(op)) static void SCREEN_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Screen"; //was scene - ot->description= "Delete active screen"; - ot->idname= "SCREEN_OT_delete"; + ot->name = "Delete Screen"; //was scene + ot->description = "Delete active screen"; + ot->idname = "SCREEN_OT_delete"; /* api callbacks */ - ot->exec= screen_delete_exec; + ot->exec = screen_delete_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************* new scene operator *********************/ @@ -3345,19 +3345,19 @@ static void SCENE_OT_new(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "New Scene"; - ot->description= "Add new scene by type"; - ot->idname= "SCENE_OT_new"; + ot->name = "New Scene"; + ot->description = "Add new scene by type"; + ot->idname = "SCENE_OT_new"; /* api callbacks */ - ot->exec= scene_new_exec; - ot->invoke= WM_menu_invoke; + ot->exec = scene_new_exec; + ot->invoke = WM_menu_invoke; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", type_items, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", type_items, 0, "Type", ""); } /********************* delete scene operator *********************/ @@ -3379,15 +3379,15 @@ static int scene_delete_exec(bContext *C, wmOperator *UNUSED(op)) static void SCENE_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Scene"; - ot->description= "Delete active scene"; - ot->idname= "SCENE_OT_delete"; + ot->name = "Delete Scene"; + ot->description = "Delete active scene"; + ot->idname = "SCENE_OT_delete"; /* api callbacks */ - ot->exec= scene_delete_exec; + ot->exec = scene_delete_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* **************** Assigning operatortypes to global list, adding handlers **************** */ diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c index deeb3061ad5..ca5616f3502 100644 --- a/source/blender/editors/screen/screendump.c +++ b/source/blender/editors/screen/screendump.c @@ -218,15 +218,15 @@ static int screenshot_cancel(bContext *UNUSED(C), wmOperator *op) void SCREEN_OT_screenshot(wmOperatorType *ot) { - ot->name= "Save Screenshot"; /* weak: opname starting with 'save' makes filewindow give save-over */ - ot->idname= "SCREEN_OT_screenshot"; + ot->name = "Save Screenshot"; /* weak: opname starting with 'save' makes filewindow give save-over */ + ot->idname = "SCREEN_OT_screenshot"; - ot->invoke= screenshot_invoke; - ot->exec= screenshot_exec; - ot->poll= WM_operator_winactive; - ot->cancel= screenshot_cancel; + ot->invoke = screenshot_invoke; + ot->exec = screenshot_exec; + ot->poll = WM_operator_winactive; + ot->cancel = screenshot_cancel; - ot->flag= 0; + ot->flag = 0; WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE, FILE_SPECIAL, FILE_SAVE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY); RNA_def_boolean(ot->srna, "full", 1, "Full Screen", ""); @@ -392,14 +392,14 @@ static int screencast_exec(bContext *C, wmOperator *op) void SCREEN_OT_screencast(wmOperatorType *ot) { - ot->name= "Make Screencast"; - ot->idname= "SCREEN_OT_screencast"; + ot->name = "Make Screencast"; + ot->idname = "SCREEN_OT_screencast"; - ot->invoke= WM_operator_confirm; - ot->exec= screencast_exec; - ot->poll= WM_operator_winactive; + ot->invoke = WM_operator_confirm; + ot->exec = screencast_exec; + ot->poll = WM_operator_winactive; - ot->flag= 0; + ot->flag = 0; RNA_def_property(ot->srna, "filepath", PROP_STRING, PROP_FILEPATH); RNA_def_boolean(ot->srna, "full", 1, "Full Screen", ""); diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 956251d7bb9..a19d00b4926 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -5113,18 +5113,18 @@ static int paint_cancel(bContext *C, wmOperator *op) void PAINT_OT_image_paint(wmOperatorType *ot) { /* identifiers */ - ot->name= "Image Paint"; - ot->idname= "PAINT_OT_image_paint"; + ot->name = "Image Paint"; + ot->idname = "PAINT_OT_image_paint"; /* api callbacks */ - ot->exec= paint_exec; - ot->invoke= paint_invoke; - ot->modal= paint_modal; - ot->cancel= paint_cancel; - ot->poll= image_paint_poll; + ot->exec = paint_exec; + ot->invoke = paint_invoke; + ot->modal = paint_modal; + ot->cancel = paint_cancel; + ot->poll = image_paint_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; /* properties */ RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", ""); @@ -5340,18 +5340,18 @@ static int grab_clone_cancel(bContext *UNUSED(C), wmOperator *op) void PAINT_OT_grab_clone(wmOperatorType *ot) { /* identifiers */ - ot->name= "Grab Clone"; - ot->idname= "PAINT_OT_grab_clone"; + ot->name = "Grab Clone"; + ot->idname = "PAINT_OT_grab_clone"; /* api callbacks */ - ot->exec= grab_clone_exec; - ot->invoke= grab_clone_invoke; - ot->modal= grab_clone_modal; - ot->cancel= grab_clone_cancel; - ot->poll= image_paint_2d_clone_poll; + ot->exec = grab_clone_exec; + ot->invoke = grab_clone_invoke; + ot->modal = grab_clone_modal; + ot->cancel = grab_clone_cancel; + ot->poll = image_paint_2d_clone_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; /* properties */ RNA_def_float_vector(ot->srna, "delta", 2, NULL, -FLT_MAX, FLT_MAX, "Delta", "Delta offset of clone image in 0.0..1.0 coordinates", -1.0f, 1.0f); @@ -5422,17 +5422,17 @@ static int image_paint_sample_color_poll(bContext *C) void PAINT_OT_sample_color(wmOperatorType *ot) { /* identifiers */ - ot->name= "Sample Color"; - ot->idname= "PAINT_OT_sample_color"; + ot->name = "Sample Color"; + ot->idname = "PAINT_OT_sample_color"; /* api callbacks */ - ot->exec= sample_color_exec; - ot->invoke= sample_color_invoke; - ot->modal= sample_color_modal; - ot->poll= image_paint_sample_color_poll; + ot->exec = sample_color_exec; + ot->invoke = sample_color_invoke; + ot->modal = sample_color_modal; + ot->poll = image_paint_sample_color_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_int_vector(ot->srna, "location", 2, NULL, 0, INT_MAX, "Location", "Cursor location in region coordinates", 0, 16384); @@ -5473,16 +5473,16 @@ static int set_clone_cursor_invoke(bContext *C, wmOperator *op, wmEvent *event) void PAINT_OT_clone_cursor_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Clone Cursor"; - ot->idname= "PAINT_OT_clone_cursor_set"; + ot->name = "Set Clone Cursor"; + ot->idname = "PAINT_OT_clone_cursor_set"; /* api callbacks */ - ot->exec= set_clone_cursor_exec; - ot->invoke= set_clone_cursor_invoke; - ot->poll= image_paint_3d_poll; + ot->exec = set_clone_cursor_exec; + ot->invoke = set_clone_cursor_invoke; + ot->poll = image_paint_3d_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_float_vector(ot->srna, "location", 3, NULL, -FLT_MAX, FLT_MAX, "Location", "Cursor location in world space coordinates", -10000.0f, 10000.0f); @@ -5555,15 +5555,15 @@ static int texture_paint_toggle_exec(bContext *C, wmOperator *op) void PAINT_OT_texture_paint_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Texture Paint Toggle"; - ot->idname= "PAINT_OT_texture_paint_toggle"; + ot->name = "Texture Paint Toggle"; + ot->idname = "PAINT_OT_texture_paint_toggle"; /* api callbacks */ - ot->exec= texture_paint_toggle_exec; - ot->poll= texture_paint_toggle_poll; + ot->exec = texture_paint_toggle_exec; + ot->poll = texture_paint_toggle_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int texture_paint_poll(bContext *C) @@ -5705,20 +5705,20 @@ void PAINT_OT_project_image(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Project Image"; - ot->idname= "PAINT_OT_project_image"; - ot->description= "Project an edited render from the active camera back onto the object"; + ot->name = "Project Image"; + ot->idname = "PAINT_OT_project_image"; + ot->description = "Project an edited render from the active camera back onto the object"; /* api callbacks */ - ot->invoke= WM_enum_search_invoke; - ot->exec= texture_paint_camera_project_exec; + ot->invoke = WM_enum_search_invoke; + ot->exec = texture_paint_camera_project_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; prop= RNA_def_enum(ot->srna, "image", DummyRNA_NULL_items, 0, "Image", ""); RNA_def_enum_funcs(prop, RNA_image_itemf); - ot->prop= prop; + ot->prop = prop; } static int texture_paint_image_from_view_exec(bContext *C, wmOperator *op) @@ -5784,16 +5784,16 @@ static int texture_paint_image_from_view_exec(bContext *C, wmOperator *op) void PAINT_OT_image_from_view(wmOperatorType *ot) { /* identifiers */ - ot->name= "Image from View"; - ot->idname= "PAINT_OT_image_from_view"; - ot->description= "Make an image from the current 3D view for re-projection"; + ot->name = "Image from View"; + ot->idname = "PAINT_OT_image_from_view"; + ot->description = "Make an image from the current 3D view for re-projection"; /* api callbacks */ - ot->exec= texture_paint_image_from_view_exec; - ot->poll= ED_operator_region_view3d_active; + ot->exec = texture_paint_image_from_view_exec; + ot->poll = ED_operator_region_view3d_active; /* flags */ - ot->flag= OPTYPE_REGISTER; + ot->flag = OPTYPE_REGISTER; RNA_def_string_file_name(ot->srna, "filepath", "", FILE_MAX, "File Path", "Name of the file"); } diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index 7880fafca9e..bb1833b4d5e 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -75,15 +75,15 @@ static int brush_add_exec(bContext *C, wmOperator *UNUSED(op)) static void BRUSH_OT_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Brush"; - ot->description= "Add brush by mode type"; - ot->idname= "BRUSH_OT_add"; + ot->name = "Add Brush"; + ot->description = "Add brush by mode type"; + ot->idname = "BRUSH_OT_add"; /* api callbacks */ - ot->exec= brush_add_exec; + ot->exec = brush_add_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -131,15 +131,15 @@ static int brush_scale_size_exec(bContext *C, wmOperator *op) static void BRUSH_OT_scale_size(wmOperatorType *ot) { /* identifiers */ - ot->name= "Scale Sculpt/Paint Brush Size"; - ot->description= "Change brush size by a scalar"; - ot->idname= "BRUSH_OT_scale_size"; + ot->name = "Scale Sculpt/Paint Brush Size"; + ot->description = "Change brush size by a scalar"; + ot->idname = "BRUSH_OT_scale_size"; /* api callbacks */ - ot->exec= brush_scale_size_exec; + ot->exec = brush_scale_size_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_float(ot->srna, "scalar", 1, 0, 2, "Scalar", "Factor to scale brush size by", 0, 2); } @@ -158,15 +158,15 @@ static int vertex_color_set_exec(bContext *C, wmOperator *UNUSED(op)) static void PAINT_OT_vertex_color_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Vertex Colors"; - ot->idname= "PAINT_OT_vertex_color_set"; + ot->name = "Set Vertex Colors"; + ot->idname = "PAINT_OT_vertex_color_set"; /* api callbacks */ - ot->exec= vertex_color_set_exec; - ot->poll= vertex_paint_mode_poll; + ot->exec = vertex_color_set_exec; + ot->poll = vertex_paint_mode_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int brush_reset_exec(bContext *C, wmOperator *UNUSED(op)) @@ -187,15 +187,15 @@ static int brush_reset_exec(bContext *C, wmOperator *UNUSED(op)) static void BRUSH_OT_reset(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reset Brush"; - ot->description= "Return brush to defaults based on current tool"; - ot->idname= "BRUSH_OT_reset"; + ot->name = "Reset Brush"; + ot->description = "Return brush to defaults based on current tool"; + ot->idname = "BRUSH_OT_reset"; /* api callbacks */ - ot->exec= brush_reset_exec; + ot->exec = brush_reset_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int brush_tool(const Brush *brush, size_t tool_offset) @@ -302,15 +302,15 @@ static void PAINT_OT_brush_select(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Brush Select"; - ot->description= "Select a paint mode's brush by tool type"; - ot->idname= "PAINT_OT_brush_select"; + ot->name = "Brush Select"; + ot->description = "Select a paint mode's brush by tool type"; + ot->idname = "PAINT_OT_brush_select"; /* api callbacks */ - ot->exec= brush_select_exec; + ot->exec = brush_select_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ RNA_def_enum(ot->srna, "paint_mode", paint_mode_items, OB_MODE_ACTIVE, "Paint Mode", ""); diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index dcd7554b7b8..3cd963c11df 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -380,14 +380,14 @@ void BRUSH_OT_curve_preset(wmOperatorType *ot) {CURVE_PRESET_ROOT, "ROOT", 0, "Root", ""}, {0, NULL, 0, NULL, NULL}}; - ot->name= "Preset"; - ot->description= "Set brush shape"; - ot->idname= "BRUSH_OT_curve_preset"; + ot->name = "Preset"; + ot->description = "Set brush shape"; + ot->idname = "BRUSH_OT_curve_preset"; - ot->exec= brush_curve_preset_exec; - ot->poll= brush_curve_preset_poll; + ot->exec = brush_curve_preset_exec; + ot->poll = brush_curve_preset_poll; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_enum(ot->srna, "shape", prop_shape_items, CURVE_PRESET_SMOOTH, "Mode", ""); } @@ -403,14 +403,14 @@ static int paint_select_linked_exec(bContext *C, wmOperator *UNUSED(op)) void PAINT_OT_face_select_linked(wmOperatorType *ot) { - ot->name= "Select Linked"; - ot->description= "Select linked faces"; - ot->idname= "PAINT_OT_face_select_linked"; + ot->name = "Select Linked"; + ot->description = "Select linked faces"; + ot->idname = "PAINT_OT_face_select_linked"; - ot->exec= paint_select_linked_exec; - ot->poll= facemask_paint_poll; + ot->exec = paint_select_linked_exec; + ot->poll = facemask_paint_poll; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int paint_select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent *event) @@ -423,14 +423,14 @@ static int paint_select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent void PAINT_OT_face_select_linked_pick(wmOperatorType *ot) { - ot->name= "Select Linked Pick"; - ot->description= "Select linked faces"; - ot->idname= "PAINT_OT_face_select_linked_pick"; + ot->name = "Select Linked Pick"; + ot->description = "Select linked faces"; + ot->idname = "PAINT_OT_face_select_linked_pick"; - ot->invoke= paint_select_linked_pick_invoke; - ot->poll= facemask_paint_poll; + ot->invoke = paint_select_linked_pick_invoke; + ot->poll = facemask_paint_poll; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend the existing selection"); } @@ -447,14 +447,14 @@ static int face_select_all_exec(bContext *C, wmOperator *op) void PAINT_OT_face_select_all(wmOperatorType *ot) { - ot->name= "Face Selection"; - ot->description= "Change selection for all faces"; - ot->idname= "PAINT_OT_face_select_all"; + ot->name = "Face Selection"; + ot->description = "Change selection for all faces"; + ot->idname = "PAINT_OT_face_select_all"; - ot->exec= face_select_all_exec; - ot->poll= facemask_paint_poll; + ot->exec = face_select_all_exec; + ot->poll = facemask_paint_poll; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_select_all(ot); } @@ -471,14 +471,14 @@ static int vert_select_all_exec(bContext *C, wmOperator *op) void PAINT_OT_vert_select_all(wmOperatorType *ot) { - ot->name= "Vertex Selection"; - ot->description= "Change selection for all vertices"; - ot->idname= "PAINT_OT_vert_select_all"; + ot->name = "Vertex Selection"; + ot->description = "Change selection for all vertices"; + ot->idname = "PAINT_OT_vert_select_all"; - ot->exec= vert_select_all_exec; - ot->poll= vert_paint_poll; + ot->exec = vert_select_all_exec; + ot->poll = vert_paint_poll; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_select_all(ot); } @@ -493,14 +493,14 @@ static int vert_select_inverse_exec(bContext *C, wmOperator *UNUSED(op)) void PAINT_OT_vert_select_inverse(wmOperatorType *ot) { - ot->name= "Vertex Select Invert"; - ot->description= "Invert selection of vertices"; - ot->idname= "PAINT_OT_vert_select_inverse"; + ot->name = "Vertex Select Invert"; + ot->description = "Invert selection of vertices"; + ot->idname = "PAINT_OT_vert_select_inverse"; - ot->exec= vert_select_inverse_exec; - ot->poll= vert_paint_poll; + ot->exec = vert_select_inverse_exec; + ot->poll = vert_paint_poll; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int face_select_inverse_exec(bContext *C, wmOperator *UNUSED(op)) { @@ -513,14 +513,14 @@ static int face_select_inverse_exec(bContext *C, wmOperator *UNUSED(op)) void PAINT_OT_face_select_inverse(wmOperatorType *ot) { - ot->name= "Face Select Invert"; - ot->description= "Invert selection of faces"; - ot->idname= "PAINT_OT_face_select_inverse"; + ot->name = "Face Select Invert"; + ot->description = "Invert selection of faces"; + ot->idname = "PAINT_OT_face_select_inverse"; - ot->exec= face_select_inverse_exec; - ot->poll= facemask_paint_poll; + ot->exec = face_select_inverse_exec; + ot->poll = facemask_paint_poll; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int face_select_hide_exec(bContext *C, wmOperator *op) @@ -534,14 +534,14 @@ static int face_select_hide_exec(bContext *C, wmOperator *op) void PAINT_OT_face_select_hide(wmOperatorType *ot) { - ot->name= "Face Select Hide"; - ot->description= "Hide selected faces"; - ot->idname= "PAINT_OT_face_select_hide"; + ot->name = "Face Select Hide"; + ot->description = "Hide selected faces"; + ot->idname = "PAINT_OT_face_select_hide"; - ot->exec= face_select_hide_exec; - ot->poll= facemask_paint_poll; + ot->exec = face_select_hide_exec; + ot->poll = facemask_paint_poll; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected objects"); } @@ -556,14 +556,14 @@ static int face_select_reveal_exec(bContext *C, wmOperator *UNUSED(op)) void PAINT_OT_face_select_reveal(wmOperatorType *ot) { - ot->name= "Face Select Reveal"; - ot->description= "Reveal hidden faces"; - ot->idname= "PAINT_OT_face_select_reveal"; + ot->name = "Face Select Reveal"; + ot->description = "Reveal hidden faces"; + ot->idname = "PAINT_OT_face_select_reveal"; - ot->exec= face_select_reveal_exec; - ot->poll= facemask_paint_poll; + ot->exec = face_select_reveal_exec; + ot->poll = facemask_paint_poll; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected objects"); } diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index bf3a7268e11..cb920e3f048 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -1077,15 +1077,15 @@ static int weight_sample_invoke(bContext *C, wmOperator *op, wmEvent *event) void PAINT_OT_weight_sample(wmOperatorType *ot) { /* identifiers */ - ot->name= "Weight Paint Sample Weight"; - ot->idname= "PAINT_OT_weight_sample"; + ot->name = "Weight Paint Sample Weight"; + ot->idname = "PAINT_OT_weight_sample"; /* api callbacks */ - ot->invoke= weight_sample_invoke; - ot->poll= weight_paint_mode_poll; + ot->invoke = weight_sample_invoke; + ot->poll = weight_paint_mode_poll; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; } /* samples cursor location, and gives menu with vertex groups to activate */ @@ -1178,21 +1178,21 @@ void PAINT_OT_weight_sample_group(wmOperatorType *ot) PropertyRNA *prop= NULL; /* identifiers */ - ot->name= "Weight Paint Sample Group"; - ot->idname= "PAINT_OT_weight_sample_group"; + ot->name = "Weight Paint Sample Group"; + ot->idname = "PAINT_OT_weight_sample_group"; /* api callbacks */ - ot->exec= weight_sample_group_exec; - ot->invoke= WM_menu_invoke; - ot->poll= weight_paint_mode_poll; + ot->exec = weight_sample_group_exec; + ot->invoke = WM_menu_invoke; + ot->poll = weight_paint_mode_poll; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; /* keyingset to use (dynamic enum) */ prop= RNA_def_enum(ot->srna, "group", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use"); RNA_def_enum_funcs(prop, weight_paint_sample_enum_itemf); - ot->prop= prop; + ot->prop = prop; } static void do_weight_paint_normalize_all(MDeformVert *dvert, const int defbase_tot, const char *vgroup_validmap) @@ -2039,15 +2039,15 @@ void PAINT_OT_weight_paint_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Weight Paint Mode"; - ot->idname= "PAINT_OT_weight_paint_toggle"; + ot->name = "Weight Paint Mode"; + ot->idname = "PAINT_OT_weight_paint_toggle"; /* api callbacks */ - ot->exec= set_wpaint; - ot->poll= paint_poll_test; + ot->exec = set_wpaint; + ot->poll = paint_poll_test; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -2491,18 +2491,18 @@ void PAINT_OT_weight_paint(wmOperatorType *ot) { /* identifiers */ - ot->name= "Weight Paint"; - ot->idname= "PAINT_OT_weight_paint"; + ot->name = "Weight Paint"; + ot->idname = "PAINT_OT_weight_paint"; /* api callbacks */ - ot->invoke= wpaint_invoke; - ot->modal= paint_stroke_modal; - /* ot->exec= vpaint_exec; <-- needs stroke property */ - ot->poll= weight_paint_poll; - ot->cancel= wpaint_cancel; + ot->invoke = wpaint_invoke; + ot->modal = paint_stroke_modal; + /* ot->exec = vpaint_exec; <-- needs stroke property */ + ot->poll = weight_paint_poll; + ot->cancel = wpaint_cancel; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", ""); } @@ -2520,15 +2520,15 @@ static int weight_paint_set_exec(bContext *C, wmOperator *UNUSED(op)) void PAINT_OT_weight_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Weight"; - ot->idname= "PAINT_OT_weight_set"; + ot->name = "Set Weight"; + ot->idname = "PAINT_OT_weight_set"; /* api callbacks */ - ot->exec= weight_paint_set_exec; - ot->poll= mask_paint_poll; /* it was facemask_paint_poll */ + ot->exec = weight_paint_set_exec; + ot->poll = mask_paint_poll; /* it was facemask_paint_poll */ /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ************ set / clear vertex paint mode ********** */ @@ -2582,15 +2582,15 @@ void PAINT_OT_vertex_paint_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Vertex Paint Mode"; - ot->idname= "PAINT_OT_vertex_paint_toggle"; + ot->name = "Vertex Paint Mode"; + ot->idname = "PAINT_OT_vertex_paint_toggle"; /* api callbacks */ - ot->exec= set_vpaint; - ot->poll= paint_poll_test; + ot->exec = set_vpaint; + ot->poll = paint_poll_test; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -2992,18 +2992,18 @@ static int vpaint_cancel(bContext *C, wmOperator *op) void PAINT_OT_vertex_paint(wmOperatorType *ot) { /* identifiers */ - ot->name= "Vertex Paint"; - ot->idname= "PAINT_OT_vertex_paint"; + ot->name = "Vertex Paint"; + ot->idname = "PAINT_OT_vertex_paint"; /* api callbacks */ - ot->invoke= vpaint_invoke; - ot->modal= paint_stroke_modal; - /* ot->exec= vpaint_exec; <-- needs stroke property */ - ot->poll= vertex_paint_poll; - ot->cancel= vpaint_cancel; + ot->invoke = vpaint_invoke; + ot->modal = paint_stroke_modal; + /* ot->exec = vpaint_exec; <-- needs stroke property */ + ot->poll = vertex_paint_poll; + ot->cancel = vpaint_cancel; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", ""); } @@ -3041,17 +3041,17 @@ void PAINT_OT_weight_from_bones(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Weight from Bones"; - ot->idname= "PAINT_OT_weight_from_bones"; + ot->name = "Weight from Bones"; + ot->idname = "PAINT_OT_weight_from_bones"; /* api callbacks */ - ot->exec= weight_from_bones_exec; - ot->invoke= WM_menu_invoke; - ot->poll= weight_from_bones_poll; + ot->exec = weight_from_bones_exec; + ot->invoke = WM_menu_invoke; + ot->poll = weight_from_bones_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", type_items, 0, "Type", "Method to use for assigning weights"); + ot->prop = RNA_def_enum(ot->srna, "type", type_items, 0, "Type", "Method to use for assigning weights"); } diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 968116924f4..6c665533fcb 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -3563,18 +3563,18 @@ static void SCULPT_OT_brush_stroke(wmOperatorType *ot) }; /* identifiers */ - ot->name= "Sculpt Mode"; - ot->idname= "SCULPT_OT_brush_stroke"; + ot->name = "Sculpt Mode"; + ot->idname = "SCULPT_OT_brush_stroke"; /* api callbacks */ - ot->invoke= sculpt_brush_stroke_invoke; - ot->modal= paint_stroke_modal; - ot->exec= sculpt_brush_stroke_exec; - ot->poll= sculpt_poll; - ot->cancel= sculpt_brush_stroke_cancel; + ot->invoke = sculpt_brush_stroke_invoke; + ot->modal = paint_stroke_modal; + ot->exec = sculpt_brush_stroke_exec; + ot->poll = sculpt_poll; + ot->cancel = sculpt_brush_stroke_cancel; /* flags (sculpt does own undo? (ton) */ - ot->flag= OPTYPE_BLOCKING; + ot->flag = OPTYPE_BLOCKING; /* properties */ @@ -3608,14 +3608,14 @@ static int sculpt_set_persistent_base(bContext *C, wmOperator *UNUSED(op)) static void SCULPT_OT_set_persistent_base(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Persistent Base"; - ot->idname= "SCULPT_OT_set_persistent_base"; + ot->name = "Set Persistent Base"; + ot->idname = "SCULPT_OT_set_persistent_base"; /* api callbacks */ - ot->exec= sculpt_set_persistent_base; - ot->poll= sculpt_mode_poll; + ot->exec = sculpt_set_persistent_base; + ot->poll = sculpt_mode_poll; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /**** Toggle operator for turning sculpt mode on or off ****/ @@ -3686,14 +3686,14 @@ static int sculpt_toggle_mode(bContext *C, wmOperator *UNUSED(op)) static void SCULPT_OT_sculptmode_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Sculpt Mode"; - ot->idname= "SCULPT_OT_sculptmode_toggle"; + ot->name = "Sculpt Mode"; + ot->idname = "SCULPT_OT_sculptmode_toggle"; /* api callbacks */ - ot->exec= sculpt_toggle_mode; - ot->poll= ED_operator_object_active_editable_mesh; + ot->exec = sculpt_toggle_mode; + ot->poll = ED_operator_object_active_editable_mesh; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } void ED_operatortypes_sculpt(void) diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c index 8f6a01dc6cd..29cb11f64ce 100644 --- a/source/blender/editors/sound/sound_ops.c +++ b/source/blender/editors/sound/sound_ops.c @@ -173,17 +173,17 @@ static int sound_open_invoke(bContext *C, wmOperator *op, wmEvent *event) static void SOUND_OT_open(wmOperatorType *ot) { /* identifiers */ - ot->name= "Open Sound"; - ot->description= "Load a sound file"; - ot->idname= "SOUND_OT_open"; + ot->name = "Open Sound"; + ot->description = "Load a sound file"; + ot->idname = "SOUND_OT_open"; /* api callbacks */ - ot->exec= sound_open_exec; - ot->invoke= sound_open_invoke; - ot->cancel= sound_open_cancel; + ot->exec = sound_open_exec; + ot->invoke = sound_open_invoke; + ot->cancel = sound_open_cancel; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE|MOVIEFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY); @@ -194,17 +194,17 @@ static void SOUND_OT_open(wmOperatorType *ot) static void SOUND_OT_open_mono(wmOperatorType *ot) { /* identifiers */ - ot->name= "Open Sound Mono"; - ot->description= "Load a sound file as mono"; - ot->idname= "SOUND_OT_open_mono"; + ot->name = "Open Sound Mono"; + ot->description = "Load a sound file as mono"; + ot->idname = "SOUND_OT_open_mono"; /* api callbacks */ - ot->exec= sound_open_exec; - ot->invoke= sound_open_invoke; - ot->cancel= sound_open_cancel; + ot->exec = sound_open_exec; + ot->invoke = sound_open_invoke; + ot->cancel = sound_open_cancel; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE|MOVIEFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY); @@ -261,15 +261,15 @@ static void SOUND_OT_update_animation_flags(wmOperatorType *ot) */ /* identifiers */ - ot->name= "Update animation"; - ot->description= "Update animation flags"; - ot->idname= "SOUND_OT_update_animation_flags"; + ot->name = "Update animation"; + ot->description = "Update animation flags"; + ot->idname = "SOUND_OT_update_animation_flags"; /* api callbacks */ - ot->exec= sound_update_animation_flags_exec; + ot->exec = sound_update_animation_flags_exec; /* flags */ - ot->flag= OPTYPE_REGISTER; + ot->flag = OPTYPE_REGISTER; } /* ******************************************************* */ @@ -298,15 +298,15 @@ static int sound_bake_animation_exec(bContext *C, wmOperator *UNUSED(op)) static void SOUND_OT_bake_animation(wmOperatorType *ot) { /* identifiers */ - ot->name= "Update animation cache"; - ot->description= "Update the audio animation cache"; - ot->idname= "SOUND_OT_bake_animation"; + ot->name = "Update animation cache"; + ot->description = "Update the audio animation cache"; + ot->idname = "SOUND_OT_bake_animation"; /* api callbacks */ - ot->exec= sound_bake_animation_exec; + ot->exec = sound_bake_animation_exec; /* flags */ - ot->flag= OPTYPE_REGISTER; + ot->flag = OPTYPE_REGISTER; } @@ -571,19 +571,19 @@ static void SOUND_OT_mixdown(wmOperatorType *ot) #endif // WITH_AUDASPACE /* identifiers */ - ot->name= "Mixdown"; - ot->description= "Mixes the scene's audio to a sound file"; - ot->idname= "SOUND_OT_mixdown"; + ot->name = "Mixdown"; + ot->description = "Mixes the scene's audio to a sound file"; + ot->idname = "SOUND_OT_mixdown"; /* api callbacks */ - ot->exec= sound_mixdown_exec; - ot->invoke= sound_mixdown_invoke; + ot->exec = sound_mixdown_exec; + ot->invoke = sound_mixdown_invoke; #ifdef WITH_AUDASPACE - ot->ui= sound_mixdown_draw; + ot->ui = sound_mixdown_draw; #endif /* flags */ - ot->flag= OPTYPE_REGISTER; + ot->flag = OPTYPE_REGISTER; /* properties */ WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE, FILE_SPECIAL, FILE_SAVE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY); @@ -632,16 +632,16 @@ static int sound_pack_exec(bContext *C, wmOperator *op) static void SOUND_OT_pack(wmOperatorType *ot) { /* identifiers */ - ot->name= "Pack Sound"; - ot->description= "Pack the sound into the current blend file"; - ot->idname= "SOUND_OT_pack"; + ot->name = "Pack Sound"; + ot->description = "Pack the sound into the current blend file"; + ot->idname = "SOUND_OT_pack"; /* api callbacks */ - ot->exec= sound_pack_exec; - ot->poll= sound_poll; + ot->exec = sound_pack_exec; + ot->poll = sound_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************* unpack operator *********************/ @@ -696,17 +696,17 @@ static int sound_unpack_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(even static void SOUND_OT_unpack(wmOperatorType *ot) { /* identifiers */ - ot->name= "Unpack Sound"; - ot->description= "Unpack the sound to the samples filename"; - ot->idname= "SOUND_OT_unpack"; + ot->name = "Unpack Sound"; + ot->description = "Unpack the sound to the samples filename"; + ot->idname = "SOUND_OT_unpack"; /* api callbacks */ - ot->exec= sound_unpack_exec; - ot->invoke= sound_unpack_invoke; - ot->poll= sound_poll; + ot->exec = sound_unpack_exec; + ot->invoke = sound_unpack_invoke; + ot->poll = sound_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_enum(ot->srna, "method", unpack_method_items, PF_USE_LOCAL, "Method", "How to unpack"); diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index a044651652e..17f1dfc0714 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -124,17 +124,17 @@ static int act_new_exec(bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_new (wmOperatorType *ot) { /* identifiers */ - ot->name= "New Action"; - ot->idname= "ACTION_OT_new"; - ot->description= "Create new action"; + ot->name = "New Action"; + ot->idname = "ACTION_OT_new"; + ot->description = "Create new action"; /* api callbacks */ - ot->exec= act_new_exec; + ot->exec = act_new_exec; // NOTE: this is used in the NLA too... - //ot->poll= ED_operator_action_active; + //ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ************************************************************************** */ @@ -207,16 +207,16 @@ static int act_markers_make_local_exec (bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_markers_make_local (wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Markers Local"; - ot->idname= "ACTION_OT_markers_make_local"; - ot->description= "Move selected scene markers to the active Action as local 'pose' markers"; + ot->name = "Make Markers Local"; + ot->idname = "ACTION_OT_markers_make_local"; + ot->description = "Move selected scene markers to the active Action as local 'pose' markers"; /* callbacks */ ot->exec = act_markers_make_local_exec; ot->poll = act_markers_make_local_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ************************************************************************** */ @@ -322,16 +322,16 @@ static int actkeys_previewrange_exec(bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_previewrange_set (wmOperatorType *ot) { /* identifiers */ - ot->name= "Auto-Set Preview Range"; - ot->idname= "ACTION_OT_previewrange_set"; - ot->description= "Set Preview Range based on extents of selected Keyframes"; + ot->name = "Auto-Set Preview Range"; + ot->idname = "ACTION_OT_previewrange_set"; + ot->description = "Set Preview Range based on extents of selected Keyframes"; /* api callbacks */ - ot->exec= actkeys_previewrange_exec; - ot->poll= ED_operator_action_active; + ot->exec = actkeys_previewrange_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ****************** View-All Operator ****************** */ @@ -384,31 +384,31 @@ static int actkeys_viewsel_exec(bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_view_all (wmOperatorType *ot) { /* identifiers */ - ot->name= "View All"; - ot->idname= "ACTION_OT_view_all"; - ot->description= "Reset viewable area to show full keyframe range"; + ot->name = "View All"; + ot->idname = "ACTION_OT_view_all"; + ot->description = "Reset viewable area to show full keyframe range"; /* api callbacks */ - ot->exec= actkeys_viewall_exec; - ot->poll= ED_operator_action_active; + ot->exec = actkeys_viewall_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } void ACTION_OT_view_selected (wmOperatorType *ot) { /* identifiers */ - ot->name= "View Selected"; - ot->idname= "ACTION_OT_view_selected"; - ot->description= "Reset viewable area to show selected keyframes range"; + ot->name = "View Selected"; + ot->idname = "ACTION_OT_view_selected"; + ot->description = "Reset viewable area to show selected keyframes range"; /* api callbacks */ - ot->exec= actkeys_viewsel_exec; - ot->poll= ED_operator_action_active; + ot->exec = actkeys_viewsel_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ************************************************************************** */ @@ -487,16 +487,16 @@ static int actkeys_copy_exec(bContext *C, wmOperator *op) void ACTION_OT_copy (wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Keyframes"; - ot->idname= "ACTION_OT_copy"; - ot->description= "Copy selected keyframes to the copy/paste buffer"; + ot->name = "Copy Keyframes"; + ot->idname = "ACTION_OT_copy"; + ot->description = "Copy selected keyframes to the copy/paste buffer"; /* api callbacks */ - ot->exec= actkeys_copy_exec; - ot->poll= ED_operator_action_active; + ot->exec = actkeys_copy_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int actkeys_paste_exec(bContext *C, wmOperator *op) @@ -538,17 +538,17 @@ static int actkeys_paste_exec(bContext *C, wmOperator *op) void ACTION_OT_paste (wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste Keyframes"; - ot->idname= "ACTION_OT_paste"; - ot->description= "Paste keyframes from copy/paste buffer for the selected channels, starting on the current frame"; + ot->name = "Paste Keyframes"; + ot->idname = "ACTION_OT_paste"; + ot->description = "Paste keyframes from copy/paste buffer for the selected channels, starting on the current frame"; /* api callbacks */ -// ot->invoke= WM_operator_props_popup; // better wait for action redo panel - ot->exec= actkeys_paste_exec; - ot->poll= ED_operator_action_active; +// ot->invoke = WM_operator_props_popup; // better wait for action redo panel + ot->exec = actkeys_paste_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ RNA_def_enum(ot->srna, "offset", keyframe_paste_offset_items, KEYFRAME_PASTE_OFFSET_CFRA_START, "Offset", "Paste time offset of keys"); @@ -639,20 +639,20 @@ static int actkeys_insertkey_exec(bContext *C, wmOperator *op) void ACTION_OT_keyframe_insert (wmOperatorType *ot) { /* identifiers */ - ot->name= "Insert Keyframes"; - ot->idname= "ACTION_OT_keyframe_insert"; - ot->description= "Insert keyframes for the specified channels"; + ot->name = "Insert Keyframes"; + ot->idname = "ACTION_OT_keyframe_insert"; + ot->description = "Insert keyframes for the specified channels"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= actkeys_insertkey_exec; - ot->poll= ED_operator_action_active; + ot->invoke = WM_menu_invoke; + ot->exec = actkeys_insertkey_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_actkeys_insertkey_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_actkeys_insertkey_types, 0, "Type", ""); } /* ******************** Duplicate Keyframes Operator ************************* */ @@ -715,17 +715,17 @@ static int actkeys_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED void ACTION_OT_duplicate (wmOperatorType *ot) { /* identifiers */ - ot->name= "Duplicate Keyframes"; - ot->idname= "ACTION_OT_duplicate"; - ot->description= "Make a copy of all selected keyframes"; + ot->name = "Duplicate Keyframes"; + ot->idname = "ACTION_OT_duplicate"; + ot->description = "Make a copy of all selected keyframes"; /* api callbacks */ - ot->invoke= actkeys_duplicate_invoke; - ot->exec= actkeys_duplicate_exec; - ot->poll= ED_operator_action_active; + ot->invoke = actkeys_duplicate_invoke; + ot->exec = actkeys_duplicate_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************** Delete Keyframes Operator ************************* */ @@ -790,17 +790,17 @@ static int actkeys_delete_exec(bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_delete (wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Keyframes"; - ot->idname= "ACTION_OT_delete"; - ot->description= "Remove all selected keyframes"; + ot->name = "Delete Keyframes"; + ot->idname = "ACTION_OT_delete"; + ot->description = "Remove all selected keyframes"; /* api callbacks */ - ot->invoke= WM_operator_confirm; - ot->exec= actkeys_delete_exec; - ot->poll= ED_operator_action_active; + ot->invoke = WM_operator_confirm; + ot->exec = actkeys_delete_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************** Clean Keyframes Operator ************************* */ @@ -854,20 +854,20 @@ static int actkeys_clean_exec(bContext *C, wmOperator *op) void ACTION_OT_clean (wmOperatorType *ot) { /* identifiers */ - ot->name= "Clean Keyframes"; - ot->idname= "ACTION_OT_clean"; - ot->description= "Simplify F-Curves by removing closely spaced keyframes"; + ot->name = "Clean Keyframes"; + ot->idname = "ACTION_OT_clean"; + ot->description = "Simplify F-Curves by removing closely spaced keyframes"; /* api callbacks */ - //ot->invoke= // XXX we need that number popup for this! - ot->exec= actkeys_clean_exec; - ot->poll= ED_operator_action_active; + //ot->invoke = // XXX we need that number popup for this! + ot->exec = actkeys_clean_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_float(ot->srna, "threshold", 0.001f, 0.0f, FLT_MAX, "Threshold", "", 0.0f, 1000.0f); + ot->prop = RNA_def_float(ot->srna, "threshold", 0.001f, 0.0f, FLT_MAX, "Threshold", "", 0.0f, 1000.0f); } /* ******************** Sample Keyframes Operator *********************** */ @@ -918,16 +918,16 @@ static int actkeys_sample_exec(bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_sample (wmOperatorType *ot) { /* identifiers */ - ot->name= "Sample Keyframes"; - ot->idname= "ACTION_OT_sample"; - ot->description= "Add keyframes on every frame between the selected keyframes"; + ot->name = "Sample Keyframes"; + ot->idname = "ACTION_OT_sample"; + ot->description = "Add keyframes on every frame between the selected keyframes"; /* api callbacks */ - ot->exec= actkeys_sample_exec; - ot->poll= ED_operator_action_active; + ot->exec = actkeys_sample_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ************************************************************************** */ @@ -1028,20 +1028,20 @@ static int actkeys_expo_exec(bContext *C, wmOperator *op) void ACTION_OT_extrapolation_type (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Keyframe Extrapolation"; - ot->idname= "ACTION_OT_extrapolation_type"; - ot->description= "Set extrapolation mode for selected F-Curves"; + ot->name = "Set Keyframe Extrapolation"; + ot->idname = "ACTION_OT_extrapolation_type"; + ot->description = "Set extrapolation mode for selected F-Curves"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= actkeys_expo_exec; - ot->poll= ED_operator_action_active; + ot->invoke = WM_menu_invoke; + ot->exec = actkeys_expo_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_actkeys_expo_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_actkeys_expo_types, 0, "Type", ""); } /* ******************** Set Interpolation-Type Operator *********************** */ @@ -1099,20 +1099,20 @@ static int actkeys_ipo_exec(bContext *C, wmOperator *op) void ACTION_OT_interpolation_type (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Keyframe Interpolation"; - ot->idname= "ACTION_OT_interpolation_type"; - ot->description= "Set interpolation mode for the F-Curve segments starting from the selected keyframes"; + ot->name = "Set Keyframe Interpolation"; + ot->idname = "ACTION_OT_interpolation_type"; + ot->description = "Set interpolation mode for the F-Curve segments starting from the selected keyframes"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= actkeys_ipo_exec; - ot->poll= ED_operator_action_active; + ot->invoke = WM_menu_invoke; + ot->exec = actkeys_ipo_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", beztriple_interpolation_mode_items, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", beztriple_interpolation_mode_items, 0, "Type", ""); } /* ******************** Set Handle-Type Operator *********************** */ @@ -1179,20 +1179,20 @@ static int actkeys_handletype_exec(bContext *C, wmOperator *op) void ACTION_OT_handle_type (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Keyframe Handle Type"; - ot->idname= "ACTION_OT_handle_type"; - ot->description= "Set type of handle for selected keyframes"; + ot->name = "Set Keyframe Handle Type"; + ot->idname = "ACTION_OT_handle_type"; + ot->description = "Set type of handle for selected keyframes"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= actkeys_handletype_exec; - ot->poll= ED_operator_action_active; + ot->invoke = WM_menu_invoke; + ot->exec = actkeys_handletype_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", keyframe_handle_type_items, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", keyframe_handle_type_items, 0, "Type", ""); } /* ******************** Set Keyframe-Type Operator *********************** */ @@ -1250,20 +1250,20 @@ static int actkeys_keytype_exec(bContext *C, wmOperator *op) void ACTION_OT_keyframe_type (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Keyframe Type"; - ot->idname= "ACTION_OT_keyframe_type"; - ot->description= "Set type of keyframe for the selected keyframes"; + ot->name = "Set Keyframe Type"; + ot->idname = "ACTION_OT_keyframe_type"; + ot->description = "Set type of keyframe for the selected keyframes"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= actkeys_keytype_exec; - ot->poll= ED_operator_action_active; + ot->invoke = WM_menu_invoke; + ot->exec = actkeys_keytype_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", beztriple_keyframe_type_items, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", beztriple_keyframe_type_items, 0, "Type", ""); } /* ************************************************************************** */ @@ -1318,16 +1318,16 @@ static int actkeys_framejump_exec(bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_frame_jump (wmOperatorType *ot) { /* identifiers */ - ot->name= "Jump to Frame"; - ot->idname= "ACTION_OT_frame_jump"; - ot->description= "Set the current frame to the average frame of the selected keyframes"; + ot->name = "Jump to Frame"; + ot->idname = "ACTION_OT_frame_jump"; + ot->description = "Set the current frame to the average frame of the selected keyframes"; /* api callbacks */ - ot->exec= actkeys_framejump_exec; - ot->poll= ED_operator_action_active; + ot->exec = actkeys_framejump_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************** Snap Keyframes Operator *********************** */ @@ -1418,20 +1418,20 @@ static int actkeys_snap_exec(bContext *C, wmOperator *op) void ACTION_OT_snap (wmOperatorType *ot) { /* identifiers */ - ot->name= "Snap Keys"; - ot->idname= "ACTION_OT_snap"; - ot->description= "Snap selected keyframes to the times specified"; + ot->name = "Snap Keys"; + ot->idname = "ACTION_OT_snap"; + ot->description = "Snap selected keyframes to the times specified"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= actkeys_snap_exec; - ot->poll= ED_operator_action_active; + ot->invoke = WM_menu_invoke; + ot->exec = actkeys_snap_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_actkeys_snap_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_actkeys_snap_types, 0, "Type", ""); } /* ******************** Mirror Keyframes Operator *********************** */ @@ -1532,20 +1532,20 @@ static int actkeys_mirror_exec(bContext *C, wmOperator *op) void ACTION_OT_mirror (wmOperatorType *ot) { /* identifiers */ - ot->name= "Mirror Keys"; - ot->idname= "ACTION_OT_mirror"; - ot->description= "Flip selected keyframes over the selected mirror line"; + ot->name = "Mirror Keys"; + ot->idname = "ACTION_OT_mirror"; + ot->description = "Flip selected keyframes over the selected mirror line"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= actkeys_mirror_exec; - ot->poll= ED_operator_action_active; + ot->invoke = WM_menu_invoke; + ot->exec = actkeys_mirror_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_actkeys_mirror_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_actkeys_mirror_types, 0, "Type", ""); } /* ************************************************************************** */ diff --git a/source/blender/editors/space_action/action_ops.c b/source/blender/editors/space_action/action_ops.c index d4e44dee9c3..82072c7c28a 100644 --- a/source/blender/editors/space_action/action_ops.c +++ b/source/blender/editors/space_action/action_ops.c @@ -95,7 +95,7 @@ void ED_operatormacros_action(void) ot= WM_operatortype_append_macro("ACTION_OT_duplicate_move", "Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER); if (ot) { - ot->description= "Make a copy of all selected keyframes and move them"; + ot->description = "Make a copy of all selected keyframes and move them"; WM_operatortype_macro_define(ot, "ACTION_OT_duplicate"); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_transform"); RNA_enum_set(otmacro->ptr, "mode", TFM_TIME_DUPLICATE); diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index 1b0b305b7aa..0fef3dd6e2b 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -161,19 +161,19 @@ static int actkeys_deselectall_exec(bContext *C, wmOperator *op) void ACTION_OT_select_all_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select All"; - ot->idname= "ACTION_OT_select_all_toggle"; - ot->description= "Toggle selection of all keyframes"; + ot->name = "Select All"; + ot->idname = "ACTION_OT_select_all_toggle"; + ot->description = "Toggle selection of all keyframes"; /* api callbacks */ - ot->exec= actkeys_deselectall_exec; - ot->poll= ED_operator_action_active; + ot->exec = actkeys_deselectall_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_boolean(ot->srna, "invert", 0, "Invert", ""); + ot->prop = RNA_def_boolean(ot->srna, "invert", 0, "Invert", ""); } /* ******************** Border Select Operator **************************** */ @@ -319,25 +319,25 @@ static int actkeys_borderselect_exec(bContext *C, wmOperator *op) void ACTION_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Select"; - ot->idname= "ACTION_OT_select_border"; - ot->description= "Select all keyframes within the specified region"; + ot->name = "Border Select"; + ot->idname = "ACTION_OT_select_border"; + ot->description = "Select all keyframes within the specified region"; /* api callbacks */ - ot->invoke= WM_border_select_invoke; - ot->exec= actkeys_borderselect_exec; - ot->modal= WM_border_select_modal; - ot->cancel= WM_border_select_cancel; + ot->invoke = WM_border_select_invoke; + ot->exec = actkeys_borderselect_exec; + ot->modal = WM_border_select_modal; + ot->cancel = WM_border_select_cancel; - ot->poll= ED_operator_action_active; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* rna */ WM_operator_properties_gesture_border(ot, TRUE); - ot->prop= RNA_def_boolean(ot->srna, "axis_range", 0, "Axis Range", ""); + ot->prop = RNA_def_boolean(ot->srna, "axis_range", 0, "Axis Range", ""); } /* ******************** Column Select Operator **************************** */ @@ -527,19 +527,19 @@ static int actkeys_columnselect_exec(bContext *C, wmOperator *op) void ACTION_OT_select_column (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select All"; - ot->idname= "ACTION_OT_select_column"; - ot->description= "Select all keyframes on the specified frame(s)"; + ot->name = "Select All"; + ot->idname = "ACTION_OT_select_column"; + ot->description = "Select all keyframes on the specified frame(s)"; /* api callbacks */ - ot->exec= actkeys_columnselect_exec; - ot->poll= ED_operator_action_active; + ot->exec = actkeys_columnselect_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_enum(ot->srna, "mode", prop_column_select_types, 0, "Mode", ""); + ot->prop = RNA_def_enum(ot->srna, "mode", prop_column_select_types, 0, "Mode", ""); } /* ******************** Select Linked Operator *********************** */ @@ -586,15 +586,15 @@ void ACTION_OT_select_linked (wmOperatorType *ot) { /* identifiers */ ot->name = "Select Linked"; - ot->idname= "ACTION_OT_select_linked"; + ot->idname = "ACTION_OT_select_linked"; ot->description = "Select keyframes occurring in the same F-Curves as selected ones"; /* api callbacks */ - ot->exec= actkeys_select_linked_exec; - ot->poll= ED_operator_action_active; + ot->exec = actkeys_select_linked_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/; + ot->flag = OPTYPE_REGISTER/*|OPTYPE_UNDO*/; } /* ******************** Select More/Less Operators *********************** */ @@ -663,15 +663,15 @@ void ACTION_OT_select_more (wmOperatorType *ot) { /* identifiers */ ot->name = "Select More"; - ot->idname= "ACTION_OT_select_more"; + ot->idname = "ACTION_OT_select_more"; ot->description = "Select keyframes beside already selected ones"; /* api callbacks */ - ot->exec= actkeys_select_more_exec; - ot->poll= ED_operator_action_active; + ot->exec = actkeys_select_more_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/; + ot->flag = OPTYPE_REGISTER/*|OPTYPE_UNDO*/; } /* ----------------- */ @@ -697,15 +697,15 @@ void ACTION_OT_select_less (wmOperatorType *ot) { /* identifiers */ ot->name = "Select Less"; - ot->idname= "ACTION_OT_select_less"; + ot->idname = "ACTION_OT_select_less"; ot->description = "Deselect keyframes on ends of selection islands"; /* api callbacks */ - ot->exec= actkeys_select_less_exec; - ot->poll= ED_operator_action_active; + ot->exec = actkeys_select_less_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/; + ot->flag = OPTYPE_REGISTER/*|OPTYPE_UNDO*/; } /* ******************** Select Left/Right Operator ************************* */ @@ -863,20 +863,20 @@ static int actkeys_select_leftright_invoke (bContext *C, wmOperator *op, wmEvent void ACTION_OT_select_leftright (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Left/Right"; - ot->idname= "ACTION_OT_select_leftright"; - ot->description= "Select keyframes to the left or the right of the current frame"; + ot->name = "Select Left/Right"; + ot->idname = "ACTION_OT_select_leftright"; + ot->description = "Select keyframes to the left or the right of the current frame"; /* api callbacks */ - ot->invoke= actkeys_select_leftright_invoke; - ot->exec= actkeys_select_leftright_exec; - ot->poll= ED_operator_action_active; + ot->invoke = actkeys_select_leftright_invoke; + ot->exec = actkeys_select_leftright_exec; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "mode", prop_actkeys_leftright_select_types, ACTKEYS_LRSEL_TEST, "Mode", ""); + ot->prop = RNA_def_enum(ot->srna, "mode", prop_actkeys_leftright_select_types, ACTKEYS_LRSEL_TEST, "Mode", ""); RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); } @@ -1177,16 +1177,16 @@ static int actkeys_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *even void ACTION_OT_clickselect (wmOperatorType *ot) { /* identifiers */ - ot->name= "Mouse Select Keys"; - ot->idname= "ACTION_OT_clickselect"; - ot->description= "Select keyframes by clicking on them"; + ot->name = "Mouse Select Keys"; + ot->idname = "ACTION_OT_clickselect"; + ot->description = "Select keyframes by clicking on them"; /* api callbacks - absolutely no exec() this yet... */ - ot->invoke= actkeys_clickselect_invoke; - ot->poll= ED_operator_action_active; + ot->invoke = actkeys_clickselect_invoke; + ot->poll = ED_operator_action_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c index 26516bcda99..ebdea00fd4f 100644 --- a/source/blender/editors/space_buttons/buttons_ops.c +++ b/source/blender/editors/space_buttons/buttons_ops.c @@ -81,13 +81,13 @@ static int toolbox_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *UNUSED(e void BUTTONS_OT_toolbox(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toolbox"; - ot->description="Display button panel toolbox"; - ot->idname= "BUTTONS_OT_toolbox"; + ot->name = "Toolbox"; + ot->description = "Display button panel toolbox"; + ot->idname = "BUTTONS_OT_toolbox"; /* api callbacks */ - ot->invoke= toolbox_invoke; - ot->poll= ED_operator_buttons_active; + ot->invoke = toolbox_invoke; + ot->poll = ED_operator_buttons_active; } /********************** filebrowse operator *********************/ @@ -220,14 +220,14 @@ static int file_browse_invoke(bContext *C, wmOperator *op, wmEvent *event) void BUTTONS_OT_file_browse(wmOperatorType *ot) { /* identifiers */ - ot->name= "Accept"; - ot->description="Open a file browser, Hold Shift to open the file, Alt to browse containing directory"; - ot->idname= "BUTTONS_OT_file_browse"; + ot->name = "Accept"; + ot->description = "Open a file browser, Hold Shift to open the file, Alt to browse containing directory"; + ot->idname = "BUTTONS_OT_file_browse"; /* api callbacks */ - ot->invoke= file_browse_invoke; - ot->exec= file_browse_exec; - ot->cancel= file_browse_cancel; + ot->invoke = file_browse_invoke; + ot->exec = file_browse_exec; + ot->cancel = file_browse_cancel; /* properties */ WM_operator_properties_filesel(ot, 0, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH|WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY); @@ -237,14 +237,14 @@ void BUTTONS_OT_file_browse(wmOperatorType *ot) void BUTTONS_OT_directory_browse(wmOperatorType *ot) { /* identifiers */ - ot->name= "Accept"; - ot->description="Open a directory browser, Hold Shift to open the file, Alt to browse containing directory"; - ot->idname= "BUTTONS_OT_directory_browse"; + ot->name = "Accept"; + ot->description = "Open a directory browser, Hold Shift to open the file, Alt to browse containing directory"; + ot->idname = "BUTTONS_OT_directory_browse"; /* api callbacks */ - ot->invoke= file_browse_invoke; - ot->exec= file_browse_exec; - ot->cancel= file_browse_cancel; + ot->invoke = file_browse_invoke; + ot->exec = file_browse_exec; + ot->cancel = file_browse_cancel; /* properties */ WM_operator_properties_filesel(ot, 0, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_DIRECTORY|WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY); diff --git a/source/blender/editors/space_clip/clip_graph_ops.c b/source/blender/editors/space_clip/clip_graph_ops.c index d75c14df054..0b8b4724062 100644 --- a/source/blender/editors/space_clip/clip_graph_ops.c +++ b/source/blender/editors/space_clip/clip_graph_ops.c @@ -287,17 +287,17 @@ static int select_invoke(bContext *C, wmOperator *op, wmEvent *event) void CLIP_OT_graph_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select"; - ot->description= "Select graph curves"; - ot->idname= "CLIP_OT_graph_select"; + ot->name = "Select"; + ot->description = "Select graph curves"; + ot->idname = "CLIP_OT_graph_select"; /* api callbacks */ - ot->exec= select_exec; - ot->invoke= select_invoke; - ot->poll= ED_space_clip_graph_poll; + ot->exec = select_exec; + ot->invoke = select_invoke; + ot->poll = ED_space_clip_graph_poll; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; /* properties */ RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX, @@ -453,7 +453,7 @@ void CLIP_OT_graph_select_all_markers(wmOperatorType *ot) ot->poll = ED_space_clip_graph_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_select_all(ot); } @@ -477,17 +477,17 @@ static int delete_curve_exec(bContext *C, wmOperator *UNUSED(op)) void CLIP_OT_graph_delete_curve(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Curve"; - ot->description= "Delete selected curves"; - ot->idname= "CLIP_OT_graph_delete_curve"; + ot->name = "Delete Curve"; + ot->description = "Delete selected curves"; + ot->idname = "CLIP_OT_graph_delete_curve"; /* api callbacks */ - ot->invoke= WM_operator_confirm; - ot->exec= delete_curve_exec; - ot->poll= ED_space_clip_poll; + ot->invoke = WM_operator_confirm; + ot->exec = delete_curve_exec; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /******************** delete knot operator ********************/ @@ -519,16 +519,16 @@ static int delete_knot_exec(bContext *C, wmOperator *UNUSED(op)) void CLIP_OT_graph_delete_knot(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Knot"; - ot->description= "Delete curve knots"; - ot->idname= "CLIP_OT_graph_delete_knot"; + ot->name = "Delete Knot"; + ot->description = "Delete curve knots"; + ot->idname = "CLIP_OT_graph_delete_knot"; /* api callbacks */ - ot->exec= delete_knot_exec; - ot->poll= ED_space_clip_graph_poll; + ot->exec = delete_knot_exec; + ot->poll = ED_space_clip_graph_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /******************** view all operator ********************/ diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index 552c62936b6..c9428737770 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -221,17 +221,17 @@ static int open_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void CLIP_OT_open(wmOperatorType *ot) { /* identifiers */ - ot->name= "Open Clip"; - ot->description= "Load a sequence of frames or a movie file"; - ot->idname= "CLIP_OT_open"; + ot->name = "Open Clip"; + ot->description = "Load a sequence of frames or a movie file"; + ot->idname = "CLIP_OT_open"; /* api callbacks */ - ot->exec= open_exec; - ot->invoke= open_invoke; - ot->cancel= open_cancel; + ot->exec = open_exec; + ot->invoke = open_invoke; + ot->cancel = open_cancel; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE|MOVIEFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH|WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY); @@ -256,12 +256,12 @@ static int reload_exec(bContext *C, wmOperator *UNUSED(op)) void CLIP_OT_reload(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reload Clip"; - ot->description= "Reload clip"; - ot->idname= "CLIP_OT_reload"; + ot->name = "Reload Clip"; + ot->description = "Reload clip"; + ot->idname = "CLIP_OT_reload"; /* api callbacks */ - ot->exec= reload_exec; + ot->exec = reload_exec; } /********************** view pan operator *********************/ @@ -390,18 +390,18 @@ static int view_pan_cancel(bContext *C, wmOperator *op) void CLIP_OT_view_pan(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Pan"; - ot->idname= "CLIP_OT_view_pan"; + ot->name = "View Pan"; + ot->idname = "CLIP_OT_view_pan"; /* api callbacks */ - ot->exec= view_pan_exec; - ot->invoke= view_pan_invoke; - ot->modal= view_pan_modal; - ot->cancel= view_pan_cancel; - ot->poll= ED_space_clip_poll; + ot->exec = view_pan_exec; + ot->invoke = view_pan_invoke; + ot->modal = view_pan_modal; + ot->cancel = view_pan_cancel; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_BLOCKING; + ot->flag = OPTYPE_BLOCKING; /* properties */ RNA_def_float_vector(ot->srna, "offset", 2, NULL, -FLT_MAX, FLT_MAX, @@ -514,18 +514,18 @@ static int view_zoom_cancel(bContext *C, wmOperator *op) void CLIP_OT_view_zoom(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Zoom"; - ot->idname= "CLIP_OT_view_zoom"; + ot->name = "View Zoom"; + ot->idname = "CLIP_OT_view_zoom"; /* api callbacks */ - ot->exec= view_zoom_exec; - ot->invoke= view_zoom_invoke; - ot->modal= view_zoom_modal; - ot->cancel= view_zoom_cancel; - ot->poll= ED_space_clip_poll; + ot->exec = view_zoom_exec; + ot->invoke = view_zoom_invoke; + ot->modal = view_zoom_modal; + ot->cancel = view_zoom_cancel; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; + ot->flag = OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; /* properties */ RNA_def_float(ot->srna, "factor", 0.0f, 0.0f, FLT_MAX, @@ -562,13 +562,13 @@ static int view_zoom_in_invoke(bContext *C, wmOperator *op, wmEvent *event) void CLIP_OT_view_zoom_in(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Zoom In"; - ot->idname= "CLIP_OT_view_zoom_in"; + ot->name = "View Zoom In"; + ot->idname = "CLIP_OT_view_zoom_in"; /* api callbacks */ - ot->exec= view_zoom_in_exec; - ot->invoke= view_zoom_in_invoke; - ot->poll= ED_space_clip_poll; + ot->exec = view_zoom_in_exec; + ot->invoke = view_zoom_in_invoke; + ot->poll = ED_space_clip_poll; /* properties */ RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX, "Location", "Cursor location in screen coordinates", -10.0f, 10.0f); @@ -602,13 +602,13 @@ static int view_zoom_out_invoke(bContext *C, wmOperator *op, wmEvent *event) void CLIP_OT_view_zoom_out(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Zoom Out"; - ot->idname= "CLIP_OT_view_zoom_out"; + ot->name = "View Zoom Out"; + ot->idname = "CLIP_OT_view_zoom_out"; /* api callbacks */ - ot->exec= view_zoom_out_exec; - ot->invoke= view_zoom_out_invoke; - ot->poll= ED_space_clip_poll; + ot->exec = view_zoom_out_exec; + ot->invoke = view_zoom_out_invoke; + ot->poll = ED_space_clip_poll; /* properties */ RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX, "Location", "Cursor location in normalised (0.0-1.0) coordinates", -10.0f, 10.0f); @@ -635,12 +635,12 @@ static int view_zoom_ratio_exec(bContext *C, wmOperator *op) void CLIP_OT_view_zoom_ratio(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Zoom Ratio"; - ot->idname= "CLIP_OT_view_zoom_ratio"; + ot->name = "View Zoom Ratio"; + ot->idname = "CLIP_OT_view_zoom_ratio"; /* api callbacks */ - ot->exec= view_zoom_ratio_exec; - ot->poll= ED_space_clip_poll; + ot->exec = view_zoom_ratio_exec; + ot->poll = ED_space_clip_poll; /* properties */ RNA_def_float(ot->srna, "ratio", 0.0f, 0.0f, FLT_MAX, @@ -702,12 +702,12 @@ static int view_all_exec(bContext *C, wmOperator *op) void CLIP_OT_view_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "View All"; - ot->idname= "CLIP_OT_view_all"; + ot->name = "View All"; + ot->idname = "CLIP_OT_view_all"; /* api callbacks */ - ot->exec= view_all_exec; - ot->poll= ED_space_clip_poll; + ot->exec = view_all_exec; + ot->poll = ED_space_clip_poll; /* properties */ RNA_def_boolean(ot->srna, "fit_view", 0, "Fit View", "Fit frame to the viewport"); @@ -732,12 +732,12 @@ static int view_selected_exec(bContext *C, wmOperator *UNUSED(op)) void CLIP_OT_view_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Selected"; - ot->idname= "CLIP_OT_view_selected"; + ot->name = "View Selected"; + ot->idname = "CLIP_OT_view_selected"; /* api callbacks */ - ot->exec= view_selected_exec; - ot->poll= ED_space_clip_poll; + ot->exec = view_selected_exec; + ot->poll = ED_space_clip_poll; } /********************** change frame operator *********************/ @@ -836,18 +836,18 @@ static int change_frame_modal(bContext *C, wmOperator *op, wmEvent *event) void CLIP_OT_change_frame(wmOperatorType *ot) { /* identifiers */ - ot->name= "Change frame"; - ot->idname= "CLIP_OT_change_frame"; - ot->description= "Interactively change the current frame number"; + ot->name = "Change frame"; + ot->idname = "CLIP_OT_change_frame"; + ot->description = "Interactively change the current frame number"; /* api callbacks */ - ot->exec= change_frame_exec; - ot->invoke= change_frame_invoke; - ot->modal= change_frame_modal; - ot->poll= change_frame_poll; + ot->exec = change_frame_exec; + ot->invoke = change_frame_invoke; + ot->modal = change_frame_modal; + ot->poll = change_frame_poll; /* flags */ - ot->flag= OPTYPE_BLOCKING|OPTYPE_UNDO; + ot->flag = OPTYPE_BLOCKING|OPTYPE_UNDO; /* rna */ RNA_def_int(ot->srna, "frame", 0, MINAFRAME, MAXFRAME, "Frame", "", MINAFRAME, MAXFRAME); @@ -1002,16 +1002,16 @@ static int clip_rebuild_proxy_exec(bContext *C, wmOperator *UNUSED(op)) void CLIP_OT_rebuild_proxy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Rebuild Proxy and Timecode Indices"; - ot->idname= "CLIP_OT_rebuild_proxy"; - ot->description= "Rebuild all selected proxies and timecode indices in the background"; + ot->name = "Rebuild Proxy and Timecode Indices"; + ot->idname = "CLIP_OT_rebuild_proxy"; + ot->description = "Rebuild all selected proxies and timecode indices in the background"; /* api callbacks */ - ot->exec= clip_rebuild_proxy_exec; - ot->poll= ED_space_clip_poll; + ot->exec = clip_rebuild_proxy_exec; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER; + ot->flag = OPTYPE_REGISTER; } /********************** mode set operator *********************/ @@ -1044,14 +1044,14 @@ void CLIP_OT_mode_set(wmOperatorType *ot) /* identifiers */ - ot->name= "Set Clip Mode"; + ot->name = "Set Clip Mode"; ot->description = "Set the clip interaction mode"; - ot->idname= "CLIP_OT_mode_set"; + ot->idname = "CLIP_OT_mode_set"; /* api callbacks */ - ot->exec= mode_set_exec; + ot->exec = mode_set_exec; - ot->poll= ED_space_clip_poll; + ot->poll = ED_space_clip_poll; /* properties */ RNA_def_enum(ot->srna, "mode", mode_items, SC_MODE_TRACKING, "Mode", ""); diff --git a/source/blender/editors/space_clip/clip_toolbar.c b/source/blender/editors/space_clip/clip_toolbar.c index d90f429a206..287edfa3f1c 100644 --- a/source/blender/editors/space_clip/clip_toolbar.c +++ b/source/blender/editors/space_clip/clip_toolbar.c @@ -101,13 +101,13 @@ static int properties_exec(bContext *C, wmOperator *UNUSED(op)) void CLIP_OT_properties(wmOperatorType *ot) { /* identifiers */ - ot->name= "Properties"; - ot->description= "Toggle clip properties panel"; - ot->idname= "CLIP_OT_properties"; + ot->name = "Properties"; + ot->description = "Toggle clip properties panel"; + ot->idname = "CLIP_OT_properties"; /* api callbacks */ - ot->exec= properties_exec; - ot->poll= properties_poll; + ot->exec = properties_exec; + ot->poll = properties_poll; } /************************** tools ******************************/ @@ -175,13 +175,13 @@ static int tools_exec(bContext *C, wmOperator *UNUSED(op)) void CLIP_OT_tools(wmOperatorType *ot) { /* identifiers */ - ot->name= "Tools"; - ot->description= "Toggle clip tools panel"; - ot->idname= "CLIP_OT_tools"; + ot->name = "Tools"; + ot->description = "Toggle clip tools panel"; + ot->idname = "CLIP_OT_tools"; /* api callbacks */ - ot->exec= tools_exec; - ot->poll= tools_poll; + ot->exec = tools_exec; + ot->poll = tools_poll; } /************************** redo panel ******************************/ diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 15bbcd910b6..f69e964e045 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -149,17 +149,17 @@ static int add_marker_invoke(bContext *C, wmOperator *op, wmEvent *event) void CLIP_OT_add_marker(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Marker"; - ot->idname= "CLIP_OT_add_marker"; - ot->description= "Place new marker at specified location"; + ot->name = "Add Marker"; + ot->idname = "CLIP_OT_add_marker"; + ot->description = "Place new marker at specified location"; /* api callbacks */ - ot->invoke= add_marker_invoke; - ot->exec= add_marker_exec; - ot->poll= space_clip_frame_poll; + ot->invoke = add_marker_invoke; + ot->exec = add_marker_exec; + ot->poll = space_clip_frame_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MIN, FLT_MAX, @@ -194,17 +194,17 @@ static int delete_track_exec(bContext *C, wmOperator *UNUSED(op)) void CLIP_OT_delete_track(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Track"; - ot->idname= "CLIP_OT_delete_track"; - ot->description= "Delete selected tracks"; + ot->name = "Delete Track"; + ot->idname = "CLIP_OT_delete_track"; + ot->description = "Delete selected tracks"; /* api callbacks */ - ot->invoke= WM_operator_confirm; - ot->exec= delete_track_exec; - ot->poll= ED_space_clip_poll; + ot->invoke = WM_operator_confirm; + ot->exec = delete_track_exec; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** delete marker operator *********************/ @@ -245,17 +245,17 @@ static int delete_marker_exec(bContext *C, wmOperator *UNUSED(op)) void CLIP_OT_delete_marker(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Marker"; - ot->idname= "CLIP_OT_delete_marker"; - ot->description= "Delete marker for current frame from selected tracks"; + ot->name = "Delete Marker"; + ot->idname = "CLIP_OT_delete_marker"; + ot->description = "Delete marker for current frame from selected tracks"; /* api callbacks */ - ot->invoke= WM_operator_confirm; - ot->exec= delete_marker_exec; - ot->poll= ED_space_clip_poll; + ot->invoke = WM_operator_confirm; + ot->exec = delete_marker_exec; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** slide marker operator *********************/ @@ -621,17 +621,17 @@ static int slide_marker_modal(bContext *C, wmOperator *op, wmEvent *event) void CLIP_OT_slide_marker(wmOperatorType *ot) { /* identifiers */ - ot->name= "Slide Marker"; - ot->description= "Slide marker areas"; - ot->idname= "CLIP_OT_slide_marker"; + ot->name = "Slide Marker"; + ot->description = "Slide marker areas"; + ot->idname = "CLIP_OT_slide_marker"; /* api callbacks */ - ot->poll= space_clip_frame_poll; - ot->invoke= slide_marker_invoke; - ot->modal= slide_marker_modal; + ot->poll = space_clip_frame_poll; + ot->invoke = slide_marker_invoke; + ot->modal = slide_marker_modal; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_GRAB_POINTER|OPTYPE_BLOCKING; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_GRAB_POINTER|OPTYPE_BLOCKING; /* properties */ RNA_def_float_vector(ot->srna, "offset", 2, NULL, -FLT_MAX, FLT_MAX, @@ -827,17 +827,17 @@ static int select_invoke(bContext *C, wmOperator *op, wmEvent *event) void CLIP_OT_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select"; - ot->description= "Select tracking markers"; - ot->idname= "CLIP_OT_select"; + ot->name = "Select"; + ot->description = "Select tracking markers"; + ot->idname = "CLIP_OT_select"; /* api callbacks */ - ot->exec= select_exec; - ot->invoke= select_invoke; - ot->poll= ED_space_clip_poll; + ot->exec = select_exec; + ot->invoke = select_invoke; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "extend", 0, @@ -903,18 +903,18 @@ static int border_select_exec(bContext *C, wmOperator *op) void CLIP_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Select"; - ot->description= "Select markers using border selection"; - ot->idname= "CLIP_OT_select_border"; + ot->name = "Border Select"; + ot->description = "Select markers using border selection"; + ot->idname = "CLIP_OT_select_border"; /* api callbacks */ - ot->invoke= WM_border_select_invoke; - ot->exec= border_select_exec; - ot->modal= WM_border_select_modal; - ot->poll= ED_space_clip_poll; + ot->invoke = WM_border_select_invoke; + ot->exec = border_select_exec; + ot->modal = WM_border_select_modal; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; /* properties */ WM_operator_properties_gesture_border(ot, TRUE); @@ -987,18 +987,18 @@ static int circle_select_exec(bContext *C, wmOperator *op) void CLIP_OT_select_circle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Circle Select"; - ot->description= "Select markers using circle selection"; - ot->idname= "CLIP_OT_select_circle"; + ot->name = "Circle Select"; + ot->description = "Select markers using circle selection"; + ot->idname = "CLIP_OT_select_circle"; /* api callbacks */ - ot->invoke= WM_gesture_circle_invoke; - ot->modal= WM_gesture_circle_modal; - ot->exec= circle_select_exec; - ot->poll= ED_space_clip_poll; + ot->invoke = WM_gesture_circle_invoke; + ot->modal = WM_gesture_circle_modal; + ot->exec = circle_select_exec; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_int(ot->srna, "x", 0, INT_MIN, INT_MAX, "X", "", INT_MIN, INT_MAX); @@ -1080,16 +1080,16 @@ static int select_all_exec(bContext *C, wmOperator *op) void CLIP_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "(De)select All"; - ot->description= "Change selection of all tracking markers"; - ot->idname= "CLIP_OT_select_all"; + ot->name = "(De)select All"; + ot->description = "Change selection of all tracking markers"; + ot->idname = "CLIP_OT_select_all"; /* api callbacks */ - ot->exec= select_all_exec; - ot->poll= ED_space_clip_poll; + ot->exec = select_all_exec; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_select_all(ot); } @@ -1169,16 +1169,16 @@ void CLIP_OT_select_grouped(wmOperatorType *ot) }; /* identifiers */ - ot->name= "Select Grouped"; - ot->description= "Select all tracks from specified group"; - ot->idname= "CLIP_OT_select_grouped"; + ot->name = "Select Grouped"; + ot->description = "Select all tracks from specified group"; + ot->idname = "CLIP_OT_select_grouped"; /* api callbacks */ - ot->exec= select_groped_exec; - ot->poll= space_clip_frame_poll; + ot->exec = select_groped_exec; + ot->poll = space_clip_frame_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* proeprties */ RNA_def_enum(ot->srna, "group", select_group_items, TRACK_CLEAR_REMAINED, "Action", "Clear action to execute"); @@ -1531,18 +1531,18 @@ static int track_markers_modal(bContext *C, wmOperator *UNUSED(op), wmEvent *eve void CLIP_OT_track_markers(wmOperatorType *ot) { /* identifiers */ - ot->name= "Track Markers"; - ot->description= "Track selected markers"; - ot->idname= "CLIP_OT_track_markers"; + ot->name = "Track Markers"; + ot->description = "Track selected markers"; + ot->idname = "CLIP_OT_track_markers"; /* api callbacks */ - ot->exec= track_markers_exec; - ot->invoke= track_markers_invoke; - ot->poll= space_clip_frame_poll; - ot->modal= track_markers_modal; + ot->exec = track_markers_exec; + ot->invoke = track_markers_invoke; + ot->poll = space_clip_frame_poll; + ot->modal = track_markers_modal; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "backwards", 0, "Backwards", "Do backwards tracking"); @@ -1753,18 +1753,18 @@ static int solve_camera_modal(bContext *C, wmOperator *UNUSED(op), wmEvent *even void CLIP_OT_solve_camera(wmOperatorType *ot) { /* identifiers */ - ot->name= "Solve Camera"; - ot->description= "Solve camera motion from tracks"; - ot->idname= "CLIP_OT_solve_camera"; + ot->name = "Solve Camera"; + ot->description = "Solve camera motion from tracks"; + ot->idname = "CLIP_OT_solve_camera"; /* api callbacks */ - ot->exec= solve_camera_exec; - ot->invoke= solve_camera_invoke; - ot->modal= solve_camera_modal; - ot->poll= ED_space_clip_poll; + ot->exec = solve_camera_exec; + ot->invoke = solve_camera_invoke; + ot->modal = solve_camera_modal; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** clear solution operator *********************/ @@ -1803,16 +1803,16 @@ static int clear_solution_exec(bContext *C, wmOperator *UNUSED(op)) void CLIP_OT_clear_solution(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Solution"; - ot->description= "Clear all calculated data"; - ot->idname= "CLIP_OT_clear_solution"; + ot->name = "Clear Solution"; + ot->description = "Clear all calculated data"; + ot->idname = "CLIP_OT_clear_solution"; /* api callbacks */ - ot->exec= clear_solution_exec; - ot->poll= ED_space_clip_poll; + ot->exec = clear_solution_exec; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** clear track operator *********************/ @@ -1855,16 +1855,16 @@ void CLIP_OT_clear_track_path(wmOperatorType *ot) }; /* identifiers */ - ot->name= "Clear Track Path"; - ot->description= "Clear tracks after/before current position or clear the whole track"; - ot->idname= "CLIP_OT_clear_track_path"; + ot->name = "Clear Track Path"; + ot->description = "Clear tracks after/before current position or clear the whole track"; + ot->idname = "CLIP_OT_clear_track_path"; /* api callbacks */ - ot->exec= clear_track_path_exec; - ot->poll= ED_space_clip_poll; + ot->exec = clear_track_path_exec; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* proeprties */ RNA_def_enum(ot->srna, "action", clear_path_actions, TRACK_CLEAR_REMAINED, "Action", "Clear action to execute"); @@ -1911,16 +1911,16 @@ void CLIP_OT_disable_markers(wmOperatorType *ot) }; /* identifiers */ - ot->name= "Disable Markers"; - ot->description= "Disable/enable selected markers"; - ot->idname= "CLIP_OT_disable_markers"; + ot->name = "Disable Markers"; + ot->description = "Disable/enable selected markers"; + ot->idname = "CLIP_OT_disable_markers"; /* api callbacks */ - ot->exec= disable_markers_exec; - ot->poll= ED_space_clip_poll; + ot->exec = disable_markers_exec; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_enum(ot->srna, "action", actions_items, 0, "Action", "Disable action to execute"); @@ -2131,16 +2131,16 @@ static int set_origin_exec(bContext *C, wmOperator *op) void CLIP_OT_set_origin(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Origin"; - ot->description= "Set active marker as origin by moving camera (or it's parent if present) in 3D space"; - ot->idname= "CLIP_OT_set_origin"; + ot->name = "Set Origin"; + ot->description = "Set active marker as origin by moving camera (or it's parent if present) in 3D space"; + ot->idname = "CLIP_OT_set_origin"; /* api callbacks */ - ot->exec= set_origin_exec; - ot->poll= set_orientation_poll; + ot->exec = set_origin_exec; + ot->poll = set_orientation_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "use_median", 0, "Use Median", "Set origin to median point of selected bundles"); @@ -2377,16 +2377,16 @@ void CLIP_OT_set_plane(wmOperatorType *ot) }; /* identifiers */ - ot->name= "Set Plane"; - ot->description= "Set plane based on 3 selected bundles by moving camera (or it's parent if present) in 3D space"; - ot->idname= "CLIP_OT_set_plane"; + ot->name = "Set Plane"; + ot->description = "Set plane based on 3 selected bundles by moving camera (or it's parent if present) in 3D space"; + ot->idname = "CLIP_OT_set_plane"; /* api callbacks */ - ot->exec= set_plane_exec; - ot->poll= set_orientation_poll; + ot->exec = set_plane_exec; + ot->poll = set_orientation_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_enum(ot->srna, "plane", plane_items, 0, "Plane", "Plane to be sued for orientation"); @@ -2449,16 +2449,16 @@ void CLIP_OT_set_axis(wmOperatorType *ot) }; /* identifiers */ - ot->name= "Set Axis"; - ot->description= "Set direction of scene axis rotating camera (or it's parent if present) and assuming selected track lies on real axis joining it with the origin"; - ot->idname= "CLIP_OT_set_axis"; + ot->name = "Set Axis"; + ot->description = "Set direction of scene axis rotating camera (or it's parent if present) and assuming selected track lies on real axis joining it with the origin"; + ot->idname = "CLIP_OT_set_axis"; /* api callbacks */ - ot->exec= set_axis_exec; - ot->poll= set_orientation_poll; + ot->exec = set_axis_exec; + ot->poll = set_orientation_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_enum(ot->srna, "axis", axis_actions, 0, "Axis", "Axis to use to align bundle along"); @@ -2561,17 +2561,17 @@ static int set_scale_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void CLIP_OT_set_scale(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Scale"; - ot->description= "Set scale of scene by scaling camera (or it's parent if present)"; - ot->idname= "CLIP_OT_set_scale"; + ot->name = "Set Scale"; + ot->description = "Set scale of scene by scaling camera (or it's parent if present)"; + ot->idname = "CLIP_OT_set_scale"; /* api callbacks */ - ot->exec= set_scale_exec; - ot->invoke= set_scale_invoke; - ot->poll= set_orientation_poll; + ot->exec = set_scale_exec; + ot->invoke = set_scale_invoke; + ot->poll = set_orientation_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_float(ot->srna, "distance", 0.0f, -FLT_MAX, FLT_MAX, @@ -2613,17 +2613,17 @@ static int set_solution_scale_invoke(bContext *C, wmOperator *op, wmEvent *UNUSE void CLIP_OT_set_solution_scale(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Solution Scale"; - ot->description= "Set object solution scale using distance between two selected tracks"; - ot->idname= "CLIP_OT_set_solution_scale"; + ot->name = "Set Solution Scale"; + ot->description = "Set object solution scale using distance between two selected tracks"; + ot->idname = "CLIP_OT_set_solution_scale"; /* api callbacks */ - ot->exec= set_solution_scale_exec; - ot->invoke= set_solution_scale_invoke; - ot->poll= set_solution_scale_poll; + ot->exec = set_solution_scale_exec; + ot->invoke = set_solution_scale_invoke; + ot->poll = set_solution_scale_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_float(ot->srna, "distance", 0.0f, -FLT_MAX, FLT_MAX, @@ -2654,16 +2654,16 @@ static int set_center_principal_exec(bContext *C, wmOperator *UNUSED(op)) void CLIP_OT_set_center_principal(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Principal to Center"; - ot->description= "Set optical center to center of footage"; - ot->idname= "CLIP_OT_set_center_principal"; + ot->name = "Set Principal to Center"; + ot->description = "Set optical center to center of footage"; + ot->idname = "CLIP_OT_set_center_principal"; /* api callbacks */ - ot->exec= set_center_principal_exec; - ot->poll= ED_space_clip_poll; + ot->exec = set_center_principal_exec; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** hide tracks operator *********************/ @@ -2707,16 +2707,16 @@ static int hide_tracks_exec(bContext *C, wmOperator *op) void CLIP_OT_hide_tracks(wmOperatorType *ot) { /* identifiers */ - ot->name= "Hide Tracks"; - ot->description= "Hide selected tracks"; - ot->idname= "CLIP_OT_hide_tracks"; + ot->name = "Hide Tracks"; + ot->description = "Hide selected tracks"; + ot->idname = "CLIP_OT_hide_tracks"; /* api callbacks */ - ot->exec= hide_tracks_exec; - ot->poll= ED_space_clip_poll; + ot->exec = hide_tracks_exec; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected tracks"); @@ -2746,16 +2746,16 @@ static int hide_tracks_clear_exec(bContext *C, wmOperator *UNUSED(op)) void CLIP_OT_hide_tracks_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Hide Tracks Clear"; - ot->description= "Clear hide selected tracks"; - ot->idname= "CLIP_OT_hide_tracks_clear"; + ot->name = "Hide Tracks Clear"; + ot->description = "Clear hide selected tracks"; + ot->idname = "CLIP_OT_hide_tracks_clear"; /* api callbacks */ - ot->exec= hide_tracks_clear_exec; - ot->poll= ED_space_clip_poll; + ot->exec = hide_tracks_clear_exec; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** detect features operator *********************/ @@ -2828,16 +2828,16 @@ void CLIP_OT_detect_features(wmOperatorType *ot) }; /* identifiers */ - ot->name= "Detect Features"; - ot->description= "Automatically detect features and place markers to track"; - ot->idname= "CLIP_OT_detect_features"; + ot->name = "Detect Features"; + ot->description = "Automatically detect features and place markers to track"; + ot->idname = "CLIP_OT_detect_features"; /* api callbacks */ - ot->exec= detect_features_exec; - ot->poll= space_clip_frame_poll; + ot->exec = detect_features_exec; + ot->poll = space_clip_frame_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_enum(ot->srna, "placement", placement_items, 0, "Placement", "Placement for detected features"); @@ -2923,16 +2923,16 @@ void CLIP_OT_frame_jump(wmOperatorType *ot) }; /* identifiers */ - ot->name= "Jump to Frame"; - ot->description= "Jump to special frame"; - ot->idname= "CLIP_OT_frame_jump"; + ot->name = "Jump to Frame"; + ot->description = "Jump to special frame"; + ot->idname = "CLIP_OT_frame_jump"; /* api callbacks */ - ot->exec= frame_jump_exec; - ot->poll= space_clip_frame_poll; + ot->exec = frame_jump_exec; + ot->poll = space_clip_frame_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_enum(ot->srna, "position", position_items, 0, "Position", "Position to jump to"); @@ -2980,16 +2980,16 @@ static int join_tracks_exec(bContext *C, wmOperator *op) void CLIP_OT_join_tracks(wmOperatorType *ot) { /* identifiers */ - ot->name= "Join Tracks"; - ot->description= "Join selected tracks"; - ot->idname= "CLIP_OT_join_tracks"; + ot->name = "Join Tracks"; + ot->description = "Join selected tracks"; + ot->idname = "CLIP_OT_join_tracks"; /* api callbacks */ - ot->exec= join_tracks_exec; - ot->poll= space_clip_frame_poll; + ot->exec = join_tracks_exec; + ot->poll = space_clip_frame_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** lock tracks operator *********************/ @@ -3028,16 +3028,16 @@ void CLIP_OT_lock_tracks(wmOperatorType *ot) }; /* identifiers */ - ot->name= "Lock Tracks"; - ot->description= "Lock/unlock selected tracks"; - ot->idname= "CLIP_OT_lock_tracks"; + ot->name = "Lock Tracks"; + ot->description = "Lock/unlock selected tracks"; + ot->idname = "CLIP_OT_lock_tracks"; /* api callbacks */ - ot->exec= lock_tracks_exec; - ot->poll= ED_space_clip_poll; + ot->exec = lock_tracks_exec; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_enum(ot->srna, "action", actions_items, 0, "Action", "Lock action to execute"); @@ -3078,16 +3078,16 @@ static int track_copy_color_exec(bContext *C, wmOperator *UNUSED(op)) void CLIP_OT_track_copy_color(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Color"; - ot->description= "Copy color to all selected tracks"; - ot->idname= "CLIP_OT_track_copy_color"; + ot->name = "Copy Color"; + ot->description = "Copy color to all selected tracks"; + ot->idname = "CLIP_OT_track_copy_color"; /* api callbacks */ - ot->exec= track_copy_color_exec; - ot->poll= ED_space_clip_poll; + ot->exec = track_copy_color_exec; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** add 2d stabilization tracks operator *********************/ @@ -3127,16 +3127,16 @@ static int stabilize_2d_add_exec(bContext *C, wmOperator *UNUSED(op)) void CLIP_OT_stabilize_2d_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Stabilization Tracks"; - ot->description= "Add selected tracks to 2D stabilization tool"; - ot->idname= "CLIP_OT_stabilize_2d_add"; + ot->name = "Add Stabilization Tracks"; + ot->description = "Add selected tracks to 2D stabilization tool"; + ot->idname = "CLIP_OT_stabilize_2d_add"; /* api callbacks */ - ot->exec= stabilize_2d_add_exec; - ot->poll= ED_space_clip_poll; + ot->exec = stabilize_2d_add_exec; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** remove 2d stabilization tracks operator *********************/ @@ -3187,16 +3187,16 @@ static int stabilize_2d_remove_exec(bContext *C, wmOperator *UNUSED(op)) void CLIP_OT_stabilize_2d_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Stabilization Track"; - ot->description= "Remove selected track from stabilization"; - ot->idname= "CLIP_OT_stabilize_2d_remove"; + ot->name = "Remove Stabilization Track"; + ot->description = "Remove selected track from stabilization"; + ot->idname = "CLIP_OT_stabilize_2d_remove"; /* api callbacks */ - ot->exec= stabilize_2d_remove_exec; - ot->poll= ED_space_clip_poll; + ot->exec = stabilize_2d_remove_exec; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** select 2d stabilization tracks operator *********************/ @@ -3230,16 +3230,16 @@ static int stabilize_2d_select_exec(bContext *C, wmOperator *UNUSED(op)) void CLIP_OT_stabilize_2d_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Stabilization Tracks"; - ot->description= "Select track which are used for stabilization"; - ot->idname= "CLIP_OT_stabilize_2d_select"; + ot->name = "Select Stabilization Tracks"; + ot->description = "Select track which are used for stabilization"; + ot->idname = "CLIP_OT_stabilize_2d_select"; /* api callbacks */ - ot->exec= stabilize_2d_select_exec; - ot->poll= ED_space_clip_poll; + ot->exec = stabilize_2d_select_exec; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** set 2d stabilization rotation track operator *********************/ @@ -3267,16 +3267,16 @@ static int stabilize_2d_set_rotation_exec(bContext *C, wmOperator *UNUSED(op)) void CLIP_OT_stabilize_2d_set_rotation(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Rotation Track"; - ot->description= "Use active track to compensate rotation when doing 2D stabilization"; - ot->idname= "CLIP_OT_stabilize_2d_set_rotation"; + ot->name = "Set Rotation Track"; + ot->description = "Use active track to compensate rotation when doing 2D stabilization"; + ot->idname = "CLIP_OT_stabilize_2d_set_rotation"; /* api callbacks */ - ot->exec= stabilize_2d_set_rotation_exec; - ot->poll= ED_space_clip_poll; + ot->exec = stabilize_2d_set_rotation_exec; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** clean tracks operator *********************/ @@ -3457,17 +3457,17 @@ void CLIP_OT_clean_tracks(wmOperatorType *ot) }; /* identifiers */ - ot->name= "Clean Tracks"; - ot->description= "Clean tracks with high error values or few frames"; - ot->idname= "CLIP_OT_clean_tracks"; + ot->name = "Clean Tracks"; + ot->description = "Clean tracks with high error values or few frames"; + ot->idname = "CLIP_OT_clean_tracks"; /* api callbacks */ - ot->exec= clean_tracks_exec; - ot->invoke= clean_tracks_invoke; - ot->poll= ED_space_clip_poll; + ot->exec = clean_tracks_exec; + ot->invoke = clean_tracks_invoke; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_int(ot->srna, "frames", 0, 0, INT_MAX, "Tracked Frames", "Effect on tracks which are tracked less than specified amount of frames", 0, INT_MAX); @@ -3493,16 +3493,16 @@ static int tracking_object_new_exec(bContext *C, wmOperator *UNUSED(op)) void CLIP_OT_tracking_object_new(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Tracking Object"; - ot->description= "Add new object for tracking"; - ot->idname= "CLIP_OT_tracking_object_new"; + ot->name = "Add Tracking Object"; + ot->description = "Add new object for tracking"; + ot->idname = "CLIP_OT_tracking_object_new"; /* api callbacks */ - ot->exec= tracking_object_new_exec; - ot->poll= ED_space_clip_poll; + ot->exec = tracking_object_new_exec; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** remove tracking object *********************/ @@ -3531,16 +3531,16 @@ static int tracking_object_remove_exec(bContext *C, wmOperator *op) void CLIP_OT_tracking_object_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Movie Tracking Object"; - ot->description= "Remove object for tracking"; - ot->idname= "CLIP_OT_tracking_object_remove"; + ot->name = "Movie Tracking Object"; + ot->description = "Remove object for tracking"; + ot->idname = "CLIP_OT_tracking_object_remove"; /* api callbacks */ - ot->exec= tracking_object_remove_exec; - ot->poll= ED_space_clip_poll; + ot->exec = tracking_object_remove_exec; + ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************** copy tracks to clipboard operator *********************/ @@ -3571,7 +3571,7 @@ void CLIP_OT_copy_tracks(wmOperatorType *ot) ot->poll = ED_space_clip_poll; /* flags */ - ot->flag= OPTYPE_REGISTER; + ot->flag = OPTYPE_REGISTER; } /********************** paste tracks from clipboard operator *********************/ @@ -3611,5 +3611,5 @@ void CLIP_OT_paste_tracks(wmOperatorType *ot) ot->poll = paste_tracks_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } diff --git a/source/blender/editors/space_console/console_ops.c b/source/blender/editors/space_console/console_ops.c index 82002565033..ab473b2ec4d 100644 --- a/source/blender/editors/space_console/console_ops.c +++ b/source/blender/editors/space_console/console_ops.c @@ -341,13 +341,13 @@ static int console_move_exec(bContext *C, wmOperator *op) void CONSOLE_OT_move(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Cursor"; - ot->description= "Move cursor position"; - ot->idname= "CONSOLE_OT_move"; + ot->name = "Move Cursor"; + ot->description = "Move cursor position"; + ot->idname = "CONSOLE_OT_move"; /* api callbacks */ - ot->exec= console_move_exec; - ot->poll= ED_operator_console_active; + ot->exec = console_move_exec; + ot->poll = ED_operator_console_active; /* properties */ RNA_def_enum(ot->srna, "type", console_move_type_items, LINE_BEGIN, "Type", "Where to move cursor to"); @@ -414,14 +414,14 @@ void CONSOLE_OT_insert(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Insert"; - ot->description= "Insert text at cursor position"; - ot->idname= "CONSOLE_OT_insert"; + ot->name = "Insert"; + ot->description = "Insert text at cursor position"; + ot->idname = "CONSOLE_OT_insert"; /* api callbacks */ - ot->exec= console_insert_exec; - ot->invoke= console_insert_invoke; - ot->poll= ED_operator_console_active; + ot->exec = console_insert_exec; + ot->invoke = console_insert_invoke; + ot->poll = ED_operator_console_active; /* properties */ prop = RNA_def_string(ot->srna, "text", "", 0, "Text", "Text to insert at the cursor position"); @@ -486,13 +486,13 @@ static int console_delete_exec(bContext *C, wmOperator *op) void CONSOLE_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete"; - ot->description= "Delete text by cursor position"; - ot->idname= "CONSOLE_OT_delete"; + ot->name = "Delete"; + ot->description = "Delete text by cursor position"; + ot->idname = "CONSOLE_OT_delete"; /* api callbacks */ - ot->exec= console_delete_exec; - ot->poll= ED_operator_console_active; + ot->exec = console_delete_exec; + ot->poll = ED_operator_console_active; /* properties */ RNA_def_enum(ot->srna, "type", console_delete_type_items, DEL_NEXT_CHAR, "Type", "Which part of the text to delete"); @@ -529,13 +529,13 @@ static int console_clear_exec(bContext *C, wmOperator *op) void CONSOLE_OT_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear"; - ot->description= "Clear text by type"; - ot->idname= "CONSOLE_OT_clear"; + ot->name = "Clear"; + ot->description = "Clear text by type"; + ot->idname = "CONSOLE_OT_clear"; /* api callbacks */ - ot->exec= console_clear_exec; - ot->poll= ED_operator_console_active; + ot->exec = console_clear_exec; + ot->poll = ED_operator_console_active; /* properties */ RNA_def_boolean(ot->srna, "scrollback", 1, "Scrollback", "Clear the scrollback history"); @@ -597,13 +597,13 @@ static int console_history_cycle_exec(bContext *C, wmOperator *op) void CONSOLE_OT_history_cycle(wmOperatorType *ot) { /* identifiers */ - ot->name= "History Cycle"; - ot->description= "Cycle through history"; - ot->idname= "CONSOLE_OT_history_cycle"; + ot->name = "History Cycle"; + ot->description = "Cycle through history"; + ot->idname = "CONSOLE_OT_history_cycle"; /* api callbacks */ - ot->exec= console_history_cycle_exec; - ot->poll= ED_operator_console_active; + ot->exec = console_history_cycle_exec; + ot->poll = ED_operator_console_active; /* properties */ RNA_def_boolean(ot->srna, "reverse", 0, "Reverse", "Reverse cycle history"); @@ -652,13 +652,13 @@ static int console_history_append_exec(bContext *C, wmOperator *op) void CONSOLE_OT_history_append(wmOperatorType *ot) { /* identifiers */ - ot->name= "History Append"; - ot->description= "Append history at cursor position"; - ot->idname= "CONSOLE_OT_history_append"; + ot->name = "History Append"; + ot->description = "Append history at cursor position"; + ot->idname = "CONSOLE_OT_history_append"; /* api callbacks */ - ot->exec= console_history_append_exec; - ot->poll= ED_operator_console_active; + ot->exec = console_history_append_exec; + ot->poll = ED_operator_console_active; /* properties */ RNA_def_string(ot->srna, "text", "", 0, "Text", "Text to insert at the cursor position"); @@ -706,13 +706,13 @@ void CONSOLE_OT_scrollback_append(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Scrollback Append"; - ot->description= "Append scrollback text by type"; - ot->idname= "CONSOLE_OT_scrollback_append"; + ot->name = "Scrollback Append"; + ot->description = "Append scrollback text by type"; + ot->idname = "CONSOLE_OT_scrollback_append"; /* api callbacks */ - ot->exec= console_scrollback_append_exec; - ot->poll= ED_operator_console_active; + ot->exec = console_scrollback_append_exec; + ot->poll = ED_operator_console_active; /* properties */ RNA_def_string(ot->srna, "text", "", 0, "Text", "Text to insert at the cursor position"); @@ -789,13 +789,13 @@ static int console_copy_exec(bContext *C, wmOperator *UNUSED(op)) void CONSOLE_OT_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy to Clipboard"; - ot->description= "Copy selected text to clipboard"; - ot->idname= "CONSOLE_OT_copy"; + ot->name = "Copy to Clipboard"; + ot->description = "Copy selected text to clipboard"; + ot->idname = "CONSOLE_OT_copy"; /* api callbacks */ - ot->poll= ED_operator_console_active; - ot->exec= console_copy_exec; + ot->poll = ED_operator_console_active; + ot->exec = console_copy_exec; /* properties */ } @@ -842,13 +842,13 @@ static int console_paste_exec(bContext *C, wmOperator *UNUSED(op)) void CONSOLE_OT_paste(wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste from Clipboard"; - ot->description= "Paste text from clipboard"; - ot->idname= "CONSOLE_OT_paste"; + ot->name = "Paste from Clipboard"; + ot->description = "Paste text from clipboard"; + ot->idname = "CONSOLE_OT_paste"; /* api callbacks */ - ot->poll= ED_operator_console_active; - ot->exec= console_paste_exec; + ot->poll = ED_operator_console_active; + ot->exec = console_paste_exec; /* properties */ } @@ -967,13 +967,13 @@ static int console_modal_select_cancel(bContext *C, wmOperator *op) void CONSOLE_OT_select_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Selection"; - ot->idname= "CONSOLE_OT_select_set"; - ot->description= "Set the console selection"; + ot->name = "Set Selection"; + ot->idname = "CONSOLE_OT_select_set"; + ot->description = "Set the console selection"; /* api callbacks */ - ot->invoke= console_modal_select_invoke; - ot->modal= console_modal_select; - ot->cancel= console_modal_select_cancel; - ot->poll= ED_operator_console_active; + ot->invoke = console_modal_select_invoke; + ot->modal = console_modal_select; + ot->cancel = console_modal_select_cancel; + ot->poll = ED_operator_console_active; } diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 055d978b9c9..2233016a0ec 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -300,16 +300,16 @@ static int file_border_select_exec(bContext *C, wmOperator *op) void FILE_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Activate/Select File"; - ot->description= "Activate/select the file(s) contained in the border"; - ot->idname= "FILE_OT_select_border"; + ot->name = "Activate/Select File"; + ot->description = "Activate/select the file(s) contained in the border"; + ot->idname = "FILE_OT_select_border"; /* api callbacks */ - ot->invoke= WM_border_select_invoke; - ot->exec= file_border_select_exec; - ot->modal= file_border_select_modal; - ot->poll= ED_operator_file_active; - ot->cancel= WM_border_select_cancel; + ot->invoke = WM_border_select_invoke; + ot->exec = file_border_select_exec; + ot->modal = file_border_select_modal; + ot->poll = ED_operator_file_active; + ot->cancel = WM_border_select_cancel; /* rna */ WM_operator_properties_gesture_border(ot, 1); @@ -351,13 +351,13 @@ static int file_select_invoke(bContext *C, wmOperator *op, wmEvent *event) void FILE_OT_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Activate/Select File"; - ot->description= "Activate/select file"; - ot->idname= "FILE_OT_select"; + ot->name = "Activate/Select File"; + ot->description = "Activate/select file"; + ot->idname = "FILE_OT_select"; /* api callbacks */ - ot->invoke= file_select_invoke; - ot->poll= ED_operator_file_active; + ot->invoke = file_select_invoke; + ot->poll = ED_operator_file_active; /* rna */ RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everything first"); @@ -398,13 +398,13 @@ static int file_select_all_exec(bContext *C, wmOperator *UNUSED(op)) void FILE_OT_select_all_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "(De)select All Files"; - ot->description= "Select or deselect all files"; - ot->idname= "FILE_OT_select_all_toggle"; + ot->name = "(De)select All Files"; + ot->description = "Select or deselect all files"; + ot->idname = "FILE_OT_select_all_toggle"; /* api callbacks */ - ot->exec= file_select_all_exec; - ot->poll= ED_operator_file_active; + ot->exec = file_select_all_exec; + ot->poll = ED_operator_file_active; /* rna */ @@ -435,13 +435,13 @@ static int bookmark_select_exec(bContext *C, wmOperator *op) void FILE_OT_select_bookmark(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Directory"; - ot->description= "Select a bookmarked directory"; - ot->idname= "FILE_OT_select_bookmark"; + ot->name = "Select Directory"; + ot->description = "Select a bookmarked directory"; + ot->idname = "FILE_OT_select_bookmark"; /* api callbacks */ - ot->exec= bookmark_select_exec; - ot->poll= ED_operator_file_active; + ot->exec = bookmark_select_exec; + ot->poll = ED_operator_file_active; RNA_def_string(ot->srna, "dir", "", 256, "Dir", ""); } @@ -468,13 +468,13 @@ static int bookmark_add_exec(bContext *C, wmOperator *UNUSED(op)) 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_bookmark_add"; + ot->name = "Add Bookmark"; + ot->description = "Add a bookmark for the selected/active directory"; + ot->idname = "FILE_OT_bookmark_add"; /* api callbacks */ - ot->exec= bookmark_add_exec; - ot->poll= ED_operator_file_active; + ot->exec = bookmark_add_exec; + ot->poll = ED_operator_file_active; } static int bookmark_delete_exec(bContext *C, wmOperator *op) @@ -501,13 +501,13 @@ static int bookmark_delete_exec(bContext *C, wmOperator *op) void FILE_OT_delete_bookmark(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Bookmark"; - ot->description= "Delete selected bookmark"; - ot->idname= "FILE_OT_delete_bookmark"; + ot->name = "Delete Bookmark"; + ot->description = "Delete selected bookmark"; + ot->idname = "FILE_OT_delete_bookmark"; /* api callbacks */ - ot->exec= bookmark_delete_exec; - ot->poll= ED_operator_file_active; + ot->exec = bookmark_delete_exec; + ot->poll = ED_operator_file_active; RNA_def_int(ot->srna, "index", -1, -1, 20000, "Index", "", -1, 20000); } @@ -563,13 +563,13 @@ static int file_highlight_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *e void FILE_OT_highlight(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Highlight File"; - ot->description= "Highlight selected file(s)"; - ot->idname= "FILE_OT_highlight"; + ot->name = "Highlight File"; + ot->description = "Highlight selected file(s)"; + ot->idname = "FILE_OT_highlight"; /* api callbacks */ - ot->invoke= file_highlight_invoke; - ot->poll= ED_operator_file_active; + ot->invoke = file_highlight_invoke; + ot->poll = ED_operator_file_active; } int file_cancel_exec(bContext *C, wmOperator *UNUSED(unused)) @@ -597,13 +597,13 @@ static int file_operator_poll(bContext *C) void FILE_OT_cancel(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Cancel File Load"; - ot->description= "Cancel loading of selected file"; - ot->idname= "FILE_OT_cancel"; + ot->name = "Cancel File Load"; + ot->description = "Cancel loading of selected file"; + ot->idname = "FILE_OT_cancel"; /* api callbacks */ - ot->exec= file_cancel_exec; - ot->poll= file_operator_poll; + ot->exec = file_cancel_exec; + ot->poll = file_operator_poll; } @@ -767,13 +767,13 @@ int file_exec(bContext *C, wmOperator *exec_op) void FILE_OT_execute(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Execute File Window"; - ot->description= "Execute selected file"; - ot->idname= "FILE_OT_execute"; + ot->name = "Execute File Window"; + ot->description = "Execute selected file"; + ot->idname = "FILE_OT_execute"; /* api callbacks */ - ot->exec= file_exec; - ot->poll= file_operator_poll; + ot->exec = file_exec; + ot->poll = file_operator_poll; RNA_def_boolean(ot->srna, "need_active", 0, "Need Active", "Only execute if there's an active selected file in the file list"); } @@ -800,13 +800,13 @@ int file_parent_exec(bContext *C, wmOperator *UNUSED(unused)) void FILE_OT_parent(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Parent File"; - ot->description= "Move to parent directory"; - ot->idname= "FILE_OT_parent"; + ot->name = "Parent File"; + ot->description = "Move to parent directory"; + ot->idname = "FILE_OT_parent"; /* api callbacks */ - ot->exec= file_parent_exec; - ot->poll= ED_operator_file_active; /* <- important, handler is on window level */ + ot->exec = file_parent_exec; + ot->poll = ED_operator_file_active; /* <- important, handler is on window level */ } @@ -825,13 +825,13 @@ static int file_refresh_exec(bContext *C, wmOperator *UNUSED(unused)) void FILE_OT_previous(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Previous Folder"; - ot->description= "Move to previous folder"; - ot->idname= "FILE_OT_previous"; + ot->name = "Previous Folder"; + ot->description = "Move to previous folder"; + ot->idname = "FILE_OT_previous"; /* api callbacks */ - ot->exec= file_previous_exec; - ot->poll= ED_operator_file_active; /* <- important, handler is on window level */ + ot->exec = file_previous_exec; + ot->poll = ED_operator_file_active; /* <- important, handler is on window level */ } int file_previous_exec(bContext *C, wmOperator *UNUSED(unused)) @@ -856,13 +856,13 @@ int file_previous_exec(bContext *C, wmOperator *UNUSED(unused)) void FILE_OT_next(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Next Folder"; - ot->description= "Move to next folder"; - ot->idname= "FILE_OT_next"; + ot->name = "Next Folder"; + ot->description = "Move to next folder"; + ot->idname = "FILE_OT_next"; /* api callbacks */ - ot->exec= file_next_exec; - ot->poll= ED_operator_file_active; /* <- important, handler is on window level */ + ot->exec = file_next_exec; + ot->poll = ED_operator_file_active; /* <- important, handler is on window level */ } int file_next_exec(bContext *C, wmOperator *UNUSED(unused)) @@ -983,14 +983,14 @@ void FILE_OT_smoothscroll(wmOperatorType *ot) { /* identifiers */ - ot->name= "Smooth Scroll"; - ot->idname= "FILE_OT_smoothscroll"; - ot->description="Smooth scroll to make editable file visible"; + ot->name = "Smooth Scroll"; + ot->idname = "FILE_OT_smoothscroll"; + ot->description = "Smooth scroll to make editable file visible"; /* api callbacks */ - ot->invoke= file_smoothscroll_invoke; + ot->invoke = file_smoothscroll_invoke; - ot->poll= ED_operator_file_active; + ot->poll = ED_operator_file_active; } @@ -1070,14 +1070,14 @@ int file_directory_new_exec(bContext *C, wmOperator *op) void FILE_OT_directory_new(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Create New Directory"; - ot->description= "Create a new directory"; - ot->idname= "FILE_OT_directory_new"; + ot->name = "Create New Directory"; + ot->description = "Create a new directory"; + ot->idname = "FILE_OT_directory_new"; /* api callbacks */ - ot->invoke= WM_operator_confirm; - ot->exec= file_directory_new_exec; - ot->poll= ED_operator_file_active; /* <- important, handler is on window level */ + ot->invoke = WM_operator_confirm; + ot->exec = file_directory_new_exec; + ot->poll = ED_operator_file_active; /* <- important, handler is on window level */ RNA_def_string_dir_path(ot->srna, "directory", "", FILE_MAX, "Directory", "Name of new directory"); @@ -1192,26 +1192,26 @@ static int file_directory_poll(bContext *C) void FILE_OT_directory(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Enter Directory Name"; - ot->description= "Enter a directory name"; - ot->idname= "FILE_OT_directory"; + ot->name = "Enter Directory Name"; + ot->description = "Enter a directory name"; + ot->idname = "FILE_OT_directory"; /* api callbacks */ - ot->invoke= file_directory_invoke; - ot->exec= file_directory_exec; - ot->poll= file_directory_poll; /* <- important, handler is on window level */ + ot->invoke = file_directory_invoke; + ot->exec = file_directory_exec; + ot->poll = file_directory_poll; /* <- important, handler is on window level */ } void FILE_OT_refresh(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Refresh Filelist"; - ot->description= "Refresh the file list"; - ot->idname= "FILE_OT_refresh"; + ot->name = "Refresh Filelist"; + ot->description = "Refresh the file list"; + ot->idname = "FILE_OT_refresh"; /* api callbacks */ - ot->exec= file_refresh_exec; - ot->poll= ED_operator_file_active; /* <- important, handler is on window level */ + ot->exec = file_refresh_exec; + ot->poll = ED_operator_file_active; /* <- important, handler is on window level */ } static int file_hidedot_exec(bContext *C, wmOperator *UNUSED(unused)) @@ -1231,13 +1231,13 @@ static int file_hidedot_exec(bContext *C, wmOperator *UNUSED(unused)) void FILE_OT_hidedot(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Hide Dot Files"; - ot->description= "Toggle hide hidden dot files"; - ot->idname= "FILE_OT_hidedot"; + ot->name = "Toggle Hide Dot Files"; + ot->description = "Toggle hide hidden dot files"; + ot->idname = "FILE_OT_hidedot"; /* api callbacks */ - ot->exec= file_hidedot_exec; - ot->poll= ED_operator_file_active; /* <- important, handler is on window level */ + ot->exec = file_hidedot_exec; + ot->poll = ED_operator_file_active; /* <- important, handler is on window level */ } struct ARegion *file_buttons_region(struct ScrArea *sa) @@ -1281,13 +1281,13 @@ static int file_bookmark_toggle_exec(bContext *C, wmOperator *UNUSED(unused)) void FILE_OT_bookmark_toggle(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Bookmarks"; - ot->description= "Toggle bookmarks display"; - ot->idname= "FILE_OT_bookmark_toggle"; + ot->name = "Toggle Bookmarks"; + ot->description = "Toggle bookmarks display"; + ot->idname = "FILE_OT_bookmark_toggle"; /* api callbacks */ - ot->exec= file_bookmark_toggle_exec; - ot->poll= ED_operator_file_active; /* <- important, handler is on window level */ + ot->exec = file_bookmark_toggle_exec; + ot->poll = ED_operator_file_active; /* <- important, handler is on window level */ } @@ -1311,13 +1311,13 @@ static int file_filenum_exec(bContext *C, wmOperator *op) void FILE_OT_filenum(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Increment Number in Filename"; - ot->description= "Increment number in filename"; - ot->idname= "FILE_OT_filenum"; + ot->name = "Increment Number in Filename"; + ot->description = "Increment number in filename"; + ot->idname = "FILE_OT_filenum"; /* api callbacks */ - ot->exec= file_filenum_exec; - ot->poll= ED_operator_file_active; /* <- important, handler is on window level */ + ot->exec = file_filenum_exec; + ot->poll = ED_operator_file_active; /* <- important, handler is on window level */ /* props */ RNA_def_int(ot->srna, "increment", 1, -100, 100, "Increment", "", -100,100); @@ -1365,13 +1365,13 @@ static int file_rename_poll(bContext *C) void FILE_OT_rename(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Rename File or Directory"; - ot->description= "Rename file or file directory"; - ot->idname= "FILE_OT_rename"; + ot->name = "Rename File or Directory"; + ot->description = "Rename file or file directory"; + ot->idname = "FILE_OT_rename"; /* api callbacks */ - ot->exec= file_rename_exec; - ot->poll= file_rename_poll; + ot->exec = file_rename_exec; + ot->poll = file_rename_poll; } @@ -1417,14 +1417,14 @@ int file_delete_exec(bContext *C, wmOperator *UNUSED(op)) void FILE_OT_delete(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete File"; - ot->description= "Delete selected file"; - ot->idname= "FILE_OT_delete"; + ot->name = "Delete File"; + ot->description = "Delete selected file"; + ot->idname = "FILE_OT_delete"; /* api callbacks */ - ot->invoke= WM_operator_confirm; - ot->exec= file_delete_exec; - ot->poll= file_delete_poll; /* <- important, handler is on window level */ + ot->invoke = WM_operator_confirm; + ot->exec = file_delete_exec; + ot->poll = file_delete_poll; /* <- important, handler is on window level */ } diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index 642d43f2e71..c28711d1c22 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -839,13 +839,13 @@ static int graph_properties(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_properties(wmOperatorType *ot) { - ot->name= "Properties"; - ot->idname= "GRAPH_OT_properties"; - ot->description= "Toggle display properties panel"; + ot->name = "Properties"; + ot->idname = "GRAPH_OT_properties"; + ot->description = "Toggle display properties panel"; - ot->exec= graph_properties; - ot->poll= ED_operator_graphedit_active; + ot->exec = graph_properties; + ot->poll = ED_operator_graphedit_active; /* flags */ - ot->flag= 0; + ot->flag = 0; } diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index 9a965c3a109..8b8cdc32ebb 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -184,16 +184,16 @@ static int graphkeys_previewrange_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_previewrange_set (wmOperatorType *ot) { /* identifiers */ - ot->name= "Auto-Set Preview Range"; - ot->idname= "GRAPH_OT_previewrange_set"; - ot->description= "Automatically set Preview Range based on range of keyframes"; + ot->name = "Auto-Set Preview Range"; + ot->idname = "GRAPH_OT_previewrange_set"; + ot->description = "Automatically set Preview Range based on range of keyframes"; /* api callbacks */ - ot->exec= graphkeys_previewrange_exec; - ot->poll= ED_operator_graphedit_active; // XXX: unchecked poll to get fsamples working too, but makes modifier damage trickier... + ot->exec = graphkeys_previewrange_exec; + ot->poll = ED_operator_graphedit_active; // XXX: unchecked poll to get fsamples working too, but makes modifier damage trickier... /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ****************** View-All Operator ****************** */ @@ -246,31 +246,31 @@ static int graphkeys_view_selected_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_view_all (wmOperatorType *ot) { /* identifiers */ - ot->name= "View All"; - ot->idname= "GRAPH_OT_view_all"; - ot->description= "Reset viewable area to show full keyframe range"; + ot->name = "View All"; + ot->idname = "GRAPH_OT_view_all"; + ot->description = "Reset viewable area to show full keyframe range"; /* api callbacks */ - ot->exec= graphkeys_viewall_exec; - ot->poll= ED_operator_graphedit_active; // XXX: unchecked poll to get fsamples working too, but makes modifier damage trickier... + ot->exec = graphkeys_viewall_exec; + ot->poll = ED_operator_graphedit_active; // XXX: unchecked poll to get fsamples working too, but makes modifier damage trickier... /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } void GRAPH_OT_view_selected (wmOperatorType *ot) { /* identifiers */ - ot->name= "View Selected"; - ot->idname= "GRAPH_OT_view_selected"; - ot->description= "Reset viewable area to show selected keyframe range"; + ot->name = "View Selected"; + ot->idname = "GRAPH_OT_view_selected"; + ot->description = "Reset viewable area to show selected keyframe range"; /* api callbacks */ - ot->exec= graphkeys_view_selected_exec; - ot->poll= ED_operator_graphedit_active; // XXX: unchecked poll to get fsamples working too, but makes modifier damage trickier... + ot->exec = graphkeys_view_selected_exec; + ot->poll = ED_operator_graphedit_active; // XXX: unchecked poll to get fsamples working too, but makes modifier damage trickier... /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************** Create Ghost-Curves Operator *********************** */ @@ -376,16 +376,16 @@ static int graphkeys_create_ghostcurves_exec(bContext *C, wmOperator *UNUSED(op) void GRAPH_OT_ghost_curves_create (wmOperatorType *ot) { /* identifiers */ - ot->name= "Create Ghost Curves"; - ot->idname= "GRAPH_OT_ghost_curves_create"; - ot->description= "Create snapshot (Ghosts) of selected F-Curves as background aid for active Graph Editor"; + ot->name = "Create Ghost Curves"; + ot->idname = "GRAPH_OT_ghost_curves_create"; + ot->description = "Create snapshot (Ghosts) of selected F-Curves as background aid for active Graph Editor"; /* api callbacks */ - ot->exec= graphkeys_create_ghostcurves_exec; - ot->poll= graphop_visible_keyframes_poll; + ot->exec = graphkeys_create_ghostcurves_exec; + ot->poll = graphop_visible_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; // todo: add props for start/end frames } @@ -419,16 +419,16 @@ static int graphkeys_clear_ghostcurves_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_ghost_curves_clear (wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Ghost Curves"; - ot->idname= "GRAPH_OT_ghost_curves_clear"; - ot->description= "Clear F-Curve snapshots (Ghosts) for active Graph Editor"; + ot->name = "Clear Ghost Curves"; + ot->idname = "GRAPH_OT_ghost_curves_clear"; + ot->description = "Clear F-Curve snapshots (Ghosts) for active Graph Editor"; /* api callbacks */ - ot->exec= graphkeys_clear_ghostcurves_exec; - ot->poll= ED_operator_graphedit_active; + ot->exec = graphkeys_clear_ghostcurves_exec; + ot->poll = ED_operator_graphedit_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ************************************************************************** */ @@ -514,20 +514,20 @@ static int graphkeys_insertkey_exec(bContext *C, wmOperator *op) void GRAPH_OT_keyframe_insert (wmOperatorType *ot) { /* identifiers */ - ot->name= "Insert Keyframes"; - ot->idname= "GRAPH_OT_keyframe_insert"; - ot->description= "Insert keyframes for the specified channels"; + ot->name = "Insert Keyframes"; + ot->idname = "GRAPH_OT_keyframe_insert"; + ot->description = "Insert keyframes for the specified channels"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= graphkeys_insertkey_exec; - ot->poll= graphop_editable_keyframes_poll; + ot->invoke = WM_menu_invoke; + ot->exec = graphkeys_insertkey_exec; + ot->poll = graphop_editable_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_graphkeys_insertkey_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_graphkeys_insertkey_types, 0, "Type", ""); } /* ******************** Click-Insert Keyframes Operator ************************* */ @@ -621,17 +621,17 @@ static int graphkeys_click_insert_invoke (bContext *C, wmOperator *op, wmEvent * void GRAPH_OT_click_insert (wmOperatorType *ot) { /* identifiers */ - ot->name= "Click-Insert Keyframes"; - ot->idname= "GRAPH_OT_click_insert"; - ot->description= "Insert new keyframe at the cursor position for the active F-Curve"; + ot->name = "Click-Insert Keyframes"; + ot->idname = "GRAPH_OT_click_insert"; + ot->description = "Insert new keyframe at the cursor position for the active F-Curve"; /* api callbacks */ - ot->invoke= graphkeys_click_insert_invoke; - ot->exec= graphkeys_click_insert_exec; - ot->poll= graphop_active_fcurve_poll; + ot->invoke = graphkeys_click_insert_invoke; + ot->exec = graphkeys_click_insert_exec; + ot->poll = graphop_active_fcurve_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_float(ot->srna, "frame", 1.0f, -FLT_MAX, FLT_MAX, "Frame Number", "Frame to insert keyframe on", 0, 100); @@ -704,16 +704,16 @@ static int graphkeys_copy_exec(bContext *C, wmOperator *op) void GRAPH_OT_copy (wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Keyframes"; - ot->idname= "GRAPH_OT_copy"; - ot->description= "Copy selected keyframes to the copy/paste buffer"; + ot->name = "Copy Keyframes"; + ot->idname = "GRAPH_OT_copy"; + ot->description = "Copy selected keyframes to the copy/paste buffer"; /* api callbacks */ - ot->exec= graphkeys_copy_exec; - ot->poll= graphop_editable_keyframes_poll; + ot->exec = graphkeys_copy_exec; + ot->poll = graphop_editable_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -749,17 +749,17 @@ static int graphkeys_paste_exec(bContext *C, wmOperator *op) void GRAPH_OT_paste (wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste Keyframes"; - ot->idname= "GRAPH_OT_paste"; - ot->description= "Paste keyframes from copy/paste buffer for the selected channels, starting on the current frame"; + ot->name = "Paste Keyframes"; + ot->idname = "GRAPH_OT_paste"; + ot->description = "Paste keyframes from copy/paste buffer for the selected channels, starting on the current frame"; /* api callbacks */ -// ot->invoke= WM_operator_props_popup; // better wait for graph redo panel - ot->exec= graphkeys_paste_exec; - ot->poll= graphop_editable_keyframes_poll; +// ot->invoke = WM_operator_props_popup; // better wait for graph redo panel + ot->exec = graphkeys_paste_exec; + ot->poll = graphop_editable_keyframes_poll; /* 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 merging pasted keys and existing"); @@ -818,17 +818,17 @@ static int graphkeys_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *UNUS void GRAPH_OT_duplicate (wmOperatorType *ot) { /* identifiers */ - ot->name= "Duplicate Keyframes"; - ot->idname= "GRAPH_OT_duplicate"; - ot->description= "Make a copy of all selected keyframes"; + ot->name = "Duplicate Keyframes"; + ot->idname = "GRAPH_OT_duplicate"; + ot->description = "Make a copy of all selected keyframes"; /* api callbacks */ - ot->invoke= graphkeys_duplicate_invoke; - ot->exec= graphkeys_duplicate_exec; - ot->poll= graphop_editable_keyframes_poll; + ot->invoke = graphkeys_duplicate_invoke; + ot->exec = graphkeys_duplicate_exec; + ot->poll = graphop_editable_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* to give to transform */ RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); @@ -888,17 +888,17 @@ static int graphkeys_delete_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_delete (wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Keyframes"; - ot->idname= "GRAPH_OT_delete"; - ot->description= "Remove all selected keyframes"; + ot->name = "Delete Keyframes"; + ot->idname = "GRAPH_OT_delete"; + ot->description = "Remove all selected keyframes"; /* api callbacks */ - ot->invoke= WM_operator_confirm; - ot->exec= graphkeys_delete_exec; - ot->poll= graphop_editable_keyframes_poll; + ot->invoke = WM_operator_confirm; + ot->exec = graphkeys_delete_exec; + ot->poll = graphop_editable_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************** Clean Keyframes Operator ************************* */ @@ -950,20 +950,20 @@ static int graphkeys_clean_exec(bContext *C, wmOperator *op) void GRAPH_OT_clean (wmOperatorType *ot) { /* identifiers */ - ot->name= "Clean Keyframes"; - ot->idname= "GRAPH_OT_clean"; - ot->description= "Simplify F-Curves by removing closely spaced keyframes"; + ot->name = "Clean Keyframes"; + ot->idname = "GRAPH_OT_clean"; + ot->description = "Simplify F-Curves by removing closely spaced keyframes"; /* api callbacks */ - //ot->invoke= // XXX we need that number popup for this! - ot->exec= graphkeys_clean_exec; - ot->poll= graphop_editable_keyframes_poll; + //ot->invoke = // XXX we need that number popup for this! + ot->exec = graphkeys_clean_exec; + ot->poll = graphop_editable_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_float(ot->srna, "threshold", 0.001f, 0.0f, FLT_MAX, "Threshold", "", 0.0f, 1000.0f); + ot->prop = RNA_def_float(ot->srna, "threshold", 0.001f, 0.0f, FLT_MAX, "Threshold", "", 0.0f, 1000.0f); } /* ******************** Bake F-Curve Operator *********************** */ @@ -1033,17 +1033,17 @@ static int graphkeys_bake_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_bake (wmOperatorType *ot) { /* identifiers */ - ot->name= "Bake Curve"; - ot->idname= "GRAPH_OT_bake"; - ot->description= "Bake selected F-Curves to a set of sampled points defining a similar curve"; + ot->name = "Bake Curve"; + ot->idname = "GRAPH_OT_bake"; + ot->description = "Bake selected F-Curves to a set of sampled points defining a similar curve"; /* api callbacks */ - ot->invoke= WM_operator_confirm; // FIXME... - ot->exec= graphkeys_bake_exec; - ot->poll= graphop_selected_fcurve_poll; + ot->invoke = WM_operator_confirm; // FIXME... + ot->exec = graphkeys_bake_exec; + ot->poll = graphop_selected_fcurve_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; // todo: add props for start/end frames } @@ -1177,17 +1177,17 @@ static int graphkeys_sound_bake_invoke (bContext *C, wmOperator *op, wmEvent *ev void GRAPH_OT_sound_bake (wmOperatorType *ot) { /* identifiers */ - ot->name= "Bake Sound to F-Curves"; - ot->idname= "GRAPH_OT_sound_bake"; - ot->description= "Bakes a sound wave to selected F-Curves"; + ot->name = "Bake Sound to F-Curves"; + ot->idname = "GRAPH_OT_sound_bake"; + ot->description = "Bakes a sound wave to selected F-Curves"; /* api callbacks */ - ot->invoke= graphkeys_sound_bake_invoke; - ot->exec= graphkeys_sound_bake_exec; - ot->poll= graphop_selected_fcurve_poll; + ot->invoke = graphkeys_sound_bake_invoke; + ot->exec = graphkeys_sound_bake_exec; + ot->poll = graphop_selected_fcurve_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE|MOVIEFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY); @@ -1251,16 +1251,16 @@ static int graphkeys_sample_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_sample (wmOperatorType *ot) { /* identifiers */ - ot->name= "Sample Keyframes"; - ot->idname= "GRAPH_OT_sample"; - ot->description= "Add keyframes on every frame between the selected keyframes"; + ot->name = "Sample Keyframes"; + ot->idname = "GRAPH_OT_sample"; + ot->description = "Add keyframes on every frame between the selected keyframes"; /* api callbacks */ - ot->exec= graphkeys_sample_exec; - ot->poll= graphop_editable_keyframes_poll; + ot->exec = graphkeys_sample_exec; + ot->poll = graphop_editable_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -1360,20 +1360,20 @@ static int graphkeys_expo_exec(bContext *C, wmOperator *op) void GRAPH_OT_extrapolation_type (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Keyframe Extrapolation"; - ot->idname= "GRAPH_OT_extrapolation_type"; - ot->description= "Set extrapolation mode for selected F-Curves"; + ot->name = "Set Keyframe Extrapolation"; + ot->idname = "GRAPH_OT_extrapolation_type"; + ot->description = "Set extrapolation mode for selected F-Curves"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= graphkeys_expo_exec; - ot->poll= graphop_editable_keyframes_poll; + ot->invoke = WM_menu_invoke; + ot->exec = graphkeys_expo_exec; + ot->poll = graphop_editable_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_graphkeys_expo_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_graphkeys_expo_types, 0, "Type", ""); } /* ******************** Set Interpolation-Type Operator *********************** */ @@ -1429,20 +1429,20 @@ static int graphkeys_ipo_exec(bContext *C, wmOperator *op) void GRAPH_OT_interpolation_type (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Keyframe Interpolation"; - ot->idname= "GRAPH_OT_interpolation_type"; - ot->description= "Set interpolation mode for the F-Curve segments starting from the selected keyframes"; + ot->name = "Set Keyframe Interpolation"; + ot->idname = "GRAPH_OT_interpolation_type"; + ot->description = "Set interpolation mode for the F-Curve segments starting from the selected keyframes"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= graphkeys_ipo_exec; - ot->poll= graphop_editable_keyframes_poll; + ot->invoke = WM_menu_invoke; + ot->exec = graphkeys_ipo_exec; + ot->poll = graphop_editable_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", beztriple_interpolation_mode_items, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", beztriple_interpolation_mode_items, 0, "Type", ""); } /* ******************** Set Handle-Type Operator *********************** */ @@ -1506,20 +1506,20 @@ static int graphkeys_handletype_exec(bContext *C, wmOperator *op) void GRAPH_OT_handle_type (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Keyframe Handle Type"; - ot->idname= "GRAPH_OT_handle_type"; - ot->description= "Set type of handle for selected keyframes"; + ot->name = "Set Keyframe Handle Type"; + ot->idname = "GRAPH_OT_handle_type"; + ot->description = "Set type of handle for selected keyframes"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= graphkeys_handletype_exec; - ot->poll= graphop_editable_keyframes_poll; + ot->invoke = WM_menu_invoke; + ot->exec = graphkeys_handletype_exec; + ot->poll = graphop_editable_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", keyframe_handle_type_items, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", keyframe_handle_type_items, 0, "Type", ""); } /* ************************************************************************** */ @@ -1700,16 +1700,16 @@ static int graphkeys_euler_filter_exec (bContext *C, wmOperator *op) void GRAPH_OT_euler_filter (wmOperatorType *ot) { /* identifiers */ - ot->name= "Euler Discontinuity Filter"; - ot->idname= "GRAPH_OT_euler_filter"; - ot->description= "Fixes the most common causes of gimbal lock in the selected Euler Rotation F-Curves"; + ot->name = "Euler Discontinuity Filter"; + ot->idname = "GRAPH_OT_euler_filter"; + ot->description = "Fixes the most common causes of gimbal lock in the selected Euler Rotation F-Curves"; /* api callbacks */ - ot->exec= graphkeys_euler_filter_exec; - ot->poll= graphop_editable_keyframes_poll; + ot->exec = graphkeys_euler_filter_exec; + ot->poll = graphop_editable_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ***************** Jump to Selected Frames Operator *********************** */ @@ -1774,16 +1774,16 @@ static int graphkeys_framejump_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_frame_jump (wmOperatorType *ot) { /* identifiers */ - ot->name= "Jump to Frame"; - ot->idname= "GRAPH_OT_frame_jump"; - ot->description= "Set the current frame to the average frame of the selected keyframes"; + ot->name = "Jump to Frame"; + ot->idname = "GRAPH_OT_frame_jump"; + ot->description = "Set the current frame to the average frame of the selected keyframes"; /* api callbacks */ - ot->exec= graphkeys_framejump_exec; - ot->poll= graphop_visible_keyframes_poll; + ot->exec = graphkeys_framejump_exec; + ot->poll = graphop_visible_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************** Snap Keyframes Operator *********************** */ @@ -1878,20 +1878,20 @@ static int graphkeys_snap_exec(bContext *C, wmOperator *op) void GRAPH_OT_snap (wmOperatorType *ot) { /* identifiers */ - ot->name= "Snap Keys"; - ot->idname= "GRAPH_OT_snap"; - ot->description= "Snap selected keyframes to the chosen times/values"; + ot->name = "Snap Keys"; + ot->idname = "GRAPH_OT_snap"; + ot->description = "Snap selected keyframes to the chosen times/values"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= graphkeys_snap_exec; - ot->poll= graphop_editable_keyframes_poll; + ot->invoke = WM_menu_invoke; + ot->exec = graphkeys_snap_exec; + ot->poll = graphop_editable_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_graphkeys_snap_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_graphkeys_snap_types, 0, "Type", ""); } /* ******************** Mirror Keyframes Operator *********************** */ @@ -1996,20 +1996,20 @@ static int graphkeys_mirror_exec(bContext *C, wmOperator *op) void GRAPH_OT_mirror (wmOperatorType *ot) { /* identifiers */ - ot->name= "Mirror Keys"; - ot->idname= "GRAPH_OT_mirror"; - ot->description= "Flip selected keyframes over the selected mirror line"; + ot->name = "Mirror Keys"; + ot->idname = "GRAPH_OT_mirror"; + ot->description = "Flip selected keyframes over the selected mirror line"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= graphkeys_mirror_exec; - ot->poll= graphop_editable_keyframes_poll; + ot->invoke = WM_menu_invoke; + ot->exec = graphkeys_mirror_exec; + ot->poll = graphop_editable_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_graphkeys_mirror_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_graphkeys_mirror_types, 0, "Type", ""); } /* ******************** Smooth Keyframes Operator *********************** */ @@ -2051,16 +2051,16 @@ static int graphkeys_smooth_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_smooth (wmOperatorType *ot) { /* identifiers */ - ot->name= "Smooth Keys"; - ot->idname= "GRAPH_OT_smooth"; - ot->description= "Apply weighted moving means to make selected F-Curves less bumpy"; + ot->name = "Smooth Keys"; + ot->idname = "GRAPH_OT_smooth"; + ot->description = "Apply weighted moving means to make selected F-Curves less bumpy"; /* api callbacks */ - ot->exec= graphkeys_smooth_exec; - ot->poll= graphop_editable_keyframes_poll; + ot->exec = graphkeys_smooth_exec; + ot->poll = graphop_editable_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ************************************************************************** */ @@ -2155,20 +2155,20 @@ static int graph_fmodifier_add_exec(bContext *C, wmOperator *op) void GRAPH_OT_fmodifier_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add F-Curve Modifier"; - ot->idname= "GRAPH_OT_fmodifier_add"; - ot->description= "Add F-Modifiers to the selected F-Curves"; + ot->name = "Add F-Curve Modifier"; + ot->idname = "GRAPH_OT_fmodifier_add"; + ot->description = "Add F-Modifiers to the selected F-Curves"; /* api callbacks */ - ot->invoke= graph_fmodifier_add_invoke; - ot->exec= graph_fmodifier_add_exec; - ot->poll= graphop_selected_fcurve_poll; + ot->invoke = graph_fmodifier_add_invoke; + ot->exec = graph_fmodifier_add_exec; + ot->poll = graphop_selected_fcurve_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", fmodifier_type_items, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", fmodifier_type_items, 0, "Type", ""); RNA_def_boolean(ot->srna, "only_active", 1, "Only Active", "Only add F-Modifier to active F-Curve"); } @@ -2213,16 +2213,16 @@ static int graph_fmodifier_copy_exec(bContext *C, wmOperator *op) void GRAPH_OT_fmodifier_copy (wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy F-Modifiers"; - ot->idname= "GRAPH_OT_fmodifier_copy"; - ot->description= "Copy the F-Modifier(s) of the active F-Curve"; + ot->name = "Copy F-Modifiers"; + ot->idname = "GRAPH_OT_fmodifier_copy"; + ot->description = "Copy the F-Modifier(s) of the active F-Curve"; /* api callbacks */ - ot->exec= graph_fmodifier_copy_exec; - ot->poll= graphop_active_fcurve_poll; + ot->exec = graph_fmodifier_copy_exec; + ot->poll = graphop_active_fcurve_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ //ot->prop = RNA_def_boolean(ot->srna, "all", 1, "All F-Modifiers", "Copy all the F-Modifiers, instead of just the active one"); @@ -2275,16 +2275,16 @@ static int graph_fmodifier_paste_exec(bContext *C, wmOperator *op) void GRAPH_OT_fmodifier_paste (wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste F-Modifiers"; - ot->idname= "GRAPH_OT_fmodifier_paste"; - ot->description= "Add copied F-Modifiers to the selected F-Curves"; + ot->name = "Paste F-Modifiers"; + ot->idname = "GRAPH_OT_fmodifier_paste"; + ot->description = "Add copied F-Modifiers to the selected F-Curves"; /* api callbacks */ - ot->exec= graph_fmodifier_paste_exec; - ot->poll= graphop_active_fcurve_poll; + ot->exec = graph_fmodifier_paste_exec; + ot->poll = graphop_active_fcurve_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ************************************************************************** */ diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c index aba58098563..de253839f5a 100644 --- a/source/blender/editors/space_graph/graph_ops.c +++ b/source/blender/editors/space_graph/graph_ops.c @@ -164,18 +164,18 @@ static int graphview_cursor_modal(bContext *C, wmOperator *op, wmEvent *event) static void GRAPH_OT_cursor_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Cursor"; - ot->idname= "GRAPH_OT_cursor_set"; - ot->description= "Interactively set the current frame number and value cursor"; + ot->name = "Set Cursor"; + ot->idname = "GRAPH_OT_cursor_set"; + ot->description = "Interactively set the current frame number and value cursor"; /* api callbacks */ - ot->exec= graphview_cursor_exec; - ot->invoke= graphview_cursor_invoke; - ot->modal= graphview_cursor_modal; - ot->poll= ED_operator_graphedit_active; + ot->exec = graphview_cursor_exec; + ot->invoke = graphview_cursor_invoke; + ot->modal = graphview_cursor_modal; + ot->poll = ED_operator_graphedit_active; /* flags */ - ot->flag= OPTYPE_BLOCKING|OPTYPE_UNDO; + ot->flag = OPTYPE_BLOCKING|OPTYPE_UNDO; /* rna */ RNA_def_int(ot->srna, "frame", 0, MINAFRAME, MAXFRAME, "Frame", "", MINAFRAME, MAXFRAME); @@ -243,7 +243,7 @@ void ED_operatormacros_graph(void) ot= WM_operatortype_append_macro("GRAPH_OT_duplicate_move", "Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER); if (ot) { - ot->description= "Make a copy of all selected keyframes and move them"; + ot->description = "Make a copy of all selected keyframes and move them"; WM_operatortype_macro_define(ot, "GRAPH_OT_duplicate"); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_transform"); RNA_enum_set(otmacro->ptr, "mode", TFM_TIME_DUPLICATE); diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c index bdd3497a931..64422aff076 100644 --- a/source/blender/editors/space_graph/graph_select.c +++ b/source/blender/editors/space_graph/graph_select.c @@ -169,19 +169,19 @@ static int graphkeys_deselectall_exec(bContext *C, wmOperator *op) void GRAPH_OT_select_all_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select All"; - ot->idname= "GRAPH_OT_select_all_toggle"; - ot->description= "Toggle selection of all keyframes"; + ot->name = "Select All"; + ot->idname = "GRAPH_OT_select_all_toggle"; + ot->description = "Toggle selection of all keyframes"; /* api callbacks */ - ot->exec= graphkeys_deselectall_exec; - ot->poll= graphop_visible_keyframes_poll; + ot->exec = graphkeys_deselectall_exec; + ot->poll = graphop_visible_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/; + ot->flag = OPTYPE_REGISTER/*|OPTYPE_UNDO*/; /* props */ - ot->prop= RNA_def_boolean(ot->srna, "invert", 0, "Invert", ""); + ot->prop = RNA_def_boolean(ot->srna, "invert", 0, "Invert", ""); } /* ******************** Border Select Operator **************************** */ @@ -348,25 +348,25 @@ static int graphkeys_borderselect_exec(bContext *C, wmOperator *op) void GRAPH_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Select"; - ot->idname= "GRAPH_OT_select_border"; - ot->description= "Select all keyframes within the specified region"; + ot->name = "Border Select"; + ot->idname = "GRAPH_OT_select_border"; + ot->description = "Select all keyframes within the specified region"; /* api callbacks */ - ot->invoke= WM_border_select_invoke; - ot->exec= graphkeys_borderselect_exec; - ot->modal= WM_border_select_modal; - ot->cancel= WM_border_select_cancel; + ot->invoke = WM_border_select_invoke; + ot->exec = graphkeys_borderselect_exec; + ot->modal = WM_border_select_modal; + ot->cancel = WM_border_select_cancel; - ot->poll= graphop_visible_keyframes_poll; + ot->poll = graphop_visible_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/; + ot->flag = OPTYPE_REGISTER/*|OPTYPE_UNDO*/; /* rna */ WM_operator_properties_gesture_border(ot, TRUE); - ot->prop= RNA_def_boolean(ot->srna, "axis_range", 0, "Axis Range", ""); + ot->prop = RNA_def_boolean(ot->srna, "axis_range", 0, "Axis Range", ""); RNA_def_boolean(ot->srna, "include_handles", 0, "Include Handles", "Are handles tested individually against the selection criteria"); } @@ -538,19 +538,19 @@ static int graphkeys_columnselect_exec(bContext *C, wmOperator *op) void GRAPH_OT_select_column (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select All"; - ot->idname= "GRAPH_OT_select_column"; - ot->description= "Select all keyframes on the specified frame(s)"; + ot->name = "Select All"; + ot->idname = "GRAPH_OT_select_column"; + ot->description = "Select all keyframes on the specified frame(s)"; /* api callbacks */ - ot->exec= graphkeys_columnselect_exec; - ot->poll= graphop_visible_keyframes_poll; + ot->exec = graphkeys_columnselect_exec; + ot->poll = graphop_visible_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/; + ot->flag = OPTYPE_REGISTER/*|OPTYPE_UNDO*/; /* props */ - ot->prop= RNA_def_enum(ot->srna, "mode", prop_column_select_types, 0, "Mode", ""); + ot->prop = RNA_def_enum(ot->srna, "mode", prop_column_select_types, 0, "Mode", ""); } /* ******************** Select Linked Operator *********************** */ @@ -597,15 +597,15 @@ void GRAPH_OT_select_linked (wmOperatorType *ot) { /* identifiers */ ot->name = "Select Linked"; - ot->idname= "GRAPH_OT_select_linked"; + ot->idname = "GRAPH_OT_select_linked"; ot->description = "Select keyframes occurring in the same F-Curves as selected ones"; /* api callbacks */ - ot->exec= graphkeys_select_linked_exec; - ot->poll= graphop_visible_keyframes_poll; + ot->exec = graphkeys_select_linked_exec; + ot->poll = graphop_visible_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/; + ot->flag = OPTYPE_REGISTER/*|OPTYPE_UNDO*/; } /* ******************** Select More/Less Operators *********************** */ @@ -675,15 +675,15 @@ void GRAPH_OT_select_more (wmOperatorType *ot) { /* identifiers */ ot->name = "Select More"; - ot->idname= "GRAPH_OT_select_more"; + ot->idname = "GRAPH_OT_select_more"; ot->description = "Select keyframes beside already selected ones"; /* api callbacks */ - ot->exec= graphkeys_select_more_exec; - ot->poll= graphop_visible_keyframes_poll; + ot->exec = graphkeys_select_more_exec; + ot->poll = graphop_visible_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/; + ot->flag = OPTYPE_REGISTER/*|OPTYPE_UNDO*/; } /* ----------------- */ @@ -709,15 +709,15 @@ void GRAPH_OT_select_less (wmOperatorType *ot) { /* identifiers */ ot->name = "Select Less"; - ot->idname= "GRAPH_OT_select_less"; + ot->idname = "GRAPH_OT_select_less"; ot->description = "Deselect keyframes on ends of selection islands"; /* api callbacks */ - ot->exec= graphkeys_select_less_exec; - ot->poll= graphop_visible_keyframes_poll; + ot->exec = graphkeys_select_less_exec; + ot->poll = graphop_visible_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/; + ot->flag = OPTYPE_REGISTER/*|OPTYPE_UNDO*/; } /* ******************** Select Left/Right Operator ************************* */ @@ -849,20 +849,20 @@ static int graphkeys_select_leftright_invoke (bContext *C, wmOperator *op, wmEve void GRAPH_OT_select_leftright (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Left/Right"; - ot->idname= "GRAPH_OT_select_leftright"; - ot->description= "Select keyframes to the left or the right of the current frame"; + ot->name = "Select Left/Right"; + ot->idname = "GRAPH_OT_select_leftright"; + ot->description = "Select keyframes to the left or the right of the current frame"; /* api callbacks */ ot->invoke= graphkeys_select_leftright_invoke; - ot->exec= graphkeys_select_leftright_exec; - ot->poll= graphop_visible_keyframes_poll; + ot->exec = graphkeys_select_leftright_exec; + ot->poll = graphop_visible_keyframes_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "mode", prop_graphkeys_leftright_select_types, GRAPHKEYS_LRSEL_TEST, "Mode", ""); + ot->prop = RNA_def_enum(ot->srna, "mode", prop_graphkeys_leftright_select_types, GRAPHKEYS_LRSEL_TEST, "Mode", ""); RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); } @@ -1334,13 +1334,13 @@ static int graphkeys_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *ev void GRAPH_OT_clickselect (wmOperatorType *ot) { /* identifiers */ - ot->name= "Mouse Select Keys"; - ot->idname= "GRAPH_OT_clickselect"; - ot->description= "Select keyframes by clicking on them"; + ot->name = "Mouse Select Keys"; + ot->idname = "GRAPH_OT_clickselect"; + ot->description = "Select keyframes by clicking on them"; /* api callbacks */ - ot->invoke= graphkeys_clickselect_invoke; - ot->poll= graphop_visible_keyframes_poll; + ot->invoke = graphkeys_clickselect_invoke; + ot->poll = graphop_visible_keyframes_poll; /* id-props */ RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index d54468f64ea..209e87ae703 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -917,15 +917,15 @@ static int image_properties(bContext *C, wmOperator *UNUSED(op)) void IMAGE_OT_properties(wmOperatorType *ot) { - ot->name= "Properties"; - ot->idname= "IMAGE_OT_properties"; - ot->description= "Toggle display properties panel"; + ot->name = "Properties"; + ot->idname = "IMAGE_OT_properties"; + ot->description = "Toggle display properties panel"; - ot->exec= image_properties; - ot->poll= ED_operator_image_active; + ot->exec = image_properties; + ot->poll = ED_operator_image_active; /* flags */ - ot->flag= 0; + ot->flag = 0; } static int image_scopes(bContext *C, wmOperator *UNUSED(op)) @@ -941,14 +941,14 @@ static int image_scopes(bContext *C, wmOperator *UNUSED(op)) void IMAGE_OT_scopes(wmOperatorType *ot) { - ot->name= "Scopes"; - ot->idname= "IMAGE_OT_scopes"; - ot->description= "Toggle display scopes panel"; + ot->name = "Scopes"; + ot->idname = "IMAGE_OT_scopes"; + ot->description = "Toggle display scopes panel"; - ot->exec= image_scopes; - ot->poll= ED_operator_image_active; + ot->exec = image_scopes; + ot->poll = ED_operator_image_active; /* flags */ - ot->flag= 0; + ot->flag = 0; } diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 6271dbece35..6d4aa63a770 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -331,18 +331,18 @@ static int image_view_pan_cancel(bContext *C, wmOperator *op) void IMAGE_OT_view_pan(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Pan"; - ot->idname= "IMAGE_OT_view_pan"; + ot->name = "View Pan"; + ot->idname = "IMAGE_OT_view_pan"; /* api callbacks */ - ot->exec= image_view_pan_exec; - ot->invoke= image_view_pan_invoke; - ot->modal= image_view_pan_modal; - ot->cancel= image_view_pan_cancel; - ot->poll= space_image_main_area_poll; + ot->exec = image_view_pan_exec; + ot->invoke = image_view_pan_invoke; + ot->modal = image_view_pan_modal; + ot->cancel = image_view_pan_cancel; + ot->poll = space_image_main_area_poll; /* flags */ - ot->flag= OPTYPE_BLOCKING; + ot->flag = OPTYPE_BLOCKING; /* properties */ RNA_def_float_vector(ot->srna, "offset", 2, NULL, -FLT_MAX, FLT_MAX, @@ -468,18 +468,18 @@ static int image_view_zoom_cancel(bContext *C, wmOperator *op) void IMAGE_OT_view_zoom(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Zoom"; - ot->idname= "IMAGE_OT_view_zoom"; + ot->name = "View Zoom"; + ot->idname = "IMAGE_OT_view_zoom"; /* api callbacks */ - ot->exec= image_view_zoom_exec; - ot->invoke= image_view_zoom_invoke; - ot->modal= image_view_zoom_modal; - ot->cancel= image_view_zoom_cancel; - ot->poll= space_image_main_area_poll; + ot->exec = image_view_zoom_exec; + ot->invoke = image_view_zoom_invoke; + ot->modal = image_view_zoom_modal; + ot->cancel = image_view_zoom_cancel; + ot->poll = space_image_main_area_poll; /* flags */ - ot->flag= OPTYPE_BLOCKING; + ot->flag = OPTYPE_BLOCKING; /* properties */ RNA_def_float(ot->srna, "factor", 0.0f, 0.0f, FLT_MAX, @@ -536,11 +536,11 @@ static int image_view_ndof_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent * void IMAGE_OT_view_ndof(wmOperatorType *ot) { /* identifiers */ - ot->name= "NDOF Pan/Zoom"; - ot->idname= "IMAGE_OT_view_ndof"; + ot->name = "NDOF Pan/Zoom"; + ot->idname = "IMAGE_OT_view_ndof"; /* api callbacks */ - ot->invoke= image_view_ndof_invoke; + ot->invoke = image_view_ndof_invoke; } /********************** view all operator *********************/ @@ -589,12 +589,12 @@ static int image_view_all_exec(bContext *C, wmOperator *UNUSED(op)) void IMAGE_OT_view_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "View All"; - ot->idname= "IMAGE_OT_view_all"; + ot->name = "View All"; + ot->idname = "IMAGE_OT_view_all"; /* api callbacks */ - ot->exec= image_view_all_exec; - ot->poll= space_image_main_area_poll; + ot->exec = image_view_all_exec; + ot->poll = space_image_main_area_poll; } /********************** view selected operator *********************/ @@ -650,12 +650,12 @@ static int image_view_selected_poll(bContext *C) void IMAGE_OT_view_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Center"; - ot->idname= "IMAGE_OT_view_selected"; + ot->name = "View Center"; + ot->idname = "IMAGE_OT_view_selected"; /* api callbacks */ - ot->exec= image_view_selected_exec; - ot->poll= image_view_selected_poll; + ot->exec = image_view_selected_exec; + ot->poll = image_view_selected_poll; } /********************** view zoom in/out operator *********************/ @@ -689,13 +689,13 @@ static int image_view_zoom_in_invoke(bContext *C, wmOperator *op, wmEvent *event void IMAGE_OT_view_zoom_in(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Zoom In"; - ot->idname= "IMAGE_OT_view_zoom_in"; + ot->name = "View Zoom In"; + ot->idname = "IMAGE_OT_view_zoom_in"; /* api callbacks */ - ot->invoke= image_view_zoom_in_invoke; - ot->exec= image_view_zoom_in_exec; - ot->poll= space_image_main_area_poll; + ot->invoke = image_view_zoom_in_invoke; + ot->exec = image_view_zoom_in_exec; + ot->poll = space_image_main_area_poll; /* properties */ RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX, "Location", "Cursor location in screen coordinates", -10.0f, 10.0f); @@ -730,13 +730,13 @@ static int image_view_zoom_out_invoke(bContext *C, wmOperator *op, wmEvent *even void IMAGE_OT_view_zoom_out(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Zoom Out"; - ot->idname= "IMAGE_OT_view_zoom_out"; + ot->name = "View Zoom Out"; + ot->idname = "IMAGE_OT_view_zoom_out"; /* api callbacks */ - ot->invoke= image_view_zoom_out_invoke; - ot->exec= image_view_zoom_out_exec; - ot->poll= space_image_main_area_poll; + ot->invoke = image_view_zoom_out_invoke; + ot->exec = image_view_zoom_out_exec; + ot->poll = space_image_main_area_poll; /* properties */ RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX, "Location", "Cursor location in screen coordinates", -10.0f, 10.0f); @@ -772,12 +772,12 @@ static int image_view_zoom_ratio_exec(bContext *C, wmOperator *op) void IMAGE_OT_view_zoom_ratio(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Zoom Ratio"; - ot->idname= "IMAGE_OT_view_zoom_ratio"; + ot->name = "View Zoom Ratio"; + ot->idname = "IMAGE_OT_view_zoom_ratio"; /* api callbacks */ - ot->exec= image_view_zoom_ratio_exec; - ot->poll= space_image_main_area_poll; + ot->exec = image_view_zoom_ratio_exec; + ot->poll = space_image_main_area_poll; /* properties */ RNA_def_float(ot->srna, "ratio", 0.0f, 0.0f, FLT_MAX, @@ -909,17 +909,17 @@ static int image_open_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event) void IMAGE_OT_open(wmOperatorType *ot) { /* identifiers */ - ot->name= "Open Image"; - ot->description= "Open image"; - ot->idname= "IMAGE_OT_open"; + ot->name = "Open Image"; + ot->description = "Open image"; + ot->idname = "IMAGE_OT_open"; /* api callbacks */ - ot->exec= image_open_exec; - ot->invoke= image_open_invoke; - ot->cancel= image_open_cancel; + ot->exec = image_open_exec; + ot->invoke = image_open_invoke; + ot->cancel = image_open_cancel; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE|MOVIEFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH|WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY); @@ -975,16 +975,16 @@ static int image_replace_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve void IMAGE_OT_replace(wmOperatorType *ot) { /* identifiers */ - ot->name= "Replace Image"; - ot->idname= "IMAGE_OT_replace"; + ot->name = "Replace Image"; + ot->idname = "IMAGE_OT_replace"; /* api callbacks */ - ot->exec= image_replace_exec; - ot->invoke= image_replace_invoke; - ot->poll= space_image_poll; + ot->exec = image_replace_exec; + ot->invoke = image_replace_invoke; + ot->poll = space_image_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE|MOVIEFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH|WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY); @@ -1320,19 +1320,19 @@ void IMAGE_OT_save_as(wmOperatorType *ot) // PropertyRNA *prop; /* identifiers */ - ot->name= "Save As Image"; - ot->idname= "IMAGE_OT_save_as"; + ot->name = "Save As Image"; + ot->idname = "IMAGE_OT_save_as"; /* api callbacks */ - ot->exec= image_save_as_exec; - ot->check= image_save_as_check; - ot->invoke= image_save_as_invoke; - ot->cancel= image_save_as_cancel; - ot->ui= image_save_as_draw; - ot->poll= space_image_buffer_exists_poll; + ot->exec = image_save_as_exec; + ot->check = image_save_as_check; + ot->invoke = image_save_as_invoke; + ot->cancel = image_save_as_cancel; + ot->ui = image_save_as_draw; + ot->poll = space_image_buffer_exists_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "copy", 0, "Copy", "Create a new image file without modifying the current image in blender"); @@ -1366,15 +1366,15 @@ static int image_save_exec(bContext *C, wmOperator *op) void IMAGE_OT_save(wmOperatorType *ot) { /* identifiers */ - ot->name= "Save Image"; - ot->idname= "IMAGE_OT_save"; + ot->name = "Save Image"; + ot->idname = "IMAGE_OT_save"; /* api callbacks */ - ot->exec= image_save_exec; - ot->poll= space_image_file_exists_poll; + ot->exec = image_save_exec; + ot->poll = space_image_file_exists_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /******************* save sequence operator ********************/ @@ -1443,15 +1443,15 @@ static int image_save_sequence_exec(bContext *C, wmOperator *op) void IMAGE_OT_save_sequence(wmOperatorType *ot) { /* identifiers */ - ot->name= "Save Sequence"; - ot->idname= "IMAGE_OT_save_sequence"; + ot->name = "Save Sequence"; + ot->idname = "IMAGE_OT_save_sequence"; /* api callbacks */ - ot->exec= image_save_sequence_exec; - ot->poll= space_image_buffer_exists_poll; + ot->exec = image_save_sequence_exec; + ot->poll = space_image_buffer_exists_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /******************** reload image operator ********************/ @@ -1478,14 +1478,14 @@ static int image_reload_exec(bContext *C, wmOperator *UNUSED(op)) void IMAGE_OT_reload(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reload Image"; - ot->idname= "IMAGE_OT_reload"; + ot->name = "Reload Image"; + ot->idname = "IMAGE_OT_reload"; /* api callbacks */ - ot->exec= image_reload_exec; + ot->exec = image_reload_exec; /* flags */ - ot->flag= OPTYPE_REGISTER; /* no undo, image buffer is not handled by undo */ + ot->flag = OPTYPE_REGISTER; /* no undo, image buffer is not handled by undo */ } /********************** new image operator *********************/ @@ -1560,16 +1560,16 @@ void IMAGE_OT_new(wmOperatorType *ot) static float default_color[4]= {0.0f, 0.0f, 0.0f, 1.0f}; /* identifiers */ - ot->name= "New Image"; - ot->description= "Create a new image"; - ot->idname= "IMAGE_OT_new"; + ot->name = "New Image"; + ot->description = "Create a new image"; + ot->idname = "IMAGE_OT_new"; /* api callbacks */ - ot->exec= image_new_exec; - ot->invoke= image_new_invoke; + ot->exec = image_new_exec; + ot->invoke = image_new_invoke; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; /* properties */ RNA_def_string(ot->srna, "name", "untitled", MAX_ID_NAME-2, "Name", "Image datablock name"); @@ -1650,12 +1650,12 @@ static int image_invert_exec(bContext *C, wmOperator *op) void IMAGE_OT_invert(wmOperatorType *ot) { /* identifiers */ - ot->name= "Invert Channels"; - ot->idname= "IMAGE_OT_invert"; + ot->name = "Invert Channels"; + ot->idname = "IMAGE_OT_invert"; /* api callbacks */ - ot->exec= image_invert_exec; - ot->poll= image_invert_poll; + ot->exec = image_invert_exec; + ot->poll = image_invert_poll; /* properties */ RNA_def_boolean(ot->srna, "invert_r", 0, "Red", "Invert Red Channel"); @@ -1664,7 +1664,7 @@ void IMAGE_OT_invert(wmOperatorType *ot) RNA_def_boolean(ot->srna, "invert_a", 0, "Alpha", "Invert Alpha Channel"); /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************* pack operator *********************/ @@ -1738,16 +1738,16 @@ static int image_pack_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event) void IMAGE_OT_pack(wmOperatorType *ot) { /* identifiers */ - ot->name= "Pack Image"; - ot->description= "Pack an image as embedded data into the .blend file"; - ot->idname= "IMAGE_OT_pack"; + ot->name = "Pack Image"; + ot->description = "Pack an image as embedded data into the .blend file"; + ot->idname = "IMAGE_OT_pack"; /* api callbacks */ - ot->exec= image_pack_exec; - ot->invoke= image_pack_invoke; + ot->exec = image_pack_exec; + ot->invoke = image_pack_invoke; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "as_png", 0, "Pack As PNG", "Pack image as lossless PNG"); @@ -1815,16 +1815,16 @@ static int image_unpack_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(even void IMAGE_OT_unpack(wmOperatorType *ot) { /* identifiers */ - ot->name= "Unpack Image"; - ot->description= "Save an image packed in the .blend file to disk"; - ot->idname= "IMAGE_OT_unpack"; + ot->name = "Unpack Image"; + ot->description = "Save an image packed in the .blend file to disk"; + ot->idname = "IMAGE_OT_unpack"; /* api callbacks */ - ot->exec= image_unpack_exec; - ot->invoke= image_unpack_invoke; + ot->exec = image_unpack_exec; + ot->invoke = image_unpack_invoke; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_enum(ot->srna, "method", unpack_method_items, PF_USE_LOCAL, "Method", "How to unpack"); @@ -2025,17 +2025,17 @@ static int image_sample_cancel(bContext *C, wmOperator *op) void IMAGE_OT_sample(wmOperatorType *ot) { /* identifiers */ - ot->name= "Sample Color"; - ot->idname= "IMAGE_OT_sample"; + ot->name = "Sample Color"; + ot->idname = "IMAGE_OT_sample"; /* api callbacks */ - ot->invoke= image_sample_invoke; - ot->modal= image_sample_modal; - ot->cancel= image_sample_cancel; - ot->poll= space_image_image_sample_poll; + ot->invoke = image_sample_invoke; + ot->modal = image_sample_modal; + ot->cancel = image_sample_cancel; + ot->poll = space_image_image_sample_poll; /* flags */ - ot->flag= OPTYPE_BLOCKING; + ot->flag = OPTYPE_BLOCKING; } /******************** sample line operator ********************/ @@ -2133,18 +2133,18 @@ static int image_sample_line_invoke(bContext *C, wmOperator *op, wmEvent *event) void IMAGE_OT_sample_line(wmOperatorType *ot) { /* identifiers */ - ot->name= "Sample Line"; - ot->idname= "IMAGE_OT_sample_line"; + ot->name = "Sample Line"; + ot->idname = "IMAGE_OT_sample_line"; /* api callbacks */ - ot->invoke= image_sample_line_invoke; - ot->modal= WM_gesture_straightline_modal; - ot->exec= image_sample_line_exec; - ot->poll= space_image_main_area_poll; - ot->cancel= WM_gesture_straightline_cancel; + ot->invoke = image_sample_line_invoke; + ot->modal = WM_gesture_straightline_modal; + ot->exec = image_sample_line_exec; + ot->poll = space_image_main_area_poll; + ot->cancel = WM_gesture_straightline_cancel; /* flags */ - ot->flag= 0; /* no undo/register since this operates on the space */ + ot->flag = 0; /* no undo/register since this operates on the space */ WM_operator_properties_gesture_straightline(ot, CURSOR_EDIT); } @@ -2159,17 +2159,17 @@ void IMAGE_OT_curves_point_set(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Set Curves Point"; - ot->idname= "IMAGE_OT_curves_point_set"; + ot->name = "Set Curves Point"; + ot->idname = "IMAGE_OT_curves_point_set"; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->invoke= image_sample_invoke; - ot->modal= image_sample_modal; - ot->cancel= image_sample_cancel; - ot->poll= space_image_main_area_not_uv_brush_poll; + ot->invoke = image_sample_invoke; + ot->modal = image_sample_modal; + ot->cancel = image_sample_cancel; + ot->poll = space_image_main_area_not_uv_brush_poll; /* properties */ RNA_def_enum(ot->srna, "point", point_items, 0, "Point", "Set black point or white point for curves"); @@ -2313,15 +2313,15 @@ static int image_record_composite_cancel(bContext *C, wmOperator *op) void IMAGE_OT_record_composite(wmOperatorType *ot) { /* identifiers */ - ot->name= "Record Composite"; - ot->idname= "IMAGE_OT_record_composite"; + ot->name = "Record Composite"; + ot->idname = "IMAGE_OT_record_composite"; /* api callbacks */ - ot->exec= image_record_composite_exec; - ot->invoke= image_record_composite_invoke; - ot->modal= image_record_composite_modal; - ot->cancel= image_record_composite_cancel; - ot->poll= space_image_buffer_exists_poll; + ot->exec = image_record_composite_exec; + ot->invoke = image_record_composite_invoke; + ot->modal = image_record_composite_modal; + ot->cancel = image_record_composite_cancel; + ot->poll = space_image_buffer_exists_poll; } /********************* cycle render slot operator *********************/ @@ -2368,15 +2368,15 @@ static int image_cycle_render_slot_exec(bContext *C, wmOperator *op) void IMAGE_OT_cycle_render_slot(wmOperatorType *ot) { /* identifiers */ - ot->name= "Cycle Render Slot"; - ot->idname= "IMAGE_OT_cycle_render_slot"; + ot->name = "Cycle Render Slot"; + ot->idname = "IMAGE_OT_cycle_render_slot"; /* api callbacks */ - ot->exec= image_cycle_render_slot_exec; - ot->poll= image_cycle_render_slot_poll; + ot->exec = image_cycle_render_slot_exec; + ot->poll = image_cycle_render_slot_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "reverse", 0, "Cycle in Reverse", ""); } diff --git a/source/blender/editors/space_info/info_ops.c b/source/blender/editors/space_info/info_ops.c index e4febdef73b..bceb7c3d747 100644 --- a/source/blender/editors/space_info/info_ops.c +++ b/source/blender/editors/space_info/info_ops.c @@ -105,15 +105,15 @@ static int pack_all_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void FILE_OT_pack_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Pack All"; - ot->idname= "FILE_OT_pack_all"; + ot->name = "Pack All"; + ot->idname = "FILE_OT_pack_all"; /* api callbacks */ - ot->exec= pack_all_exec; - ot->invoke= pack_all_invoke; + ot->exec = pack_all_exec; + ot->invoke = pack_all_invoke; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************* unpack all operator *********************/ @@ -173,15 +173,15 @@ static int unpack_all_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event) void FILE_OT_unpack_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Unpack All"; - ot->idname= "FILE_OT_unpack_all"; + ot->name = "Unpack All"; + ot->idname = "FILE_OT_unpack_all"; /* api callbacks */ - ot->exec= unpack_all_exec; - ot->invoke= unpack_all_invoke; + ot->exec = unpack_all_exec; + ot->invoke = unpack_all_invoke; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_enum(ot->srna, "method", unpack_all_method_items, PF_USE_LOCAL, "Method", "How to unpack"); @@ -209,14 +209,14 @@ static int make_paths_relative_exec(bContext *C, wmOperator *op) void FILE_OT_make_paths_relative(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make All Paths Relative"; - ot->idname= "FILE_OT_make_paths_relative"; + ot->name = "Make All Paths Relative"; + ot->idname = "FILE_OT_make_paths_relative"; /* api callbacks */ - ot->exec= make_paths_relative_exec; + ot->exec = make_paths_relative_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************* make paths absolute operator *********************/ @@ -241,14 +241,14 @@ static int make_paths_absolute_exec(bContext *C, wmOperator *op) void FILE_OT_make_paths_absolute(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make All Paths Absolute"; - ot->idname= "FILE_OT_make_paths_absolute"; + ot->name = "Make All Paths Absolute"; + ot->idname = "FILE_OT_make_paths_absolute"; /* api callbacks */ - ot->exec= make_paths_absolute_exec; + ot->exec = make_paths_absolute_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /********************* report missing files operator *********************/ @@ -266,14 +266,14 @@ static int report_missing_files_exec(bContext *C, wmOperator *op) void FILE_OT_report_missing_files(wmOperatorType *ot) { /* identifiers */ - ot->name= "Report Missing Files"; - ot->idname= "FILE_OT_report_missing_files"; + ot->name = "Report Missing Files"; + ot->idname = "FILE_OT_report_missing_files"; /* api callbacks */ - ot->exec= report_missing_files_exec; + ot->exec = report_missing_files_exec; /* flags */ - ot->flag= 0; /* only reports so no need to undo/register */ + ot->flag = 0; /* only reports so no need to undo/register */ } /********************* find missing files operator *********************/ @@ -298,15 +298,15 @@ static int find_missing_files_invoke(bContext *C, wmOperator *op, wmEvent *UNUSE void FILE_OT_find_missing_files(wmOperatorType *ot) { /* identifiers */ - ot->name= "Find Missing Files"; - ot->idname= "FILE_OT_find_missing_files"; + ot->name = "Find Missing Files"; + ot->idname = "FILE_OT_find_missing_files"; /* api callbacks */ - ot->exec= find_missing_files_exec; - ot->invoke= find_missing_files_invoke; + ot->exec = find_missing_files_exec; + ot->invoke = find_missing_files_invoke; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ WM_operator_properties_filesel(ot, 0, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY); @@ -409,14 +409,14 @@ static int update_reports_display_invoke(bContext *C, wmOperator *UNUSED(op), wm void INFO_OT_reports_display_update(wmOperatorType *ot) { /* identifiers */ - ot->name= "Update Reports Display"; - ot->idname= "INFO_OT_reports_display_update"; + ot->name = "Update Reports Display"; + ot->idname = "INFO_OT_reports_display_update"; /* api callbacks */ - ot->invoke= update_reports_display_invoke; + ot->invoke = update_reports_display_invoke; /* flags */ - ot->flag= 0; + ot->flag = 0; /* properties */ } diff --git a/source/blender/editors/space_info/info_report.c b/source/blender/editors/space_info/info_report.c index 89abb7ad1f0..ca467ea61fa 100644 --- a/source/blender/editors/space_info/info_report.c +++ b/source/blender/editors/space_info/info_report.c @@ -95,16 +95,16 @@ static int report_replay_exec(bContext *C, wmOperator *UNUSED(op)) void INFO_OT_report_replay(wmOperatorType *ot) { /* identifiers */ - ot->name= "Replay Operators"; - ot->description= "Replay selected reports"; - ot->idname= "INFO_OT_report_replay"; + ot->name = "Replay Operators"; + ot->description = "Replay selected reports"; + ot->idname = "INFO_OT_report_replay"; /* api callbacks */ - ot->poll= ED_operator_info_active; - ot->exec= report_replay_exec; + ot->poll = ED_operator_info_active; + ot->exec = report_replay_exec; /* flags */ - /* ot->flag= OPTYPE_REGISTER; */ + /* ot->flag = OPTYPE_REGISTER; */ /* properties */ } @@ -145,17 +145,17 @@ static int select_report_pick_invoke(bContext *C, wmOperator *op, wmEvent *event void INFO_OT_select_pick(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select report"; - ot->description= "Select reports by index"; - ot->idname= "INFO_OT_select_pick"; + ot->name = "Select report"; + ot->description = "Select reports by index"; + ot->idname = "INFO_OT_select_pick"; /* api callbacks */ - ot->poll= ED_operator_info_active; - ot->invoke= select_report_pick_invoke; - ot->exec= select_report_pick_exec; + ot->poll = ED_operator_info_active; + ot->invoke = select_report_pick_invoke; + ot->exec = select_report_pick_exec; /* flags */ - /* ot->flag= OPTYPE_REGISTER; */ + /* ot->flag = OPTYPE_REGISTER; */ /* properties */ RNA_def_int(ot->srna, "report_index", 0, 0, INT_MAX, "Report", "Index of the report", 0, INT_MAX); @@ -199,16 +199,16 @@ static int report_select_all_toggle_exec(bContext *C, wmOperator *UNUSED(op)) void INFO_OT_select_all_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "(De)select All"; - ot->description= "Select or deselect all reports"; - ot->idname= "INFO_OT_select_all_toggle"; + ot->name = "(De)select All"; + ot->description = "Select or deselect all reports"; + ot->idname = "INFO_OT_select_all_toggle"; /* api callbacks */ - ot->poll= ED_operator_info_active; - ot->exec= report_select_all_toggle_exec; + ot->poll = ED_operator_info_active; + ot->exec = report_select_all_toggle_exec; /* flags */ - /*ot->flag= OPTYPE_REGISTER;*/ + /*ot->flag = OPTYPE_REGISTER;*/ /* properties */ } @@ -303,20 +303,20 @@ static int borderselect_exec(bContext *C, wmOperator *op) void INFO_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Select"; - ot->description= "Toggle border selection"; - ot->idname= "INFO_OT_select_border"; + ot->name = "Border Select"; + ot->description = "Toggle border selection"; + ot->idname = "INFO_OT_select_border"; /* api callbacks */ - ot->invoke= WM_border_select_invoke; - ot->exec= borderselect_exec; - ot->modal= WM_border_select_modal; - ot->cancel= WM_border_select_cancel; + ot->invoke = WM_border_select_invoke; + ot->exec = borderselect_exec; + ot->modal = WM_border_select_modal; + ot->cancel = WM_border_select_cancel; - ot->poll= ED_operator_info_active; + ot->poll = ED_operator_info_active; /* flags */ - /* ot->flag= OPTYPE_REGISTER; */ + /* ot->flag = OPTYPE_REGISTER; */ /* rna */ WM_operator_properties_gesture_border(ot, TRUE); @@ -354,16 +354,16 @@ static int report_delete_exec(bContext *C, wmOperator *UNUSED(op)) void INFO_OT_report_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Reports"; - ot->description= "Delete selected reports"; - ot->idname= "INFO_OT_report_delete"; + ot->name = "Delete Reports"; + ot->description = "Delete selected reports"; + ot->idname = "INFO_OT_report_delete"; /* api callbacks */ - ot->poll= ED_operator_info_active; - ot->exec= report_delete_exec; + ot->poll = ED_operator_info_active; + ot->exec = report_delete_exec; /* flags */ - /*ot->flag= OPTYPE_REGISTER;*/ + /*ot->flag = OPTYPE_REGISTER;*/ /* properties */ } @@ -399,16 +399,16 @@ static int report_copy_exec(bContext *C, wmOperator *UNUSED(op)) void INFO_OT_report_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Reports to Clipboard"; - ot->description= "Copy selected reports to Clipboard"; - ot->idname= "INFO_OT_report_copy"; + ot->name = "Copy Reports to Clipboard"; + ot->description = "Copy selected reports to Clipboard"; + ot->idname = "INFO_OT_report_copy"; /* api callbacks */ - ot->poll= ED_operator_info_active; - ot->exec= report_copy_exec; + ot->poll = ED_operator_info_active; + ot->exec = report_copy_exec; /* flags */ - /*ot->flag= OPTYPE_REGISTER;*/ + /*ot->flag = OPTYPE_REGISTER;*/ /* properties */ } diff --git a/source/blender/editors/space_logic/logic_buttons.c b/source/blender/editors/space_logic/logic_buttons.c index 388f9470cb5..0acb15874c7 100644 --- a/source/blender/editors/space_logic/logic_buttons.c +++ b/source/blender/editors/space_logic/logic_buttons.c @@ -116,15 +116,15 @@ static int logic_properties(bContext *C, wmOperator *UNUSED(op)) void LOGIC_OT_properties(wmOperatorType *ot) { - ot->name= "Properties"; - ot->description= "Toggle display properties panel"; - ot->idname= "LOGIC_OT_properties"; + ot->name = "Properties"; + ot->description = "Toggle display properties panel"; + ot->idname = "LOGIC_OT_properties"; - ot->exec= logic_properties; - ot->poll= ED_operator_logic_active; + ot->exec = logic_properties; + ot->poll = ED_operator_logic_active; /* flags */ - ot->flag= 0; + ot->flag = 0; } /* Remove Logic Bricks Connections */ @@ -197,19 +197,19 @@ void LOGIC_OT_links_cut(wmOperatorType *ot) { PropertyRNA *prop; - ot->name= "Cut links"; - ot->idname= "LOGIC_OT_links_cut"; - ot->description= "Remove logic brick connections"; + ot->name = "Cut links"; + ot->idname = "LOGIC_OT_links_cut"; + ot->description = "Remove logic brick connections"; - ot->invoke= WM_gesture_lines_invoke; - ot->modal= WM_gesture_lines_modal; - ot->exec= cut_links_exec; - ot->cancel= WM_gesture_lines_cancel; + ot->invoke = WM_gesture_lines_invoke; + ot->modal = WM_gesture_lines_modal; + ot->exec = cut_links_exec; + ot->cancel = WM_gesture_lines_cancel; - ot->poll= ED_operator_logic_active; + ot->poll = ED_operator_logic_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; prop= RNA_def_property(ot->srna, "path", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_runtime(prop, &RNA_OperatorMousePath); diff --git a/source/blender/editors/space_logic/logic_ops.c b/source/blender/editors/space_logic/logic_ops.c index 86ac2d0c369..08f4ae669d7 100644 --- a/source/blender/editors/space_logic/logic_ops.c +++ b/source/blender/editors/space_logic/logic_ops.c @@ -258,16 +258,16 @@ static int sensor_remove_exec(bContext *C, wmOperator *op) static void LOGIC_OT_sensor_remove(wmOperatorType *ot) { - ot->name= "Remove Sensor"; - ot->description= "Remove a sensor from the active object"; - ot->idname= "LOGIC_OT_sensor_remove"; + ot->name = "Remove Sensor"; + ot->description = "Remove a sensor from the active object"; + ot->idname = "LOGIC_OT_sensor_remove"; - ot->invoke= sensor_remove_invoke; - ot->exec= sensor_remove_exec; - ot->poll= edit_sensor_poll; + ot->invoke = sensor_remove_invoke; + ot->exec = sensor_remove_exec; + ot->poll = edit_sensor_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_sensor_properties(ot); } @@ -313,20 +313,20 @@ static void LOGIC_OT_sensor_add(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Add Sensor"; + ot->name = "Add Sensor"; ot->description = "Add a sensor to the active object"; - ot->idname= "LOGIC_OT_sensor_add"; + ot->idname = "LOGIC_OT_sensor_add"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= sensor_add_exec; - ot->poll= ED_operator_object_active_editable; + ot->invoke = WM_menu_invoke; + ot->exec = sensor_add_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= prop= RNA_def_enum(ot->srna, "type", DummyRNA_NULL_items, SENS_ALWAYS, "Type", "Type of sensor to add"); + ot->prop = prop= RNA_def_enum(ot->srna, "type", DummyRNA_NULL_items, SENS_ALWAYS, "Type", "Type of sensor to add"); RNA_def_enum_funcs(prop, rna_Sensor_type_itemf); RNA_def_string(ot->srna, "name", "", MAX_NAME, "Name", "Name of the Sensor to add"); RNA_def_string(ot->srna, "object", "", MAX_NAME, "Object", "Name of the Object to add the Sensor to"); @@ -361,16 +361,16 @@ static int controller_remove_exec(bContext *C, wmOperator *op) static void LOGIC_OT_controller_remove(wmOperatorType *ot) { - ot->name= "Remove Controller"; - ot->description= "Remove a controller from the active object"; - ot->idname= "LOGIC_OT_controller_remove"; + ot->name = "Remove Controller"; + ot->description = "Remove a controller from the active object"; + ot->idname = "LOGIC_OT_controller_remove"; - ot->invoke= controller_remove_invoke; - ot->exec= controller_remove_exec; - ot->poll= edit_controller_poll; + ot->invoke = controller_remove_invoke; + ot->exec = controller_remove_exec; + ot->poll = edit_controller_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_controller_properties(ot); } @@ -428,20 +428,20 @@ static int controller_add_exec(bContext *C, wmOperator *op) static void LOGIC_OT_controller_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Controller"; + ot->name = "Add Controller"; ot->description = "Add a controller to the active object"; - ot->idname= "LOGIC_OT_controller_add"; + ot->idname = "LOGIC_OT_controller_add"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= controller_add_exec; - ot->poll= ED_operator_object_active_editable; + ot->invoke = WM_menu_invoke; + ot->exec = controller_add_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", controller_type_items, CONT_LOGIC_AND, "Type", "Type of controller to add"); + ot->prop = RNA_def_enum(ot->srna, "type", controller_type_items, CONT_LOGIC_AND, "Type", "Type of controller to add"); RNA_def_string(ot->srna, "name", "", MAX_NAME, "Name", "Name of the Controller to add"); RNA_def_string(ot->srna, "object", "", MAX_NAME, "Object", "Name of the Object to add the Controller to"); } @@ -475,16 +475,16 @@ static int actuator_remove_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e static void LOGIC_OT_actuator_remove(wmOperatorType *ot) { - ot->name= "Remove Actuator"; - ot->description= "Remove an actuator from the active object"; - ot->idname= "LOGIC_OT_actuator_remove"; + ot->name = "Remove Actuator"; + ot->description = "Remove an actuator from the active object"; + ot->idname = "LOGIC_OT_actuator_remove"; - ot->invoke= actuator_remove_invoke; - ot->exec= actuator_remove_exec; - ot->poll= edit_actuator_poll; + ot->invoke = actuator_remove_invoke; + ot->exec = actuator_remove_exec; + ot->poll = edit_actuator_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; edit_actuator_properties(ot); } @@ -530,20 +530,20 @@ static void LOGIC_OT_actuator_add(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Add Actuator"; + ot->name = "Add Actuator"; ot->description = "Add an actuator to the active object"; - ot->idname= "LOGIC_OT_actuator_add"; + ot->idname = "LOGIC_OT_actuator_add"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= actuator_add_exec; - ot->poll= ED_operator_object_active_editable; + ot->invoke = WM_menu_invoke; + ot->exec = actuator_add_exec; + ot->poll = ED_operator_object_active_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= prop= RNA_def_enum(ot->srna, "type", DummyRNA_NULL_items, CONT_LOGIC_AND, "Type", "Type of actuator to add"); + ot->prop = prop= RNA_def_enum(ot->srna, "type", DummyRNA_NULL_items, CONT_LOGIC_AND, "Type", "Type of actuator to add"); RNA_def_enum_funcs(prop, rna_Actuator_type_itemf); RNA_def_string(ot->srna, "name", "", MAX_NAME, "Name", "Name of the Actuator to add"); RNA_def_string(ot->srna, "object", "", MAX_NAME, "Object", "Name of the Object to add the Actuator to"); @@ -584,17 +584,17 @@ static int sensor_move_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event static void LOGIC_OT_sensor_move(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Sensor"; + ot->name = "Move Sensor"; ot->description = "Move Sensor"; - ot->idname= "LOGIC_OT_sensor_move"; + ot->idname = "LOGIC_OT_sensor_move"; /* api callbacks */ - ot->invoke= sensor_move_invoke; - ot->exec= sensor_move_exec; - ot->poll= edit_sensor_poll; + ot->invoke = sensor_move_invoke; + ot->exec = sensor_move_exec; + ot->poll = edit_sensor_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ edit_sensor_properties(ot); @@ -629,17 +629,17 @@ static int controller_move_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e static void LOGIC_OT_controller_move(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Controller"; + ot->name = "Move Controller"; ot->description = "Move Controller"; - ot->idname= "LOGIC_OT_controller_move"; + ot->idname = "LOGIC_OT_controller_move"; /* api callbacks */ - ot->invoke= controller_move_invoke; - ot->exec= controller_move_exec; - ot->poll= edit_controller_poll; + ot->invoke = controller_move_invoke; + ot->exec = controller_move_exec; + ot->poll = edit_controller_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ edit_controller_properties(ot); @@ -674,17 +674,17 @@ static int actuator_move_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve static void LOGIC_OT_actuator_move(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Actuator"; + ot->name = "Move Actuator"; ot->description = "Move Actuator"; - ot->idname= "LOGIC_OT_actuator_move"; + ot->idname = "LOGIC_OT_actuator_move"; /* api callbacks */ - ot->invoke= actuator_move_invoke; - ot->exec= actuator_move_exec; - ot->poll= edit_actuator_poll; + ot->invoke = actuator_move_invoke; + ot->exec = actuator_move_exec; + ot->poll = edit_actuator_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ edit_actuator_properties(ot); @@ -708,17 +708,17 @@ static int texface_convert_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e static void LOGIC_OT_texface_convert(wmOperatorType *ot) { /* identifiers */ - ot->name= "TexFace to Material Converter"; + ot->name = "TexFace to Material Converter"; ot->description = "Convert old texface settings into material. It may create new materials if needed"; - ot->idname= "LOGIC_OT_texface_convert"; + ot->idname = "LOGIC_OT_texface_convert"; /* api callbacks */ - ot->invoke= texface_convert_invoke; - ot->exec= texface_convert_exec; -// ot->poll= texface_convert_poll; + ot->invoke = texface_convert_invoke; + ot->exec = texface_convert_exec; +// ot->poll = texface_convert_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index fc42d9fa966..a3a84e4113c 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -526,13 +526,13 @@ static int nla_properties(bContext *C, wmOperator *UNUSED(op)) void NLA_OT_properties(wmOperatorType *ot) { - ot->name= "Properties"; - ot->idname= "NLA_OT_properties"; - ot->description= "Toggle display properties panel"; + ot->name = "Properties"; + ot->idname = "NLA_OT_properties"; + ot->description = "Toggle display properties panel"; - ot->exec= nla_properties; - ot->poll= ED_operator_nla_active; + ot->exec = nla_properties; + ot->poll = ED_operator_nla_active; /* flags */ - ot->flag= 0; + ot->flag = 0; } diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index fb23533636c..205691c69b5 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -344,16 +344,16 @@ static int nlachannels_mouseclick_invoke(bContext *C, wmOperator *op, wmEvent *e void NLA_OT_channels_click (wmOperatorType *ot) { /* identifiers */ - ot->name= "Mouse Click on NLA Channels"; - ot->idname= "NLA_OT_channels_click"; - ot->description= "Handle clicks to select NLA channels"; + ot->name = "Mouse Click on NLA Channels"; + ot->idname = "NLA_OT_channels_click"; + ot->description = "Handle clicks to select NLA channels"; /* api callbacks */ - ot->invoke= nlachannels_mouseclick_invoke; - ot->poll= ED_operator_nla_active; + ot->invoke = nlachannels_mouseclick_invoke; + ot->poll = ED_operator_nla_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY @@ -418,16 +418,16 @@ static int nlaedit_add_tracks_exec (bContext *C, wmOperator *op) void NLA_OT_tracks_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Track(s)"; - ot->idname= "NLA_OT_tracks_add"; - ot->description= "Add NLA-Tracks above/after the selected tracks"; + ot->name = "Add Track(s)"; + ot->idname = "NLA_OT_tracks_add"; + ot->description = "Add NLA-Tracks above/after the selected tracks"; /* api callbacks */ - ot->exec= nlaedit_add_tracks_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->exec = nlaedit_add_tracks_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "above_selected", 0, "Above Selected", "Add a new NLA Track above every existing selected one"); @@ -482,16 +482,16 @@ static int nlaedit_delete_tracks_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_delete_tracks (wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Tracks"; - ot->idname= "NLA_OT_delete_tracks"; - ot->description= "Delete selected NLA-Tracks and the strips they contain"; + ot->name = "Delete Tracks"; + ot->idname = "NLA_OT_delete_tracks"; + ot->description = "Delete selected NLA-Tracks and the strips they contain"; /* api callbacks */ - ot->exec= nlaedit_delete_tracks_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->exec = nlaedit_delete_tracks_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* *********************************************** */ diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index c0e9b7a3a57..105419c91f3 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/source/blender/editors/space_nla/nla_edit.c @@ -158,16 +158,16 @@ static int nlaedit_enable_tweakmode_exec (bContext *C, wmOperator *op) void NLA_OT_tweakmode_enter (wmOperatorType *ot) { /* identifiers */ - ot->name= "Enter Tweak Mode"; - ot->idname= "NLA_OT_tweakmode_enter"; - ot->description= "Enter tweaking mode for the action referenced by the active strip"; + ot->name = "Enter Tweak Mode"; + ot->idname = "NLA_OT_tweakmode_enter"; + ot->description = "Enter tweaking mode for the action referenced by the active strip"; /* api callbacks */ - ot->exec= nlaedit_enable_tweakmode_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->exec = nlaedit_enable_tweakmode_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ------------- */ @@ -223,16 +223,16 @@ static int nlaedit_disable_tweakmode_exec (bContext *C, wmOperator *op) void NLA_OT_tweakmode_exit (wmOperatorType *ot) { /* identifiers */ - ot->name= "Exit Tweak Mode"; - ot->idname= "NLA_OT_tweakmode_exit"; - ot->description= "Exit tweaking mode for the action referenced by the active strip"; + ot->name = "Exit Tweak Mode"; + ot->idname = "NLA_OT_tweakmode_exit"; + ot->description = "Exit tweaking mode for the action referenced by the active strip"; /* api callbacks */ - ot->exec= nlaedit_disable_tweakmode_exec; - ot->poll= nlaop_poll_tweakmode_on; + ot->exec = nlaedit_disable_tweakmode_exec; + ot->poll = nlaop_poll_tweakmode_on; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* *********************************************** */ @@ -338,31 +338,31 @@ static int nlaedit_viewsel_exec(bContext *C, wmOperator *UNUSED(op)) void NLA_OT_view_all (wmOperatorType *ot) { /* identifiers */ - ot->name= "View All"; - ot->idname= "NLA_OT_view_all"; - ot->description= "Reset viewable area to show full strips range"; + ot->name = "View All"; + ot->idname = "NLA_OT_view_all"; + ot->description = "Reset viewable area to show full strips range"; /* api callbacks */ - ot->exec= nlaedit_viewall_exec; - ot->poll= ED_operator_nla_active; + ot->exec = nlaedit_viewall_exec; + ot->poll = ED_operator_nla_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } void NLA_OT_view_selected (wmOperatorType *ot) { /* identifiers */ - ot->name= "View Selected"; - ot->idname= "NLA_OT_view_selected"; - ot->description= "Reset viewable area to show selected strips range"; + ot->name = "View Selected"; + ot->idname = "NLA_OT_view_selected"; + ot->description = "Reset viewable area to show selected strips range"; /* api callbacks */ - ot->exec= nlaedit_viewsel_exec; - ot->poll= ED_operator_nla_active; + ot->exec = nlaedit_viewsel_exec; + ot->poll = ED_operator_nla_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* *********************************************** */ @@ -473,23 +473,23 @@ void NLA_OT_actionclip_add (wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Add Action Strip"; - 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"; + ot->name = "Add Action Strip"; + 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 */ - ot->invoke= WM_enum_search_invoke; - ot->exec= nlaedit_add_actionclip_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->invoke = WM_enum_search_invoke; + ot->exec = nlaedit_add_actionclip_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ // TODO: this would be nicer as an ID-pointer... prop= RNA_def_enum(ot->srna, "action", DummyRNA_NULL_items, 0, "Action", ""); RNA_def_enum_funcs(prop, RNA_action_itemf); - ot->prop= prop; + ot->prop = prop; } /* ******************** Add Transition Operator ***************************** */ @@ -598,16 +598,16 @@ static int nlaedit_add_transition_exec (bContext *C, wmOperator *op) void NLA_OT_transition_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Transition"; - ot->idname= "NLA_OT_transition_add"; - ot->description= "Add a transition strip between two adjacent selected strips"; + ot->name = "Add Transition"; + ot->idname = "NLA_OT_transition_add"; + ot->description = "Add a transition strip between two adjacent selected strips"; /* api callbacks */ - ot->exec= nlaedit_add_transition_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->exec = nlaedit_add_transition_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************** Add Sound Clip Operator ***************************** */ @@ -683,16 +683,16 @@ static int nlaedit_add_sound_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_soundclip_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Sound Clip"; - ot->idname= "NLA_OT_soundclip_add"; - ot->description= "Add a strip for controlling when speaker plays its sound clip"; + ot->name = "Add Sound Clip"; + ot->idname = "NLA_OT_soundclip_add"; + ot->description = "Add a strip for controlling when speaker plays its sound clip"; /* api callbacks */ - ot->exec= nlaedit_add_sound_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->exec = nlaedit_add_sound_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************** Add Meta-Strip Operator ***************************** */ @@ -745,16 +745,16 @@ static int nlaedit_add_meta_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_meta_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Meta-Strips"; - ot->idname= "NLA_OT_meta_add"; - ot->description= "Add new meta-strips incorporating the selected strips"; + ot->name = "Add Meta-Strips"; + ot->idname = "NLA_OT_meta_add"; + ot->description = "Add new meta-strips incorporating the selected strips"; /* api callbacks */ - ot->exec= nlaedit_add_meta_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->exec = nlaedit_add_meta_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************** Remove Meta-Strip Operator ***************************** */ @@ -797,16 +797,16 @@ static int nlaedit_remove_meta_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_meta_remove (wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Meta-Strips"; - ot->idname= "NLA_OT_meta_remove"; - ot->description= "Separate out the strips held by the selected meta-strips"; + ot->name = "Remove Meta-Strips"; + ot->idname = "NLA_OT_meta_remove"; + ot->description = "Separate out the strips held by the selected meta-strips"; /* api callbacks */ - ot->exec= nlaedit_remove_meta_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->exec = nlaedit_remove_meta_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************** Duplicate Strips Operator ************************** */ @@ -900,17 +900,17 @@ static int nlaedit_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED 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->name = "Duplicate Strips"; + ot->idname = "NLA_OT_duplicate"; + ot->description = "Duplicate selected NLA-Strips, adding the new strips in new tracks above the originals"; /* api callbacks */ - ot->invoke= nlaedit_duplicate_invoke; - ot->exec= nlaedit_duplicate_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->invoke = nlaedit_duplicate_invoke; + ot->exec = nlaedit_duplicate_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* to give to transform */ RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); @@ -975,16 +975,16 @@ static int nlaedit_delete_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_delete (wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Strips"; - ot->idname= "NLA_OT_delete"; - ot->description= "Delete selected strips"; + ot->name = "Delete Strips"; + ot->idname = "NLA_OT_delete"; + ot->description = "Delete selected strips"; /* api callbacks */ - ot->exec= nlaedit_delete_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->exec = nlaedit_delete_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************** Split Strips Operator ***************************** */ @@ -1120,16 +1120,16 @@ static int nlaedit_split_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_split (wmOperatorType *ot) { /* identifiers */ - ot->name= "Split Strips"; - ot->idname= "NLA_OT_split"; - ot->description= "Split selected strips at their midpoints"; + ot->name = "Split Strips"; + ot->idname = "NLA_OT_split"; + ot->description = "Split selected strips at their midpoints"; /* api callbacks */ - ot->exec= nlaedit_split_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->exec = nlaedit_split_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************** Bake Strips Operator ***************************** */ @@ -1173,16 +1173,16 @@ static int nlaedit_bake_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_bake (wmOperatorType *ot) { /* identifiers */ - ot->name= "Bake Strips"; - ot->idname= "NLA_OT_bake"; - ot->description= "Bake all strips of selected AnimData blocks"; + ot->name = "Bake Strips"; + ot->idname = "NLA_OT_bake"; + ot->description = "Bake all strips of selected AnimData blocks"; /* api callbacks */ - ot->exec= nlaedit_bake_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->exec = nlaedit_bake_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* *********************************************** */ @@ -1235,16 +1235,16 @@ static int nlaedit_toggle_mute_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_mute_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Muting"; - ot->idname= "NLA_OT_mute_toggle"; - ot->description= "Mute or un-mute selected strips"; + ot->name = "Toggle Muting"; + ot->idname = "NLA_OT_mute_toggle"; + ot->description = "Mute or un-mute selected strips"; /* api callbacks */ - ot->exec= nlaedit_toggle_mute_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->exec = nlaedit_toggle_mute_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************** Swap Strips Operator ************************** */ @@ -1392,16 +1392,16 @@ static int nlaedit_swap_exec (bContext *C, wmOperator *op) void NLA_OT_swap (wmOperatorType *ot) { /* identifiers */ - ot->name= "Swap Strips"; - ot->idname= "NLA_OT_swap"; - ot->description= "Swap order of selected strips within tracks"; + ot->name = "Swap Strips"; + ot->idname = "NLA_OT_swap"; + ot->description = "Swap order of selected strips within tracks"; /* api callbacks */ - ot->exec= nlaedit_swap_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->exec = nlaedit_swap_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************** Move Strips Up Operator ************************** */ @@ -1466,16 +1466,16 @@ static int nlaedit_move_up_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_move_up (wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Strips Up"; - ot->idname= "NLA_OT_move_up"; - ot->description= "Move selected strips up a track if there's room"; + ot->name = "Move Strips Up"; + ot->idname = "NLA_OT_move_up"; + ot->description = "Move selected strips up a track if there's room"; /* api callbacks */ - ot->exec= nlaedit_move_up_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->exec = nlaedit_move_up_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************** Move Strips Down Operator ************************** */ @@ -1540,16 +1540,16 @@ static int nlaedit_move_down_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_move_down (wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Strips Down"; - ot->idname= "NLA_OT_move_down"; - ot->description= "Move selected strips down a track if there's room"; + ot->name = "Move Strips Down"; + ot->idname = "NLA_OT_move_down"; + ot->description = "Move selected strips down a track if there's room"; /* api callbacks */ - ot->exec= nlaedit_move_down_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->exec = nlaedit_move_down_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************** Sync Action Length Operator ***************************** */ @@ -1616,19 +1616,19 @@ static int nlaedit_sync_actlen_exec (bContext *C, wmOperator *op) void NLA_OT_action_sync_length (wmOperatorType *ot) { /* identifiers */ - ot->name= "Sync Action Length"; - ot->idname= "NLA_OT_action_sync_length"; - ot->description= "Synchronize the length of the referenced Action with the length used in the strip"; + ot->name = "Sync Action Length"; + ot->idname = "NLA_OT_action_sync_length"; + ot->description = "Synchronize the length of the referenced Action with the length used in the strip"; /* api callbacks */ - ot->exec= nlaedit_sync_actlen_exec; - ot->poll= ED_operator_nla_active; // XXX: is this satisfactory... probably requires a check for active strip... + ot->exec = nlaedit_sync_actlen_exec; + ot->poll = ED_operator_nla_active; // XXX: is this satisfactory... probably requires a check for active strip... /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_boolean(ot->srna, "active", 1, "Active Strip Only", "Only sync the active length for the active strip"); + ot->prop = RNA_def_boolean(ot->srna, "active", 1, "Active Strip Only", "Only sync the active length for the active strip"); } /* ******************** Apply Scale Operator ***************************** */ @@ -1716,16 +1716,16 @@ static int nlaedit_apply_scale_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_apply_scale (wmOperatorType *ot) { /* identifiers */ - ot->name= "Apply Scale"; - ot->idname= "NLA_OT_apply_scale"; - ot->description= "Apply scaling of selected strips to their referenced Actions"; + ot->name = "Apply Scale"; + ot->idname = "NLA_OT_apply_scale"; + ot->description = "Apply scaling of selected strips to their referenced Actions"; /* api callbacks */ - ot->exec= nlaedit_apply_scale_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->exec = nlaedit_apply_scale_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************** Clear Scale Operator ***************************** */ @@ -1779,16 +1779,16 @@ static int nlaedit_clear_scale_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_clear_scale (wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Scale"; - ot->idname= "NLA_OT_clear_scale"; - ot->description= "Reset scaling of selected strips"; + ot->name = "Clear Scale"; + ot->idname = "NLA_OT_clear_scale"; + ot->description = "Reset scaling of selected strips"; /* api callbacks */ - ot->exec= nlaedit_clear_scale_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->exec = nlaedit_clear_scale_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ******************** Snap Strips Operator ************************** */ @@ -1920,20 +1920,20 @@ static int nlaedit_snap_exec (bContext *C, wmOperator *op) void NLA_OT_snap (wmOperatorType *ot) { /* identifiers */ - ot->name= "Snap Strips"; - ot->idname= "NLA_OT_snap"; - ot->description= "Move start of strips to specified time"; + ot->name = "Snap Strips"; + ot->idname = "NLA_OT_snap"; + ot->description = "Move start of strips to specified time"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= nlaedit_snap_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->invoke = WM_menu_invoke; + ot->exec = nlaedit_snap_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_nlaedit_snap_types, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_nlaedit_snap_types, 0, "Type", ""); } /* *********************************************** */ @@ -2039,20 +2039,20 @@ static int nla_fmodifier_add_exec(bContext *C, wmOperator *op) void NLA_OT_fmodifier_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add F-Modifier"; - ot->idname= "NLA_OT_fmodifier_add"; - ot->description= "Add a F-Modifier of the specified type to the selected NLA-Strips"; + ot->name = "Add F-Modifier"; + ot->idname = "NLA_OT_fmodifier_add"; + ot->description = "Add a F-Modifier of the specified type to the selected NLA-Strips"; /* api callbacks */ - ot->invoke= nla_fmodifier_add_invoke; - ot->exec= nla_fmodifier_add_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->invoke = nla_fmodifier_add_invoke; + ot->exec = nla_fmodifier_add_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", fmodifier_type_items, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", fmodifier_type_items, 0, "Type", ""); RNA_def_boolean(ot->srna, "only_active", 0, "Only Active", "Only add a F-Modifier of the specified type to the active strip"); } @@ -2103,16 +2103,16 @@ static int nla_fmodifier_copy_exec(bContext *C, wmOperator *op) void NLA_OT_fmodifier_copy (wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy F-Modifiers"; - ot->idname= "NLA_OT_fmodifier_copy"; - ot->description= "Copy the F-Modifier(s) of the active NLA-Strip"; + ot->name = "Copy F-Modifiers"; + ot->idname = "NLA_OT_fmodifier_copy"; + ot->description = "Copy the F-Modifier(s) of the active NLA-Strip"; /* api callbacks */ - ot->exec= nla_fmodifier_copy_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->exec = nla_fmodifier_copy_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ //ot->prop = RNA_def_boolean(ot->srna, "all", 1, "All F-Modifiers", "Copy all the F-Modifiers, instead of just the active one"); @@ -2165,16 +2165,16 @@ static int nla_fmodifier_paste_exec(bContext *C, wmOperator *op) void NLA_OT_fmodifier_paste (wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste F-Modifiers"; - ot->idname= "NLA_OT_fmodifier_paste"; - ot->description= "Add copied F-Modifiers to the selected NLA-Strips"; + ot->name = "Paste F-Modifiers"; + ot->idname = "NLA_OT_fmodifier_paste"; + ot->description = "Add copied F-Modifiers to the selected NLA-Strips"; /* api callbacks */ - ot->exec= nla_fmodifier_paste_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->exec = nla_fmodifier_paste_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* *********************************************** */ diff --git a/source/blender/editors/space_nla/nla_select.c b/source/blender/editors/space_nla/nla_select.c index 683dfc4f7a3..fba0e5157a6 100644 --- a/source/blender/editors/space_nla/nla_select.c +++ b/source/blender/editors/space_nla/nla_select.c @@ -186,16 +186,16 @@ static int nlaedit_deselectall_exec(bContext *C, wmOperator *op) void NLA_OT_select_all_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= "(De)select All"; - ot->idname= "NLA_OT_select_all_toggle"; - ot->description= "Select or deselect all NLA-Strips"; + ot->name = "(De)select All"; + ot->idname = "NLA_OT_select_all_toggle"; + ot->description = "Select or deselect all NLA-Strips"; /* api callbacks */ - ot->exec= nlaedit_deselectall_exec; - ot->poll= nlaop_poll_tweakmode_off; + ot->exec = nlaedit_deselectall_exec; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/; + ot->flag = OPTYPE_REGISTER/*|OPTYPE_UNDO*/; /* props */ RNA_def_boolean(ot->srna, "invert", 0, "Invert", ""); @@ -331,20 +331,20 @@ static int nlaedit_borderselect_exec(bContext *C, wmOperator *op) void NLA_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Select"; - ot->idname= "NLA_OT_select_border"; - ot->description= "Use box selection to grab NLA-Strips"; + ot->name = "Border Select"; + ot->idname = "NLA_OT_select_border"; + ot->description = "Use box selection to grab NLA-Strips"; /* api callbacks */ - ot->invoke= WM_border_select_invoke; - ot->exec= nlaedit_borderselect_exec; - ot->modal= WM_border_select_modal; - ot->cancel= WM_border_select_cancel; + ot->invoke = WM_border_select_invoke; + ot->exec = nlaedit_borderselect_exec; + ot->modal = WM_border_select_modal; + ot->cancel = WM_border_select_cancel; - ot->poll= nlaop_poll_tweakmode_off; + ot->poll = nlaop_poll_tweakmode_off; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* rna */ WM_operator_properties_gesture_border(ot, 1); @@ -484,20 +484,20 @@ static int nlaedit_select_leftright_invoke (bContext *C, wmOperator *op, wmEvent void NLA_OT_select_leftright (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Left/Right"; - ot->idname= "NLA_OT_select_leftright"; - ot->description= "Select strips to the left or the right of the current frame"; + ot->name = "Select Left/Right"; + ot->idname = "NLA_OT_select_leftright"; + ot->description = "Select strips to the left or the right of the current frame"; /* api callbacks */ - ot->invoke= nlaedit_select_leftright_invoke; - ot->exec= nlaedit_select_leftright_exec; - ot->poll= ED_operator_nla_active; + ot->invoke = nlaedit_select_leftright_invoke; + ot->exec = nlaedit_select_leftright_exec; + ot->poll = ED_operator_nla_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "mode", prop_nlaedit_leftright_select_types, NLAEDIT_LRSEL_TEST, "Mode", ""); + ot->prop = RNA_def_enum(ot->srna, "mode", prop_nlaedit_leftright_select_types, NLAEDIT_LRSEL_TEST, "Mode", ""); RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); } @@ -646,16 +646,16 @@ static int nlaedit_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *even void NLA_OT_click_select (wmOperatorType *ot) { /* identifiers */ - ot->name= "Mouse Select"; - ot->idname= "NLA_OT_click_select"; - ot->description= "Handle clicks to select NLA Strips"; + ot->name = "Mouse Select"; + ot->idname = "NLA_OT_click_select"; + ot->description = "Handle clicks to select NLA Strips"; /* api callbacks - absolutely no exec() this yet... */ - ot->invoke= nlaedit_clickselect_invoke; - ot->poll= ED_operator_nla_active; + ot->invoke = nlaedit_clickselect_invoke; + ot->poll = ED_operator_nla_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY diff --git a/source/blender/editors/space_node/node_buttons.c b/source/blender/editors/space_node/node_buttons.c index 1b5f2417384..fce4c6d3504 100644 --- a/source/blender/editors/space_node/node_buttons.c +++ b/source/blender/editors/space_node/node_buttons.c @@ -202,13 +202,13 @@ static int node_properties_poll(bContext *C) void NODE_OT_properties(wmOperatorType *ot) { - ot->name= "Properties"; - ot->description= "Toggles the properties panel display"; - ot->idname= "NODE_OT_properties"; + ot->name = "Properties"; + ot->description = "Toggles the properties panel display"; + ot->idname = "NODE_OT_properties"; - ot->exec= node_properties; - ot->poll= node_properties_poll; + ot->exec = node_properties; + ot->poll = node_properties_poll; /* flags */ - ot->flag= 0; + ot->flag = 0; } diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 80fc5f68591..5a3d9160b58 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -1279,18 +1279,18 @@ static int snode_bg_viewmove_cancel(bContext *UNUSED(C), wmOperator *op) void NODE_OT_backimage_move(wmOperatorType *ot) { /* identifiers */ - ot->name= "Background Image Move"; + ot->name = "Background Image Move"; ot->description = "Move Node backdrop"; - ot->idname= "NODE_OT_backimage_move"; + ot->idname = "NODE_OT_backimage_move"; /* api callbacks */ - ot->invoke= snode_bg_viewmove_invoke; - ot->modal= snode_bg_viewmove_modal; - ot->poll= composite_node_active; - ot->cancel= snode_bg_viewmove_cancel; + ot->invoke = snode_bg_viewmove_invoke; + ot->modal = snode_bg_viewmove_modal; + ot->poll = composite_node_active; + ot->cancel = snode_bg_viewmove_cancel; /* flags */ - ot->flag= OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; + ot->flag = OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; } static int backimage_zoom(bContext *C, wmOperator *op) @@ -1310,15 +1310,15 @@ void NODE_OT_backimage_zoom(wmOperatorType *ot) { /* identifiers */ - ot->name= "Background Image Zoom"; - ot->idname= "NODE_OT_backimage_zoom"; + ot->name = "Background Image Zoom"; + ot->idname = "NODE_OT_backimage_zoom"; /* api callbacks */ - ot->exec= backimage_zoom; - ot->poll= composite_node_active; + ot->exec = backimage_zoom; + ot->poll = composite_node_active; /* flags */ - ot->flag= OPTYPE_BLOCKING; + ot->flag = OPTYPE_BLOCKING; /* internal */ RNA_def_float(ot->srna, "factor", 1.2f, 0.0f, 10.0f, "Factor", "", 0.0f, 10.0f); @@ -1476,17 +1476,17 @@ static int sample_cancel(bContext *C, wmOperator *op) void NODE_OT_backimage_sample(wmOperatorType *ot) { /* identifiers */ - ot->name= "Backimage Sample"; - ot->idname= "NODE_OT_backimage_sample"; + ot->name = "Backimage Sample"; + ot->idname = "NODE_OT_backimage_sample"; /* api callbacks */ - ot->invoke= sample_invoke; - ot->modal= sample_modal; - ot->cancel= sample_cancel; - ot->poll= ED_operator_node_active; + ot->invoke = sample_invoke; + ot->modal = sample_modal; + ot->cancel = sample_cancel; + ot->poll = ED_operator_node_active; /* flags */ - ot->flag= OPTYPE_BLOCKING; + ot->flag = OPTYPE_BLOCKING; } /* ********************** size widget operator ******************** */ @@ -1587,17 +1587,17 @@ static int node_resize_cancel(bContext *UNUSED(C), wmOperator *op) void NODE_OT_resize(wmOperatorType *ot) { /* identifiers */ - ot->name= "Resize Node"; - ot->idname= "NODE_OT_resize"; + ot->name = "Resize Node"; + ot->idname = "NODE_OT_resize"; /* api callbacks */ - ot->invoke= node_resize_invoke; - ot->modal= node_resize_modal; - ot->poll= ED_operator_node_active; - ot->cancel= node_resize_cancel; + ot->invoke = node_resize_invoke; + ot->modal = node_resize_modal; + ot->poll = ED_operator_node_active; + ot->cancel = node_resize_cancel; /* flags */ - ot->flag= OPTYPE_BLOCKING; + ot->flag = OPTYPE_BLOCKING; } @@ -1757,16 +1757,16 @@ static int node_active_link_viewer(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_link_viewer(wmOperatorType *ot) { /* identifiers */ - ot->name= "Link to Viewer Node"; + ot->name = "Link to Viewer Node"; ot->description = "Link to viewer node"; - ot->idname= "NODE_OT_link_viewer"; + ot->idname = "NODE_OT_link_viewer"; /* api callbacks */ - ot->exec= node_active_link_viewer; - ot->poll= composite_node_active; + ot->exec = node_active_link_viewer; + ot->poll = composite_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -2240,16 +2240,16 @@ static int node_duplicate_exec(bContext *C, wmOperator *op) void NODE_OT_duplicate(wmOperatorType *ot) { /* identifiers */ - ot->name= "Duplicate Nodes"; + ot->name = "Duplicate Nodes"; ot->description = "Duplicate selected nodes"; - ot->idname= "NODE_OT_duplicate"; + ot->idname = "NODE_OT_duplicate"; /* api callbacks */ - ot->exec= node_duplicate_exec; - ot->poll= ED_operator_node_active; + ot->exec = node_duplicate_exec; + ot->poll = ED_operator_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "keep_inputs", 0, "Keep Inputs", "Keep the input links to duplicated nodes"); } @@ -2564,18 +2564,18 @@ static int node_link_cancel(bContext *C, wmOperator *op) void NODE_OT_link(wmOperatorType *ot) { /* identifiers */ - ot->name= "Link Nodes"; - ot->idname= "NODE_OT_link"; + ot->name = "Link Nodes"; + ot->idname = "NODE_OT_link"; /* api callbacks */ - ot->invoke= node_link_invoke; - ot->modal= node_link_modal; -// ot->exec= node_link_exec; - ot->poll= ED_operator_node_active; - ot->cancel= node_link_cancel; + ot->invoke = node_link_invoke; + ot->modal = node_link_modal; +// ot->exec = node_link_exec; + ot->poll = ED_operator_node_active; + ot->cancel = node_link_cancel; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; } /* ********************** Make Link operator ***************** */ @@ -2604,16 +2604,16 @@ static int node_make_link_exec(bContext *C, wmOperator *op) void NODE_OT_link_make(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Links"; - ot->description= "Makes a link between selected output in input sockets"; - ot->idname= "NODE_OT_link_make"; + ot->name = "Make Links"; + ot->description = "Makes a link between selected output in input sockets"; + ot->idname = "NODE_OT_link_make"; /* callbacks */ - ot->exec= node_make_link_exec; - ot->poll= ED_operator_node_active; // XXX we need a special poll which checks that there are selected input/output sockets + ot->exec = node_make_link_exec; + ot->poll = ED_operator_node_active; // XXX we need a special poll which checks that there are selected input/output sockets /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "replace", 0, "Replace", "Replace socket connections with the new links"); } @@ -2682,18 +2682,18 @@ void NODE_OT_links_cut(wmOperatorType *ot) { PropertyRNA *prop; - ot->name= "Cut links"; - ot->idname= "NODE_OT_links_cut"; + ot->name = "Cut links"; + ot->idname = "NODE_OT_links_cut"; - ot->invoke= WM_gesture_lines_invoke; - ot->modal= WM_gesture_lines_modal; - ot->exec= cut_links_exec; - ot->cancel= WM_gesture_lines_cancel; + ot->invoke = WM_gesture_lines_invoke; + ot->modal = WM_gesture_lines_modal; + ot->exec = cut_links_exec; + ot->cancel = WM_gesture_lines_cancel; - ot->poll= ED_operator_node_active; + ot->poll = ED_operator_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; prop= RNA_def_property(ot->srna, "path", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_runtime(prop, &RNA_OperatorMousePath); @@ -2727,14 +2727,14 @@ static int detach_links_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_links_detach(wmOperatorType *ot) { - ot->name= "Detach Links"; - ot->idname= "NODE_OT_links_detach"; + ot->name = "Detach Links"; + ot->idname = "NODE_OT_links_detach"; - ot->exec= detach_links_exec; - ot->poll= ED_operator_node_active; + ot->exec = detach_links_exec; + ot->poll = ED_operator_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ********************* automatic node insert on dragging ******************* */ @@ -2921,15 +2921,15 @@ static int node_read_renderlayers_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_read_renderlayers(wmOperatorType *ot) { - ot->name= "Read Render Layers"; - ot->idname= "NODE_OT_read_renderlayers"; + ot->name = "Read Render Layers"; + ot->idname = "NODE_OT_read_renderlayers"; - ot->exec= node_read_renderlayers_exec; + ot->exec = node_read_renderlayers_exec; - ot->poll= composite_node_active; + ot->poll = composite_node_active; /* flags */ - ot->flag= 0; + ot->flag = 0; } static int node_read_fullsamplelayers_exec(bContext *C, wmOperator *UNUSED(op)) @@ -2954,15 +2954,15 @@ static int node_read_fullsamplelayers_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_read_fullsamplelayers(wmOperatorType *ot) { - ot->name= "Read Full Sample Layers"; - ot->idname= "NODE_OT_read_fullsamplelayers"; + ot->name = "Read Full Sample Layers"; + ot->idname = "NODE_OT_read_fullsamplelayers"; - ot->exec= node_read_fullsamplelayers_exec; + ot->exec = node_read_fullsamplelayers_exec; - ot->poll= composite_node_active; + ot->poll = composite_node_active; /* flags */ - ot->flag= 0; + ot->flag = 0; } int node_render_changed_exec(bContext *C, wmOperator *UNUSED(op)) @@ -3002,15 +3002,15 @@ int node_render_changed_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_render_changed(wmOperatorType *ot) { - ot->name= "Render Changed Layer"; - ot->idname= "NODE_OT_render_changed"; + ot->name = "Render Changed Layer"; + ot->idname = "NODE_OT_render_changed"; - ot->exec= node_render_changed_exec; + ot->exec = node_render_changed_exec; - ot->poll= composite_node_active; + ot->poll = composite_node_active; /* flags */ - ot->flag= 0; + ot->flag = 0; } @@ -3142,16 +3142,16 @@ static int node_hide_toggle_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_hide_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Hide"; - ot->description= "Toggle hiding of selected nodes"; - ot->idname= "NODE_OT_hide_toggle"; + ot->name = "Hide"; + ot->description = "Toggle hiding of selected nodes"; + ot->idname = "NODE_OT_hide_toggle"; /* callbacks */ - ot->exec= node_hide_toggle_exec; - ot->poll= ED_operator_node_active; + ot->exec = node_hide_toggle_exec; + ot->poll = ED_operator_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int node_preview_toggle_exec(bContext *C, wmOperator *UNUSED(op)) @@ -3174,16 +3174,16 @@ static int node_preview_toggle_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_preview_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Node Preview"; - ot->description= "Toggle preview display for selected nodes"; - ot->idname= "NODE_OT_preview_toggle"; + ot->name = "Toggle Node Preview"; + ot->description = "Toggle preview display for selected nodes"; + ot->idname = "NODE_OT_preview_toggle"; /* callbacks */ - ot->exec= node_preview_toggle_exec; - ot->poll= ED_operator_node_active; + ot->exec = node_preview_toggle_exec; + ot->poll = ED_operator_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int node_options_toggle_exec(bContext *C, wmOperator *UNUSED(op)) @@ -3204,16 +3204,16 @@ static int node_options_toggle_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_options_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Node Options"; - ot->description= "Toggle option buttons display for selected nodes"; - ot->idname= "NODE_OT_options_toggle"; + ot->name = "Toggle Node Options"; + ot->description = "Toggle option buttons display for selected nodes"; + ot->idname = "NODE_OT_options_toggle"; /* callbacks */ - ot->exec= node_options_toggle_exec; - ot->poll= ED_operator_node_active; + ot->exec = node_options_toggle_exec; + ot->poll = ED_operator_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int node_socket_toggle_exec(bContext *C, wmOperator *UNUSED(op)) @@ -3255,16 +3255,16 @@ static int node_socket_toggle_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_hide_socket_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Hidden Node Sockets"; - ot->description= "Toggle unused node socket display"; - ot->idname= "NODE_OT_hide_socket_toggle"; + ot->name = "Toggle Hidden Node Sockets"; + ot->description = "Toggle unused node socket display"; + ot->idname = "NODE_OT_hide_socket_toggle"; /* callbacks */ - ot->exec= node_socket_toggle_exec; - ot->poll= ED_operator_node_active; + ot->exec = node_socket_toggle_exec; + ot->poll = ED_operator_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ****************** Mute operator *********************** */ @@ -3293,16 +3293,16 @@ static int node_mute_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_mute_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Node Mute"; - ot->description= "Toggle muting of the nodes"; - ot->idname= "NODE_OT_mute_toggle"; + ot->name = "Toggle Node Mute"; + ot->description = "Toggle muting of the nodes"; + ot->idname = "NODE_OT_mute_toggle"; /* callbacks */ - ot->exec= node_mute_exec; - ot->poll= ED_operator_node_active; + ot->exec = node_mute_exec; + ot->poll = ED_operator_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ****************** Delete operator ******************* */ @@ -3335,16 +3335,16 @@ static int node_delete_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete"; + ot->name = "Delete"; ot->description = "Delete selected nodes"; - ot->idname= "NODE_OT_delete"; + ot->idname = "NODE_OT_delete"; /* api callbacks */ - ot->exec= node_delete_exec; - ot->poll= ED_operator_node_active; + ot->exec = node_delete_exec; + ot->poll = ED_operator_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ****************** Delete with reconnect ******************* */ @@ -3378,16 +3378,16 @@ static int node_delete_reconnect_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_delete_reconnect(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete with reconnect"; + ot->name = "Delete with reconnect"; ot->description = "Delete nodes; will reconnect nodes as if deletion was muted"; - ot->idname= "NODE_OT_delete_reconnect"; + ot->idname = "NODE_OT_delete_reconnect"; /* api callbacks */ - ot->exec= node_delete_reconnect_exec; - ot->poll= ED_operator_node_active; + ot->exec = node_delete_reconnect_exec; + ot->poll = ED_operator_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ****************** Show Cyclic Dependencies Operator ******************* */ @@ -3406,16 +3406,16 @@ static int node_show_cycles_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_show_cyclic_dependencies(wmOperatorType *ot) { /* identifiers */ - ot->name= "Show Cyclic Dependencies"; - ot->description= "Sort the nodes and show the cyclic dependencies between the nodes"; - ot->idname= "NODE_OT_show_cyclic_dependencies"; + ot->name = "Show Cyclic Dependencies"; + ot->description = "Sort the nodes and show the cyclic dependencies between the nodes"; + ot->idname = "NODE_OT_show_cyclic_dependencies"; /* callbacks */ - ot->exec= node_show_cycles_exec; - ot->poll= ED_operator_node_active; + ot->exec = node_show_cycles_exec; + ot->poll = ED_operator_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ****************** Add File Node Operator ******************* */ @@ -3505,17 +3505,17 @@ static int node_add_file_invoke(bContext *C, wmOperator *op, wmEvent *event) void NODE_OT_add_file(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add File Node"; - ot->description= "Add a file node to the current node editor"; - ot->idname= "NODE_OT_add_file"; + ot->name = "Add File Node"; + ot->description = "Add a file node to the current node editor"; + ot->idname = "NODE_OT_add_file"; /* callbacks */ - ot->exec= node_add_file_exec; - ot->invoke= node_add_file_invoke; - ot->poll= ED_operator_node_active; + ot->exec = node_add_file_exec; + ot->invoke = node_add_file_invoke; + ot->poll = ED_operator_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY); //XXX TODO, relative_path RNA_def_string(ot->srna, "name", "Image", MAX_ID_NAME-2, "Name", "Datablock name to assign"); @@ -3572,15 +3572,15 @@ static int new_node_tree_exec(bContext *C, wmOperator *op) void NODE_OT_new_node_tree(wmOperatorType *ot) { /* identifiers */ - ot->name= "New node tree"; - ot->idname= "NODE_OT_new_node_tree"; + ot->name = "New node tree"; + ot->idname = "NODE_OT_new_node_tree"; /* api callbacks */ - ot->exec= new_node_tree_exec; - ot->poll= ED_operator_node_active; + ot->exec = new_node_tree_exec; + ot->poll = ED_operator_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_enum(ot->srna, "type", nodetree_type_items, NTREE_COMPOSIT, "Tree Type", ""); RNA_def_string(ot->srna, "name", "NodeTree", MAX_ID_NAME-2, "Name", ""); @@ -3610,16 +3610,16 @@ static int node_output_file_add_socket_exec(bContext *C, wmOperator *op) void NODE_OT_output_file_add_socket(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add File Node Socket"; - ot->description= "Add a new input to a file output node"; - ot->idname= "NODE_OT_output_file_add_socket"; + ot->name = "Add File Node Socket"; + ot->description = "Add a new input to a file output node"; + ot->idname = "NODE_OT_output_file_add_socket"; /* callbacks */ - ot->exec= node_output_file_add_socket_exec; - ot->poll= composite_node_active; + ot->exec = node_output_file_add_socket_exec; + ot->poll = composite_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_string(ot->srna, "file_path", "Image", MAX_NAME, "File Path", "Sub-path of the output file"); } @@ -3646,14 +3646,14 @@ static int node_output_file_remove_active_socket_exec(bContext *C, wmOperator *U void NODE_OT_output_file_remove_active_socket(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove File Node Socket"; - ot->description= "Remove active input from a file output node"; - ot->idname= "NODE_OT_output_file_remove_active_socket"; + ot->name = "Remove File Node Socket"; + ot->description = "Remove active input from a file output node"; + ot->idname = "NODE_OT_output_file_remove_active_socket"; /* callbacks */ - ot->exec= node_output_file_remove_active_socket_exec; - ot->poll= composite_node_active; + ot->exec = node_output_file_remove_active_socket_exec; + ot->poll = composite_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c index fba961b9d16..9c77cbb86cc 100644 --- a/source/blender/editors/space_node/node_select.c +++ b/source/blender/editors/space_node/node_select.c @@ -524,16 +524,16 @@ static int node_select_invoke(bContext *C, wmOperator *op, wmEvent *event) void NODE_OT_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select"; - ot->idname= "NODE_OT_select"; - ot->description= "Select the node under the cursor"; + ot->name = "Select"; + ot->idname = "NODE_OT_select"; + ot->description = "Select the node under the cursor"; /* api callbacks */ - ot->invoke= node_select_invoke; - ot->poll= ED_operator_node_active; + ot->invoke = node_select_invoke; + ot->poll = ED_operator_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_int(ot->srna, "mouse_x", 0, INT_MIN, INT_MAX, "Mouse X", "", INT_MIN, INT_MAX); @@ -603,20 +603,20 @@ static int node_border_select_invoke(bContext *C, wmOperator *op, wmEvent *event void NODE_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Select"; - ot->idname= "NODE_OT_select_border"; - ot->description= "Use box selection to select nodes"; + ot->name = "Border Select"; + ot->idname = "NODE_OT_select_border"; + ot->description = "Use box selection to select nodes"; /* api callbacks */ - ot->invoke= node_border_select_invoke; - ot->exec= node_borderselect_exec; - ot->modal= WM_border_select_modal; - ot->cancel= WM_border_select_cancel; + ot->invoke = node_border_select_invoke; + ot->exec = node_borderselect_exec; + ot->modal = WM_border_select_modal; + ot->cancel = WM_border_select_cancel; - ot->poll= ED_operator_node_active; + ot->poll = ED_operator_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* rna */ WM_operator_properties_gesture_border(ot, TRUE); diff --git a/source/blender/editors/space_node/node_state.c b/source/blender/editors/space_node/node_state.c index 58623e17b10..a9260e80e94 100644 --- a/source/blender/editors/space_node/node_state.c +++ b/source/blender/editors/space_node/node_state.c @@ -120,14 +120,14 @@ static int node_view_all_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_view_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "View All"; - ot->idname= "NODE_OT_view_all"; - ot->description= "Resize view so you can see all nodes"; + ot->name = "View All"; + ot->idname = "NODE_OT_view_all"; + ot->description = "Resize view so you can see all nodes"; /* api callbacks */ - ot->exec= node_view_all_exec; - ot->poll= ED_operator_node_active; + ot->exec = node_view_all_exec; + ot->poll = ED_operator_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index e844688b6c2..27f0231ad05 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -205,13 +205,13 @@ static int outliner_item_openclose(bContext *C, wmOperator *op, wmEvent *event) void OUTLINER_OT_item_openclose(wmOperatorType *ot) { - ot->name= "Open/Close Item"; - ot->idname= "OUTLINER_OT_item_openclose"; - ot->description= "Toggle whether item under cursor is enabled or closed"; + ot->name = "Open/Close Item"; + ot->idname = "OUTLINER_OT_item_openclose"; + ot->description = "Toggle whether item under cursor is enabled or closed"; - ot->invoke= outliner_item_openclose; + ot->invoke = outliner_item_openclose; - ot->poll= ED_operator_outliner_active; + ot->poll = ED_operator_outliner_active; RNA_def_boolean(ot->srna, "all", 1, "All", "Close or open all items"); } @@ -291,13 +291,13 @@ static int outliner_item_rename(bContext *C, wmOperator *UNUSED(op), wmEvent *ev void OUTLINER_OT_item_rename(wmOperatorType *ot) { - ot->name= "Rename Item"; - ot->idname= "OUTLINER_OT_item_rename"; - ot->description= "Rename item under cursor"; + ot->name = "Rename Item"; + ot->idname = "OUTLINER_OT_item_rename"; + ot->description = "Rename item under cursor"; - ot->invoke= outliner_item_rename; + ot->invoke = outliner_item_rename; - ot->poll= ED_operator_outliner_active; + ot->poll = ED_operator_outliner_active; } /* ************************************************************** */ @@ -417,15 +417,15 @@ static int outliner_toggle_visibility_exec(bContext *C, wmOperator *UNUSED(op)) void OUTLINER_OT_visibility_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Visibility"; - ot->idname= "OUTLINER_OT_visibility_toggle"; - ot->description= "Toggle the visibility of selected items"; + ot->name = "Toggle Visibility"; + ot->idname = "OUTLINER_OT_visibility_toggle"; + ot->description = "Toggle the visibility of selected items"; /* callbacks */ - ot->exec= outliner_toggle_visibility_exec; - ot->poll= ED_operator_outliner_active_no_editobject; + ot->exec = outliner_toggle_visibility_exec; + ot->poll = ED_operator_outliner_active_no_editobject; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* Toggle Selectability ---------------------------------------- */ @@ -463,15 +463,15 @@ static int outliner_toggle_selectability_exec(bContext *C, wmOperator *UNUSED(op void OUTLINER_OT_selectability_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Selectability"; - ot->idname= "OUTLINER_OT_selectability_toggle"; - ot->description= "Toggle the selectability"; + ot->name = "Toggle Selectability"; + ot->idname = "OUTLINER_OT_selectability_toggle"; + ot->description = "Toggle the selectability"; /* callbacks */ - ot->exec= outliner_toggle_selectability_exec; - ot->poll= ED_operator_outliner_active_no_editobject; + ot->exec = outliner_toggle_selectability_exec; + ot->poll = ED_operator_outliner_active_no_editobject; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* Toggle Renderability ---------------------------------------- */ @@ -507,15 +507,15 @@ static int outliner_toggle_renderability_exec(bContext *C, wmOperator *UNUSED(op void OUTLINER_OT_renderability_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Renderability"; - ot->idname= "OUTLINER_OT_renderability_toggle"; - ot->description= "Toggle the renderability of selected items"; + ot->name = "Toggle Renderability"; + ot->idname = "OUTLINER_OT_renderability_toggle"; + ot->description = "Toggle the renderability of selected items"; /* callbacks */ - ot->exec= outliner_toggle_renderability_exec; - ot->poll= ED_operator_outliner_active; + ot->exec = outliner_toggle_renderability_exec; + ot->poll = ED_operator_outliner_active; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* =============================================== */ @@ -541,13 +541,13 @@ static int outliner_toggle_expanded_exec(bContext *C, wmOperator *UNUSED(op)) void OUTLINER_OT_expanded_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Expand/Collapse All"; - ot->idname= "OUTLINER_OT_expanded_toggle"; - ot->description= "Expand/Collapse all items"; + ot->name = "Expand/Collapse All"; + ot->idname = "OUTLINER_OT_expanded_toggle"; + ot->description = "Expand/Collapse all items"; /* callbacks */ - ot->exec= outliner_toggle_expanded_exec; - ot->poll= ED_operator_outliner_active; + ot->exec = outliner_toggle_expanded_exec; + ot->poll = ED_operator_outliner_active; /* no undo or registry, UI option */ } @@ -576,13 +576,13 @@ static int outliner_toggle_selected_exec(bContext *C, wmOperator *UNUSED(op)) void OUTLINER_OT_selected_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Selected"; - ot->idname= "OUTLINER_OT_selected_toggle"; - ot->description= "Toggle the Outliner selection of items"; + ot->name = "Toggle Selected"; + ot->idname = "OUTLINER_OT_selected_toggle"; + ot->description = "Toggle the Outliner selection of items"; /* callbacks */ - ot->exec= outliner_toggle_selected_exec; - ot->poll= ED_operator_outliner_active; + ot->exec = outliner_toggle_selected_exec; + ot->poll = ED_operator_outliner_active; /* no undo or registry, UI option */ } @@ -631,13 +631,13 @@ static int outliner_show_active_exec(bContext *C, wmOperator *UNUSED(op)) void OUTLINER_OT_show_active(wmOperatorType *ot) { /* identifiers */ - ot->name= "Show Active"; - ot->idname= "OUTLINER_OT_show_active"; - ot->description= "Adjust the view so that the active Object is shown centered"; + ot->name = "Show Active"; + ot->idname = "OUTLINER_OT_show_active"; + ot->description = "Adjust the view so that the active Object is shown centered"; /* callbacks */ - ot->exec= outliner_show_active_exec; - ot->poll= ED_operator_outliner_active; + ot->exec = outliner_show_active_exec; + ot->poll = ED_operator_outliner_active; } /* View Panning --------------------------------------------------- */ @@ -664,13 +664,13 @@ static int outliner_scroll_page_exec(bContext *C, wmOperator *op) void OUTLINER_OT_scroll_page(wmOperatorType *ot) { /* identifiers */ - ot->name= "Scroll Page"; - ot->idname= "OUTLINER_OT_scroll_page"; - ot->description= "Scroll page up or down"; + ot->name = "Scroll Page"; + ot->idname = "OUTLINER_OT_scroll_page"; + ot->description = "Scroll page up or down"; /* callbacks */ - ot->exec= outliner_scroll_page_exec; - ot->poll= ED_operator_outliner_active; + ot->exec = outliner_scroll_page_exec; + ot->poll = ED_operator_outliner_active; /* properties */ RNA_def_boolean(ot->srna, "up", 0, "Up", "Scroll up one page"); @@ -862,13 +862,13 @@ static int outliner_one_level_exec(bContext *C, wmOperator *op) void OUTLINER_OT_show_one_level(wmOperatorType *ot) { /* identifiers */ - ot->name= "Show/Hide One Level"; - ot->idname= "OUTLINER_OT_show_one_level"; - ot->description= "Expand/collapse all entries by one level"; + ot->name = "Show/Hide One Level"; + ot->idname = "OUTLINER_OT_show_one_level"; + ot->description = "Expand/collapse all entries by one level"; /* callbacks */ - ot->exec= outliner_one_level_exec; - ot->poll= ED_operator_outliner_active; + ot->exec = outliner_one_level_exec; + ot->poll = ED_operator_outliner_active; /* no undo or registry, UI option */ @@ -936,13 +936,13 @@ static int outliner_show_hierarchy_exec(bContext *C, wmOperator *UNUSED(op)) void OUTLINER_OT_show_hierarchy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Show Hierarchy"; - ot->idname= "OUTLINER_OT_show_hierarchy"; - ot->description= "Open all object entries and close all others"; + ot->name = "Show Hierarchy"; + ot->idname = "OUTLINER_OT_show_hierarchy"; + ot->description = "Open all object entries and close all others"; /* callbacks */ - ot->exec= outliner_show_hierarchy_exec; - ot->poll= ED_operator_outliner_active; // TODO: shouldn't be allowed in RNA views... + ot->exec = outliner_show_hierarchy_exec; + ot->poll = ED_operator_outliner_active; // TODO: shouldn't be allowed in RNA views... /* no undo or registry, UI option */ } @@ -1206,13 +1206,13 @@ static int outliner_drivers_addsel_exec(bContext *C, wmOperator *op) void OUTLINER_OT_drivers_add_selected(wmOperatorType *ot) { /* api callbacks */ - ot->idname= "OUTLINER_OT_drivers_add_selected"; - ot->name= "Add Drivers for Selected"; - ot->description= "Add drivers to selected items"; + ot->idname = "OUTLINER_OT_drivers_add_selected"; + ot->name = "Add Drivers for Selected"; + ot->description = "Add drivers to selected items"; /* api callbacks */ - ot->exec= outliner_drivers_addsel_exec; - ot->poll= ed_operator_outliner_datablocks_active; + ot->exec = outliner_drivers_addsel_exec; + ot->poll = ed_operator_outliner_datablocks_active; /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1241,13 +1241,13 @@ static int outliner_drivers_deletesel_exec(bContext *C, wmOperator *op) void OUTLINER_OT_drivers_delete_selected(wmOperatorType *ot) { /* identifiers */ - ot->idname= "OUTLINER_OT_drivers_delete_selected"; - ot->name= "Delete Drivers for Selected"; - ot->description= "Delete drivers assigned to selected items"; + ot->idname = "OUTLINER_OT_drivers_delete_selected"; + ot->name = "Delete Drivers for Selected"; + ot->description = "Delete drivers assigned to selected items"; /* api callbacks */ - ot->exec= outliner_drivers_deletesel_exec; - ot->poll= ed_operator_outliner_datablocks_active; + ot->exec = outliner_drivers_deletesel_exec; + ot->poll = ed_operator_outliner_datablocks_active; /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1380,13 +1380,13 @@ static int outliner_keyingset_additems_exec(bContext *C, wmOperator *op) void OUTLINER_OT_keyingset_add_selected(wmOperatorType *ot) { /* identifiers */ - ot->idname= "OUTLINER_OT_keyingset_add_selected"; - ot->name= "Keying Set Add Selected"; - ot->description= "Add selected items (blue-grey rows) to active Keying Set"; + ot->idname = "OUTLINER_OT_keyingset_add_selected"; + ot->name = "Keying Set Add Selected"; + ot->description = "Add selected items (blue-grey rows) to active Keying Set"; /* api callbacks */ - ot->exec= outliner_keyingset_additems_exec; - ot->poll= ed_operator_outliner_datablocks_active; + ot->exec = outliner_keyingset_additems_exec; + ot->poll = ed_operator_outliner_datablocks_active; /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1417,13 +1417,13 @@ static int outliner_keyingset_removeitems_exec(bContext *C, wmOperator *UNUSED(o void OUTLINER_OT_keyingset_remove_selected(wmOperatorType *ot) { /* identifiers */ - ot->idname= "OUTLINER_OT_keyingset_remove_selected"; - ot->name= "Keying Set Remove Selected"; + ot->idname = "OUTLINER_OT_keyingset_remove_selected"; + ot->name = "Keying Set Remove Selected"; ot->description = "Remove selected items (blue-grey rows) from active Keying Set"; /* api callbacks */ - ot->exec= outliner_keyingset_removeitems_exec; - ot->poll= ed_operator_outliner_datablocks_active; + ot->exec = outliner_keyingset_removeitems_exec; + ot->poll = ed_operator_outliner_datablocks_active; /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1624,18 +1624,18 @@ static int parent_drop_invoke(bContext *C, wmOperator *op, wmEvent *event) void OUTLINER_OT_parent_drop(wmOperatorType *ot) { /* identifiers */ - ot->name= "Drop to Set Parent"; + ot->name = "Drop to Set Parent"; ot->description = "Drag to parent in Outliner"; - ot->idname= "OUTLINER_OT_parent_drop"; + ot->idname = "OUTLINER_OT_parent_drop"; /* api callbacks */ - ot->invoke= parent_drop_invoke; - ot->exec= parent_drop_exec; + ot->invoke = parent_drop_invoke; + ot->exec = parent_drop_exec; - ot->poll= ED_operator_outliner_active; + ot->poll = ED_operator_outliner_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_string(ot->srna, "child", "Object", MAX_ID_NAME, "Child", "Child Object"); @@ -1702,17 +1702,17 @@ static int parent_clear_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(even void OUTLINER_OT_parent_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Drop to Clear Parent"; + ot->name = "Drop to Clear Parent"; ot->description = "Drag to clear parent in Outliner"; - ot->idname= "OUTLINER_OT_parent_clear"; + ot->idname = "OUTLINER_OT_parent_clear"; /* api callbacks */ - ot->invoke= parent_clear_invoke; + ot->invoke = parent_clear_invoke; - ot->poll= ED_operator_outliner_active; + ot->poll = ED_operator_outliner_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_string(ot->srna, "dragged_obj", "Object", MAX_ID_NAME, "Child", "Child Object"); diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 4814edf585e..ef9077d09ed 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -863,13 +863,13 @@ static int outliner_item_activate(bContext *C, wmOperator *op, wmEvent *event) void OUTLINER_OT_item_activate(wmOperatorType *ot) { - ot->name= "Activate Item"; - ot->idname= "OUTLINER_OT_item_activate"; - ot->description= "Handle mouse clicks to activate/select items"; + ot->name = "Activate Item"; + ot->idname = "OUTLINER_OT_item_activate"; + ot->description = "Handle mouse clicks to activate/select items"; - ot->invoke= outliner_item_activate; + ot->invoke = outliner_item_activate; - ot->poll= ED_operator_outliner_active; + ot->poll = ED_operator_outliner_active; RNA_def_boolean(ot->srna, "extend", 1, "Extend", "Extend selection for activation"); } @@ -930,20 +930,20 @@ static int outliner_border_select_exec(bContext *C, wmOperator *op) void OUTLINER_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Select"; - ot->idname= "OUTLINER_OT_select_border"; - ot->description= "Use box selection to select tree elements"; + ot->name = "Border Select"; + ot->idname = "OUTLINER_OT_select_border"; + ot->description = "Use box selection to select tree elements"; /* api callbacks */ - ot->invoke= WM_border_select_invoke; - ot->exec= outliner_border_select_exec; - ot->modal= WM_border_select_modal; - ot->cancel= WM_border_select_cancel; + ot->invoke = WM_border_select_invoke; + ot->exec = outliner_border_select_exec; + ot->modal = WM_border_select_modal; + ot->cancel = WM_border_select_cancel; - ot->poll= ED_operator_outliner_active; + ot->poll = ED_operator_outliner_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* rna */ WM_operator_properties_gesture_border(ot, FALSE); diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index c7587935cb3..b53d8ebc4a0 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -619,18 +619,18 @@ static int outliner_object_operation_exec(bContext *C, wmOperator *op) void OUTLINER_OT_object_operation(wmOperatorType *ot) { /* identifiers */ - ot->name= "Outliner Object Operation"; - ot->idname= "OUTLINER_OT_object_operation"; - ot->description= ""; + ot->name = "Outliner Object Operation"; + ot->idname = "OUTLINER_OT_object_operation"; + ot->description = ""; /* callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= outliner_object_operation_exec; - ot->poll= ED_operator_outliner_active; + ot->invoke = WM_menu_invoke; + ot->exec = outliner_object_operation_exec; + ot->poll = ED_operator_outliner_active; - ot->flag= 0; + ot->flag = 0; - ot->prop= RNA_def_enum(ot->srna, "type", prop_object_op_types, 0, "Object Operation", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_object_op_types, 0, "Object Operation", ""); } /* **************************************** */ @@ -699,18 +699,18 @@ static int outliner_group_operation_exec(bContext *C, wmOperator *op) void OUTLINER_OT_group_operation(wmOperatorType *ot) { /* identifiers */ - ot->name= "Outliner Group Operation"; - ot->idname= "OUTLINER_OT_group_operation"; - ot->description= ""; + ot->name = "Outliner Group Operation"; + ot->idname = "OUTLINER_OT_group_operation"; + ot->description = ""; /* callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= outliner_group_operation_exec; - ot->poll= ED_operator_outliner_active; + ot->invoke = WM_menu_invoke; + ot->exec = outliner_group_operation_exec; + ot->poll = ED_operator_outliner_active; - ot->flag= 0; + ot->flag = 0; - ot->prop= RNA_def_enum(ot->srna, "type", prop_group_op_types, 0, "Group Operation", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_group_op_types, 0, "Group Operation", ""); } /* **************************************** */ @@ -869,18 +869,18 @@ static int outliner_id_operation_exec(bContext *C, wmOperator *op) void OUTLINER_OT_id_operation(wmOperatorType *ot) { /* identifiers */ - ot->name= "Outliner ID data Operation"; - ot->idname= "OUTLINER_OT_id_operation"; - ot->description= ""; + ot->name = "Outliner ID data Operation"; + ot->idname = "OUTLINER_OT_id_operation"; + ot->description = ""; /* callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= outliner_id_operation_exec; - ot->poll= ED_operator_outliner_active; + ot->invoke = WM_menu_invoke; + ot->exec = outliner_id_operation_exec; + ot->poll = ED_operator_outliner_active; - ot->flag= 0; + ot->flag = 0; - ot->prop= RNA_def_enum(ot->srna, "type", prop_id_op_types, 0, "ID data Operation", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_id_op_types, 0, "ID data Operation", ""); } /* **************************************** */ @@ -972,23 +972,23 @@ void OUTLINER_OT_action_set(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Outliner Set Action"; - ot->idname= "OUTLINER_OT_action_set"; - ot->description= "Change the active action used"; + ot->name = "Outliner Set Action"; + ot->idname = "OUTLINER_OT_action_set"; + ot->description = "Change the active action used"; /* api callbacks */ - ot->invoke= WM_enum_search_invoke; - ot->exec= outliner_action_set_exec; - ot->poll= ED_operator_outliner_active; + ot->invoke = WM_enum_search_invoke; + ot->exec = outliner_action_set_exec; + ot->poll = ED_operator_outliner_active; /* flags */ - ot->flag= 0; + ot->flag = 0; /* props */ // TODO: this would be nicer as an ID-pointer... prop= RNA_def_enum(ot->srna, "action", DummyRNA_NULL_items, 0, "Action", ""); RNA_def_enum_funcs(prop, RNA_action_itemf); - ot->prop= prop; + ot->prop = prop; } /* **************************************** */ @@ -1087,18 +1087,18 @@ static int outliner_animdata_operation_exec(bContext *C, wmOperator *op) void OUTLINER_OT_animdata_operation(wmOperatorType *ot) { /* identifiers */ - ot->name= "Outliner Animation Data Operation"; - ot->idname= "OUTLINER_OT_animdata_operation"; - ot->description= ""; + ot->name = "Outliner Animation Data Operation"; + ot->idname = "OUTLINER_OT_animdata_operation"; + ot->description = ""; /* callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= outliner_animdata_operation_exec; - ot->poll= ED_operator_outliner_active; + ot->invoke = WM_menu_invoke; + ot->exec = outliner_animdata_operation_exec; + ot->poll = ED_operator_outliner_active; - ot->flag= 0; + ot->flag = 0; - ot->prop= RNA_def_enum(ot->srna, "type", prop_animdata_op_types, 0, "Animation Operation", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_animdata_op_types, 0, "Animation Operation", ""); } /* **************************************** */ @@ -1158,18 +1158,18 @@ static int outliner_data_operation_exec(bContext *C, wmOperator *op) void OUTLINER_OT_data_operation(wmOperatorType *ot) { /* identifiers */ - ot->name= "Outliner Data Operation"; - ot->idname= "OUTLINER_OT_data_operation"; - ot->description= ""; + ot->name = "Outliner Data Operation"; + ot->idname = "OUTLINER_OT_data_operation"; + ot->description = ""; /* callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= outliner_data_operation_exec; - ot->poll= ED_operator_outliner_active; + ot->invoke = WM_menu_invoke; + ot->exec = outliner_data_operation_exec; + ot->poll = ED_operator_outliner_active; - ot->flag= 0; + ot->flag = 0; - ot->prop= RNA_def_enum(ot->srna, "type", prop_data_op_types, 0, "Data Operation", ""); + ot->prop = RNA_def_enum(ot->srna, "type", prop_data_op_types, 0, "Data Operation", ""); } @@ -1259,13 +1259,13 @@ static int outliner_operation(bContext *C, wmOperator *UNUSED(op), wmEvent *even /* Menu only! Calls other operators */ void OUTLINER_OT_operation(wmOperatorType *ot) { - ot->name= "Execute Operation"; - ot->idname= "OUTLINER_OT_operation"; - ot->description= "Context menu for item operations"; + ot->name = "Execute Operation"; + ot->idname = "OUTLINER_OT_operation"; + ot->description = "Context menu for item operations"; - ot->invoke= outliner_operation; + ot->invoke = outliner_operation; - ot->poll= ED_operator_outliner_active; + ot->poll = ED_operator_outliner_active; } /* ****************************************************** */ diff --git a/source/blender/editors/space_script/script_edit.c b/source/blender/editors/space_script/script_edit.c index c752b86c1e8..2ef1076bc37 100644 --- a/source/blender/editors/space_script/script_edit.c +++ b/source/blender/editors/space_script/script_edit.c @@ -71,14 +71,14 @@ static int run_pyfile_exec(bContext *C, wmOperator *op) void SCRIPT_OT_python_file_run(wmOperatorType *ot) { /* identifiers */ - ot->name= "Run python file"; - ot->description= "Run Python file"; - ot->idname= "SCRIPT_OT_python_file_run"; + ot->name = "Run python file"; + ot->description = "Run Python file"; + ot->idname = "SCRIPT_OT_python_file_run"; ot->flag = OPTYPE_UNDO; /* api callbacks */ - ot->exec= run_pyfile_exec; - ot->poll= ED_operator_areaactive; + ot->exec = run_pyfile_exec; + ot->poll = ED_operator_areaactive; RNA_def_string_file_path(ot->srna, "filepath", "", FILE_MAX, "Path", ""); } @@ -103,10 +103,10 @@ static int script_reload_exec(bContext *C, wmOperator *UNUSED(op)) void SCRIPT_OT_reload(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reload Scripts"; - ot->description= "Reload Scripts"; - ot->idname= "SCRIPT_OT_reload"; + ot->name = "Reload Scripts"; + ot->description = "Reload Scripts"; + ot->idname = "SCRIPT_OT_reload"; /* api callbacks */ - ot->exec= script_reload_exec; + ot->exec = script_reload_exec; } diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 5249c74ba84..f7dcab82937 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -276,23 +276,23 @@ void SEQUENCER_OT_scene_strip_add(struct wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Add Scene Strip"; - ot->idname= "SEQUENCER_OT_scene_strip_add"; - ot->description= "Add a strip to the sequencer using a blender scene as a source"; + ot->name = "Add Scene Strip"; + ot->idname = "SEQUENCER_OT_scene_strip_add"; + ot->description = "Add a strip to the sequencer using a blender scene as a source"; /* api callbacks */ - ot->invoke= sequencer_add_scene_strip_invoke; - ot->exec= sequencer_add_scene_strip_exec; + ot->invoke = sequencer_add_scene_strip_invoke; + ot->exec = sequencer_add_scene_strip_exec; - ot->poll= ED_operator_scene_editable; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME); prop= RNA_def_enum(ot->srna, "scene", DummyRNA_NULL_items, 0, "Scene", ""); RNA_def_enum_funcs(prop, RNA_scene_itemf); - ot->prop= prop; + ot->prop = prop; } /* add movieclip operator */ @@ -372,23 +372,23 @@ void SEQUENCER_OT_movieclip_strip_add(struct wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Add MovieClip Strip"; - ot->idname= "SEQUENCER_OT_movieclip_strip_add"; - ot->description= "Add a movieclip strip to the sequencer"; + ot->name = "Add MovieClip Strip"; + ot->idname = "SEQUENCER_OT_movieclip_strip_add"; + ot->description = "Add a movieclip strip to the sequencer"; /* api callbacks */ - ot->invoke= sequencer_add_movieclip_strip_invoke; - ot->exec= sequencer_add_movieclip_strip_exec; + ot->invoke = sequencer_add_movieclip_strip_invoke; + ot->exec = sequencer_add_movieclip_strip_exec; - ot->poll= ED_operator_scene_editable; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME); prop= RNA_def_enum(ot->srna, "clip", DummyRNA_NULL_items, 0, "Clip", ""); RNA_def_enum_funcs(prop, RNA_movieclip_itemf); - ot->prop= prop; + ot->prop = prop; } @@ -485,18 +485,18 @@ void SEQUENCER_OT_movie_strip_add(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Movie Strip"; - ot->idname= "SEQUENCER_OT_movie_strip_add"; - ot->description= "Add a movie strip to the sequencer"; + ot->name = "Add Movie Strip"; + ot->idname = "SEQUENCER_OT_movie_strip_add"; + ot->description = "Add a movie strip to the sequencer"; /* api callbacks */ - ot->invoke= sequencer_add_movie_strip_invoke; - ot->exec= sequencer_add_movie_strip_exec; + ot->invoke = sequencer_add_movie_strip_invoke; + ot->exec = sequencer_add_movie_strip_exec; - ot->poll= ED_operator_scene_editable; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_filesel(ot, FOLDERFILE|MOVIEFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH|WM_FILESEL_RELPATH|WM_FILESEL_FILES, FILE_DEFAULTDISPLAY); sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME); @@ -537,18 +537,18 @@ void SEQUENCER_OT_sound_strip_add(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Sound Strip"; - ot->idname= "SEQUENCER_OT_sound_strip_add"; - ot->description= "Add a sound strip to the sequencer"; + ot->name = "Add Sound Strip"; + ot->idname = "SEQUENCER_OT_sound_strip_add"; + ot->description = "Add a sound strip to the sequencer"; /* api callbacks */ - ot->invoke= sequencer_add_sound_strip_invoke; - ot->exec= sequencer_add_sound_strip_exec; + ot->invoke = sequencer_add_sound_strip_invoke; + ot->exec = sequencer_add_sound_strip_exec; - ot->poll= ED_operator_scene_editable; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH|WM_FILESEL_RELPATH|WM_FILESEL_FILES, FILE_DEFAULTDISPLAY); sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME); @@ -641,18 +641,18 @@ void SEQUENCER_OT_image_strip_add(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Image Strip"; - ot->idname= "SEQUENCER_OT_image_strip_add"; - ot->description= "Add an image or image sequence to the sequencer"; + ot->name = "Add Image Strip"; + ot->idname = "SEQUENCER_OT_image_strip_add"; + ot->description = "Add an image or image sequence to the sequencer"; /* api callbacks */ - ot->invoke= sequencer_add_image_strip_invoke; - ot->exec= sequencer_add_image_strip_exec; + ot->invoke = sequencer_add_image_strip_invoke; + ot->exec = sequencer_add_image_strip_exec; - ot->poll= ED_operator_scene_editable; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_DIRECTORY|WM_FILESEL_RELPATH|WM_FILESEL_FILES, FILE_DEFAULTDISPLAY); sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME|SEQPROP_ENDFRAME); @@ -815,18 +815,18 @@ static int sequencer_add_effect_strip_invoke(bContext *C, wmOperator *op, wmEven void SEQUENCER_OT_effect_strip_add(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Effect Strip"; - ot->idname= "SEQUENCER_OT_effect_strip_add"; - ot->description= "Add an effect to the sequencer, most are applied on top of existing strips"; + ot->name = "Add Effect Strip"; + ot->idname = "SEQUENCER_OT_effect_strip_add"; + ot->description = "Add an effect to the sequencer, most are applied on top of existing strips"; /* api callbacks */ - ot->invoke= sequencer_add_effect_strip_invoke; - ot->exec= sequencer_add_effect_strip_exec; + ot->invoke = sequencer_add_effect_strip_invoke; + ot->exec = sequencer_add_effect_strip_exec; - ot->poll= ED_operator_scene_editable; + ot->poll = ED_operator_scene_editable; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_filesel(ot, 0, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH|WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY); sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME|SEQPROP_ENDFRAME); diff --git a/source/blender/editors/space_sequencer/sequencer_buttons.c b/source/blender/editors/space_sequencer/sequencer_buttons.c index 9aefdea9fb0..d7fe12bb0c2 100644 --- a/source/blender/editors/space_sequencer/sequencer_buttons.c +++ b/source/blender/editors/space_sequencer/sequencer_buttons.c @@ -107,14 +107,14 @@ static int sequencer_properties(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_properties(wmOperatorType *ot) { - ot->name= "Properties"; - ot->idname= "SEQUENCER_OT_properties"; - ot->description= "Open sequencer properties panel"; + ot->name = "Properties"; + ot->idname = "SEQUENCER_OT_properties"; + ot->description = "Open sequencer properties panel"; - ot->exec= sequencer_properties; - ot->poll= ED_operator_sequencer_active; + ot->exec = sequencer_properties; + ot->poll = ED_operator_sequencer_active; /* flags */ - ot->flag= 0; + ot->flag = 0; } diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index d9f5b283d6a..cd16b35ea25 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -1088,17 +1088,17 @@ static int sequencer_snap_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(ev void SEQUENCER_OT_snap(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Snap strips"; - ot->idname= "SEQUENCER_OT_snap"; - ot->description="Frame where selected strips will be snapped"; + ot->name = "Snap strips"; + ot->idname = "SEQUENCER_OT_snap"; + ot->description = "Frame where selected strips will be snapped"; /* api callbacks */ - ot->invoke= sequencer_snap_invoke; - ot->exec= sequencer_snap_exec; - ot->poll= sequencer_edit_poll; + ot->invoke = sequencer_snap_invoke; + ot->exec = sequencer_snap_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_int(ot->srna, "frame", 0, INT_MIN, INT_MAX, "Frame", "Frame where selected strips will be snapped", INT_MIN, INT_MAX); } @@ -1135,16 +1135,16 @@ static int sequencer_mute_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_mute(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Mute Strips"; - ot->idname= "SEQUENCER_OT_mute"; - ot->description="Mute selected strips"; + ot->name = "Mute Strips"; + ot->idname = "SEQUENCER_OT_mute"; + ot->description = "Mute selected strips"; /* api callbacks */ - ot->exec= sequencer_mute_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_mute_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Mute unselected rather than selected strips"); } @@ -1182,16 +1182,16 @@ static int sequencer_unmute_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_unmute(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Un-Mute Strips"; - ot->idname= "SEQUENCER_OT_unmute"; - ot->description="Un-Mute unselected rather than selected strips"; + ot->name = "Un-Mute Strips"; + ot->idname = "SEQUENCER_OT_unmute"; + ot->description = "Un-Mute unselected rather than selected strips"; /* api callbacks */ - ot->exec= sequencer_unmute_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_unmute_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "UnMute unselected rather than selected strips"); } @@ -1218,16 +1218,16 @@ static int sequencer_lock_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_lock(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Lock Strips"; - ot->idname= "SEQUENCER_OT_lock"; - ot->description="Lock the active strip so that it can't be transformed"; + ot->name = "Lock Strips"; + ot->idname = "SEQUENCER_OT_lock"; + ot->description = "Lock the active strip so that it can't be transformed"; /* api callbacks */ - ot->exec= sequencer_lock_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_lock_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* unlock operator */ @@ -1251,16 +1251,16 @@ static int sequencer_unlock_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_unlock(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "UnLock Strips"; - ot->idname= "SEQUENCER_OT_unlock"; - ot->description="Unlock the active strip so that it can't be transformed"; + ot->name = "UnLock Strips"; + ot->idname = "SEQUENCER_OT_unlock"; + ot->description = "Unlock the active strip so that it can't be transformed"; /* api callbacks */ - ot->exec= sequencer_unlock_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_unlock_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* reload operator */ @@ -1284,16 +1284,16 @@ static int sequencer_reload_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_reload(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Reload Strips"; - ot->idname= "SEQUENCER_OT_reload"; - ot->description="Reload strips in the sequencer"; + ot->name = "Reload Strips"; + ot->idname = "SEQUENCER_OT_reload"; + ot->description = "Reload strips in the sequencer"; /* api callbacks */ - ot->exec= sequencer_reload_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_reload_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER; /* no undo, the data changed is stored outside 'main' */ + ot->flag = OPTYPE_REGISTER; /* no undo, the data changed is stored outside 'main' */ } /* reload operator */ @@ -1312,13 +1312,13 @@ static int sequencer_refresh_all_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_refresh_all(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Refresh Sequencer"; - ot->idname= "SEQUENCER_OT_refresh_all"; - ot->description="Refresh the sequencer editor"; + ot->name = "Refresh Sequencer"; + ot->idname = "SEQUENCER_OT_refresh_all"; + ot->description = "Refresh the sequencer editor"; /* api callbacks */ - ot->exec= sequencer_refresh_all_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_refresh_all_exec; + ot->poll = sequencer_edit_poll; } static int sequencer_reassign_inputs_exec(bContext *C, wmOperator *op) @@ -1369,16 +1369,16 @@ static int sequencer_effect_poll(bContext *C) void SEQUENCER_OT_reassign_inputs(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Reassign Inputs"; - ot->idname= "SEQUENCER_OT_reassign_inputs"; - ot->description="Reassign the inputs for the effect strip"; + ot->name = "Reassign Inputs"; + ot->idname = "SEQUENCER_OT_reassign_inputs"; + ot->description = "Reassign the inputs for the effect strip"; /* api callbacks */ - ot->exec= sequencer_reassign_inputs_exec; - ot->poll= sequencer_effect_poll; + ot->exec = sequencer_reassign_inputs_exec; + ot->poll = sequencer_effect_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -1405,16 +1405,16 @@ static int sequencer_swap_inputs_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_swap_inputs(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Swap Inputs"; - ot->idname= "SEQUENCER_OT_swap_inputs"; - ot->description="Swap the first two inputs for the effect strip"; + ot->name = "Swap Inputs"; + ot->idname = "SEQUENCER_OT_swap_inputs"; + ot->description = "Swap the first two inputs for the effect strip"; /* api callbacks */ - ot->exec= sequencer_swap_inputs_exec; - ot->poll= sequencer_effect_poll; + ot->exec = sequencer_swap_inputs_exec; + ot->poll = sequencer_effect_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -1500,17 +1500,17 @@ static int sequencer_cut_invoke(bContext *C, wmOperator *op, wmEvent *event) void SEQUENCER_OT_cut(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Cut Strips"; - ot->idname= "SEQUENCER_OT_cut"; - ot->description="Cut the selected strips"; + ot->name = "Cut Strips"; + ot->idname = "SEQUENCER_OT_cut"; + ot->description = "Cut the selected strips"; /* api callbacks */ - ot->invoke= sequencer_cut_invoke; - ot->exec= sequencer_cut_exec; - ot->poll= sequencer_edit_poll; + ot->invoke = sequencer_cut_invoke; + ot->exec = sequencer_cut_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_int(ot->srna, "frame", 0, INT_MIN, INT_MAX, "Frame", "Frame where selected strips will be cut", INT_MIN, INT_MAX); RNA_def_enum(ot->srna, "type", prop_cut_types, SEQ_CUT_SOFT, "Type", "The type of cut operation to perform on strips"); @@ -1570,17 +1570,17 @@ static int sequencer_add_duplicate_invoke(bContext *C, wmOperator *op, wmEvent * void SEQUENCER_OT_duplicate(wmOperatorType *ot) { /* identifiers */ - ot->name= "Duplicate Strips"; - ot->idname= "SEQUENCER_OT_duplicate"; - ot->description="Duplicate the selected strips"; + ot->name = "Duplicate Strips"; + ot->idname = "SEQUENCER_OT_duplicate"; + ot->description = "Duplicate the selected strips"; /* api callbacks */ - ot->invoke= sequencer_add_duplicate_invoke; - ot->exec= sequencer_add_duplicate_exec; - ot->poll= ED_operator_sequencer_active; + ot->invoke = sequencer_add_duplicate_invoke; + ot->exec = sequencer_add_duplicate_exec; + ot->poll = ED_operator_sequencer_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* to give to transform */ RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); @@ -1642,17 +1642,17 @@ void SEQUENCER_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Erase Strips"; - ot->idname= "SEQUENCER_OT_delete"; - ot->description="Erase selected strips from the sequencer"; + ot->name = "Erase Strips"; + ot->idname = "SEQUENCER_OT_delete"; + ot->description = "Erase selected strips from the sequencer"; /* api callbacks */ - ot->invoke= WM_operator_confirm; - ot->exec= sequencer_delete_exec; - ot->poll= sequencer_edit_poll; + ot->invoke = WM_operator_confirm; + ot->exec = sequencer_delete_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -1695,16 +1695,16 @@ void SEQUENCER_OT_offset_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Strip Offset"; - ot->idname= "SEQUENCER_OT_offset_clear"; - ot->description="Clear strip offsets from the start and end frames"; + ot->name = "Clear Strip Offset"; + ot->idname = "SEQUENCER_OT_offset_clear"; + ot->description = "Clear strip offsets from the start and end frames"; /* api callbacks */ - ot->exec= sequencer_offset_clear_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_offset_clear_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -1786,16 +1786,16 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_images_separate(wmOperatorType *ot) { /* identifiers */ - ot->name= "Separate Images"; - ot->idname= "SEQUENCER_OT_images_separate"; - ot->description="On image sequence strips, it returns a strip for each image"; + ot->name = "Separate Images"; + ot->idname = "SEQUENCER_OT_images_separate"; + ot->description = "On image sequence strips, it returns a strip for each image"; /* api callbacks */ - ot->exec= sequencer_separate_images_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_separate_images_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_int(ot->srna, "length", 1, 1, 1000, "Length", "Length of each frame", 1, INT_MAX); } @@ -1858,16 +1858,16 @@ static int sequencer_meta_toggle_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_meta_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Meta Strip"; - ot->idname= "SEQUENCER_OT_meta_toggle"; - ot->description="Toggle a metastrip (to edit enclosed strips)"; + ot->name = "Toggle Meta Strip"; + ot->idname = "SEQUENCER_OT_meta_toggle"; + ot->description = "Toggle a metastrip (to edit enclosed strips)"; /* api callbacks */ - ot->exec= sequencer_meta_toggle_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_meta_toggle_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -1924,17 +1924,17 @@ static int sequencer_meta_make_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_meta_make(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Meta Strip"; - ot->idname= "SEQUENCER_OT_meta_make"; - ot->description="Group selected strips into a metastrip"; + ot->name = "Make Meta Strip"; + ot->idname = "SEQUENCER_OT_meta_make"; + ot->description = "Group selected strips into a metastrip"; /* api callbacks */ - ot->invoke= WM_operator_confirm; - ot->exec= sequencer_meta_make_exec; - ot->poll= sequencer_edit_poll; + ot->invoke = WM_operator_confirm; + ot->exec = sequencer_meta_make_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -1995,17 +1995,17 @@ static int sequencer_meta_separate_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_meta_separate(wmOperatorType *ot) { /* identifiers */ - ot->name= "UnMeta Strip"; - ot->idname= "SEQUENCER_OT_meta_separate"; - ot->description="Put the contents of a metastrip back in the sequencer"; + ot->name = "UnMeta Strip"; + ot->idname = "SEQUENCER_OT_meta_separate"; + ot->description = "Put the contents of a metastrip back in the sequencer"; /* api callbacks */ - ot->invoke= WM_operator_confirm; - ot->exec= sequencer_meta_separate_exec; - ot->poll= sequencer_edit_poll; + ot->invoke = WM_operator_confirm; + ot->exec = sequencer_meta_separate_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* view_all operator */ @@ -2028,16 +2028,16 @@ static int sequencer_view_all_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_view_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "View All"; - ot->idname= "SEQUENCER_OT_view_all"; - ot->description="View all the strips in the sequencer"; + ot->name = "View All"; + ot->idname = "SEQUENCER_OT_view_all"; + ot->description = "View all the strips in the sequencer"; /* api callbacks */ - ot->exec= sequencer_view_all_exec; - ot->poll= ED_operator_sequencer_active; + ot->exec = sequencer_view_all_exec; + ot->poll = ED_operator_sequencer_active; /* flags */ - ot->flag= OPTYPE_REGISTER; + ot->flag = OPTYPE_REGISTER; } /* view_all operator */ @@ -2094,16 +2094,16 @@ static int sequencer_view_all_preview_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_view_all_preview(wmOperatorType *ot) { /* identifiers */ - ot->name= "View All"; - ot->idname= "SEQUENCER_OT_view_all_preview"; - ot->description="Zoom preview to fit in the area"; + ot->name = "View All"; + ot->idname = "SEQUENCER_OT_view_all_preview"; + ot->description = "Zoom preview to fit in the area"; /* api callbacks */ - ot->exec= sequencer_view_all_preview_exec; - ot->poll= ED_operator_sequencer_active; + ot->exec = sequencer_view_all_preview_exec; + ot->poll = ED_operator_sequencer_active; /* flags */ - ot->flag= OPTYPE_REGISTER; + ot->flag = OPTYPE_REGISTER; } @@ -2130,13 +2130,13 @@ static int sequencer_view_zoom_ratio_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_view_zoom_ratio(wmOperatorType *ot) { /* identifiers */ - ot->name= "Sequencer View Zoom Ratio"; - ot->idname= "SEQUENCER_OT_view_zoom_ratio"; + ot->name = "Sequencer View Zoom Ratio"; + ot->idname = "SEQUENCER_OT_view_zoom_ratio"; ot->description = "Change zoom ratio of sequencer preview"; /* api callbacks */ - ot->exec= sequencer_view_zoom_ratio_exec; - ot->poll= ED_operator_sequencer_active; + ot->exec = sequencer_view_zoom_ratio_exec; + ot->poll = ED_operator_sequencer_active; /* properties */ RNA_def_float(ot->srna, "ratio", 1.0f, 0.0f, FLT_MAX, @@ -2168,16 +2168,16 @@ static int sequencer_view_toggle_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_view_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Toggle"; - ot->idname= "SEQUENCER_OT_view_toggle"; - ot->description="Toggle between sequencer views (sequence, preview, both)"; + ot->name = "View Toggle"; + ot->idname = "SEQUENCER_OT_view_toggle"; + ot->description = "Toggle between sequencer views (sequence, preview, both)"; /* api callbacks */ - ot->exec= sequencer_view_toggle_exec; - ot->poll= ED_operator_sequencer_active; + ot->exec = sequencer_view_toggle_exec; + ot->poll = ED_operator_sequencer_active; /* flags */ - ot->flag= OPTYPE_REGISTER; + ot->flag = OPTYPE_REGISTER; } @@ -2248,16 +2248,16 @@ static int sequencer_view_selected_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_view_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Selected"; - ot->idname= "SEQUENCER_OT_view_selected"; - ot->description="Zoom the sequencer on the selected strips"; + ot->name = "View Selected"; + ot->idname = "SEQUENCER_OT_view_selected"; + ot->description = "Zoom the sequencer on the selected strips"; /* api callbacks */ - ot->exec= sequencer_view_selected_exec; - ot->poll= ED_operator_sequencer_active; + ot->exec = sequencer_view_selected_exec; + ot->poll = ED_operator_sequencer_active; /* flags */ - ot->flag= OPTYPE_REGISTER; + ot->flag = OPTYPE_REGISTER; } @@ -2333,16 +2333,16 @@ static int sequencer_next_edit_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_next_edit(wmOperatorType *ot) { /* identifiers */ - ot->name= "Next Edit"; - ot->idname= "SEQUENCER_OT_next_edit"; - ot->description="Move frame to next edit point"; + ot->name = "Next Edit"; + ot->idname = "SEQUENCER_OT_next_edit"; + ot->description = "Move frame to next edit point"; /* api callbacks */ - ot->exec= sequencer_next_edit_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_next_edit_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ } @@ -2363,16 +2363,16 @@ static int sequencer_previous_edit_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_previous_edit(wmOperatorType *ot) { /* identifiers */ - ot->name= "Previous Edit"; - ot->idname= "SEQUENCER_OT_previous_edit"; - ot->description="Move frame to previous edit point"; + ot->name = "Previous Edit"; + ot->idname = "SEQUENCER_OT_previous_edit"; + ot->description = "Move frame to previous edit point"; /* api callbacks */ - ot->exec= sequencer_previous_edit_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_previous_edit_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ } @@ -2467,16 +2467,16 @@ static int sequencer_swap_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_swap(wmOperatorType *ot) { /* identifiers */ - ot->name= "Swap Strip"; - ot->idname= "SEQUENCER_OT_swap"; - ot->description="Swap active strip with strip to the right or left"; + ot->name = "Swap Strip"; + ot->idname = "SEQUENCER_OT_swap"; + ot->description = "Swap active strip with strip to the right or left"; /* api callbacks */ - ot->exec= sequencer_swap_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_swap_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_enum(ot->srna, "side", prop_side_lr_types, SEQ_SIDE_RIGHT, "Side", "Side of the strip to swap"); @@ -2526,16 +2526,16 @@ static int sequencer_rendersize_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_rendersize(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Render Size"; - ot->idname= "SEQUENCER_OT_rendersize"; - ot->description="Set render size and aspect from active sequence"; + ot->name = "Set Render Size"; + ot->idname = "SEQUENCER_OT_rendersize"; + ot->description = "Set render size and aspect from active sequence"; /* api callbacks */ - ot->exec= sequencer_rendersize_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_rendersize_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ } @@ -2605,16 +2605,16 @@ static int sequencer_copy_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy"; - ot->idname= "SEQUENCER_OT_copy"; - ot->description=""; + ot->name = "Copy"; + ot->idname = "SEQUENCER_OT_copy"; + ot->description = ""; /* api callbacks */ - ot->exec= sequencer_copy_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_copy_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER; + ot->flag = OPTYPE_REGISTER; /* properties */ } @@ -2673,16 +2673,16 @@ static int sequencer_paste_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_paste(wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste"; - ot->idname= "SEQUENCER_OT_paste"; - ot->description=""; + ot->name = "Paste"; + ot->idname = "SEQUENCER_OT_paste"; + ot->description = ""; /* api callbacks */ - ot->exec= sequencer_paste_exec; - ot->poll= ED_operator_sequencer_active; + ot->exec = sequencer_paste_exec; + ot->poll = ED_operator_sequencer_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ } @@ -2724,16 +2724,16 @@ static int sequencer_swap_data_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_swap_data(wmOperatorType *ot) { /* identifiers */ - ot->name= "Sequencer Swap Data"; - ot->idname= "SEQUENCER_OT_swap_data"; - ot->description="Swap 2 sequencer strips"; + ot->name = "Sequencer Swap Data"; + ot->idname = "SEQUENCER_OT_swap_data"; + ot->description = "Swap 2 sequencer strips"; /* api callbacks */ - ot->exec= sequencer_swap_data_exec; - ot->poll= ED_operator_sequencer_active; + ot->exec = sequencer_swap_data_exec; + ot->poll = ED_operator_sequencer_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ } @@ -2781,19 +2781,19 @@ static int view_ghost_border_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_view_ghost_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Offset View"; - ot->idname= "SEQUENCER_OT_view_ghost_border"; - ot->description="Enable border select mode"; + ot->name = "Border Offset View"; + ot->idname = "SEQUENCER_OT_view_ghost_border"; + ot->description = "Enable border select mode"; /* api callbacks */ - ot->invoke= WM_border_select_invoke; - ot->exec= view_ghost_border_exec; - ot->modal= WM_border_select_modal; - ot->poll= sequencer_view_poll; - ot->cancel= WM_border_select_cancel; + ot->invoke = WM_border_select_invoke; + ot->exec = view_ghost_border_exec; + ot->modal = WM_border_select_modal; + ot->poll = sequencer_view_poll; + ot->cancel = WM_border_select_cancel; /* flags */ - ot->flag= 0; + ot->flag = 0; /* rna */ WM_operator_properties_gesture_border(ot, FALSE); @@ -2810,16 +2810,16 @@ static int sequencer_rebuild_proxy_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_rebuild_proxy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Rebuild Proxy and Timecode Indices"; - ot->idname= "SEQUENCER_OT_rebuild_proxy"; - ot->description="Rebuild all selected proxies and timecode indeces using the job system"; + ot->name = "Rebuild Proxy and Timecode Indices"; + ot->idname = "SEQUENCER_OT_rebuild_proxy"; + ot->description = "Rebuild all selected proxies and timecode indeces using the job system"; /* api callbacks */ - ot->exec= sequencer_rebuild_proxy_exec; - ot->poll= ED_operator_sequencer_active; + ot->exec = sequencer_rebuild_proxy_exec; + ot->poll = ED_operator_sequencer_active; /* flags */ - ot->flag= OPTYPE_REGISTER; + ot->flag = OPTYPE_REGISTER; } /* change ops */ @@ -2875,18 +2875,18 @@ static int sequencer_change_effect_input_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_change_effect_input(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Change Effect Input"; - ot->idname= "SEQUENCER_OT_change_effect_input"; - ot->description=""; + ot->name = "Change Effect Input"; + ot->idname = "SEQUENCER_OT_change_effect_input"; + ot->description = ""; /* api callbacks */ - ot->exec= sequencer_change_effect_input_exec; - ot->poll= sequencer_effect_poll; + ot->exec = sequencer_change_effect_input_exec; + ot->poll = sequencer_effect_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; - ot->prop= RNA_def_enum(ot->srna, "swap", prop_change_effect_input_types, 0, "Swap", "The effect inputs to swap"); + ot->prop = RNA_def_enum(ot->srna, "swap", prop_change_effect_input_types, 0, "Swap", "The effect inputs to swap"); } static int sequencer_change_effect_type_exec(bContext *C, wmOperator *op) @@ -2935,18 +2935,18 @@ static int sequencer_change_effect_type_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_change_effect_type(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Change Effect Type"; - ot->idname= "SEQUENCER_OT_change_effect_type"; - ot->description=""; + ot->name = "Change Effect Type"; + ot->idname = "SEQUENCER_OT_change_effect_type"; + ot->description = ""; /* api callbacks */ - ot->exec= sequencer_change_effect_type_exec; - ot->poll= sequencer_effect_poll; + ot->exec = sequencer_change_effect_type_exec; + ot->poll = sequencer_effect_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; - ot->prop= RNA_def_enum(ot->srna, "type", sequencer_prop_effect_types, SEQ_CROSS, "Type", "Sequencer effect type"); + ot->prop = RNA_def_enum(ot->srna, "type", sequencer_prop_effect_types, SEQ_CROSS, "Type", "Sequencer effect type"); } static int sequencer_change_path_exec(bContext *C, wmOperator *op) @@ -3041,17 +3041,17 @@ static int sequencer_change_path_invoke(bContext *C, wmOperator *op, wmEvent *UN void SEQUENCER_OT_change_path(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Change Data/Files"; - ot->idname= "SEQUENCER_OT_change_path"; - ot->description=""; + ot->name = "Change Data/Files"; + ot->idname = "SEQUENCER_OT_change_path"; + ot->description = ""; /* api callbacks */ - ot->exec= sequencer_change_path_exec; - ot->invoke= sequencer_change_path_invoke; - ot->poll= sequencer_strip_has_path_poll; + ot->exec = sequencer_change_path_exec; + ot->invoke = sequencer_change_path_invoke; + ot->poll = sequencer_strip_has_path_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE|MOVIEFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_DIRECTORY|WM_FILESEL_RELPATH|WM_FILESEL_FILEPATH|WM_FILESEL_FILES, FILE_DEFAULTDISPLAY); } diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 44b83ba0694..f97e36131fb 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -259,16 +259,16 @@ static int sequencer_de_select_all_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_select_all(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "(De)select All"; - ot->idname= "SEQUENCER_OT_select_all"; - ot->description="Select or deselect all strips"; + ot->name = "(De)select All"; + ot->idname = "SEQUENCER_OT_select_all"; + ot->description = "Select or deselect all strips"; /* api callbacks */ - ot->exec= sequencer_de_select_all_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_de_select_all_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_select_all(ot); } @@ -299,16 +299,16 @@ static int sequencer_select_inverse_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_select_inverse(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Inverse"; - ot->idname= "SEQUENCER_OT_select_inverse"; - ot->description="Select unselected strips"; + ot->name = "Select Inverse"; + ot->idname = "SEQUENCER_OT_select_inverse"; + ot->description = "Select unselected strips"; /* api callbacks */ - ot->exec= sequencer_select_inverse_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_select_inverse_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) @@ -522,16 +522,16 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) void SEQUENCER_OT_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Activate/Select"; - ot->idname= "SEQUENCER_OT_select"; - ot->description="Select a strip (last selected becomes the \"active strip\")"; + ot->name = "Activate/Select"; + ot->idname = "SEQUENCER_OT_select"; + ot->description = "Select a strip (last selected becomes the \"active strip\")"; /* api callbacks */ - ot->invoke= sequencer_select_invoke; - ot->poll= ED_operator_sequencer_active; + ot->invoke = sequencer_select_invoke; + ot->poll = ED_operator_sequencer_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend the selection"); @@ -612,16 +612,16 @@ static int sequencer_select_more_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_select_more(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select More"; - ot->idname= "SEQUENCER_OT_select_more"; - ot->description="Select more strips adjacent to the current selection"; + ot->name = "Select More"; + ot->idname = "SEQUENCER_OT_select_more"; + ot->description = "Select more strips adjacent to the current selection"; /* api callbacks */ - ot->exec= sequencer_select_more_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_select_more_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ } @@ -643,16 +643,16 @@ static int sequencer_select_less_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_select_less(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Less"; - ot->idname= "SEQUENCER_OT_select_less"; - ot->description="Shrink the current selection of adjacent selected strips"; + ot->name = "Select Less"; + ot->idname = "SEQUENCER_OT_select_less"; + ot->description = "Shrink the current selection of adjacent selected strips"; /* api callbacks */ - ot->exec= sequencer_select_less_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_select_less_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ } @@ -693,16 +693,16 @@ static int sequencer_select_linked_pick_invoke(bContext *C, wmOperator *op, wmEv void SEQUENCER_OT_select_linked_pick(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select pick linked"; - ot->idname= "SEQUENCER_OT_select_linked_pick"; - ot->description="Select a chain of linked strips nearest to the mouse pointer"; + ot->name = "Select pick linked"; + ot->idname = "SEQUENCER_OT_select_linked_pick"; + ot->description = "Select a chain of linked strips nearest to the mouse pointer"; /* api callbacks */ - ot->invoke= sequencer_select_linked_pick_invoke; - ot->poll= ED_operator_sequencer_active; + ot->invoke = sequencer_select_linked_pick_invoke; + ot->poll = ED_operator_sequencer_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend the selection"); @@ -728,16 +728,16 @@ static int sequencer_select_linked_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_select_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select linked"; - ot->idname= "SEQUENCER_OT_select_linked"; - ot->description="Select all strips adjacent to the current selection"; + ot->name = "Select linked"; + ot->idname = "SEQUENCER_OT_select_linked"; + ot->description = "Select all strips adjacent to the current selection"; /* api callbacks */ - ot->exec= sequencer_select_linked_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_select_linked_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ } @@ -778,16 +778,16 @@ static int sequencer_select_handles_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_select_handles(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Handles"; - ot->idname= "SEQUENCER_OT_select_handles"; - ot->description="Select manipulator handles on the sides of the selected strip"; + ot->name = "Select Handles"; + ot->idname = "SEQUENCER_OT_select_handles"; + ot->description = "Select manipulator handles on the sides of the selected strip"; /* api callbacks */ - ot->exec= sequencer_select_handles_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_select_handles_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_enum(ot->srna, "side", prop_side_types, SEQ_SIDE_BOTH, "Side", "The side of the handle that is selected"); @@ -815,16 +815,16 @@ static int sequencer_select_active_side_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_select_active_side(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Active Side"; - ot->idname= "SEQUENCER_OT_select_active_side"; - ot->description="Select strips on the nominated side of the active strip"; + ot->name = "Select Active Side"; + ot->idname = "SEQUENCER_OT_select_active_side"; + ot->description = "Select strips on the nominated side of the active strip"; /* api callbacks */ - ot->exec= sequencer_select_active_side_exec; - ot->poll= sequencer_edit_poll; + ot->exec = sequencer_select_active_side_exec; + ot->poll = sequencer_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_enum(ot->srna, "side", prop_side_types, SEQ_SIDE_BOTH, "Side", "The side of the handle that is selected"); @@ -884,20 +884,20 @@ static int sequencer_borderselect_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Select"; - ot->idname= "SEQUENCER_OT_select_border"; - ot->description="Enable border select mode"; + ot->name = "Border Select"; + ot->idname = "SEQUENCER_OT_select_border"; + ot->description = "Enable border select mode"; /* api callbacks */ - ot->invoke= WM_border_select_invoke; - ot->exec= sequencer_borderselect_exec; - ot->modal= WM_border_select_modal; - ot->cancel= WM_border_select_cancel; + ot->invoke = WM_border_select_invoke; + ot->exec = sequencer_borderselect_exec; + ot->modal = WM_border_select_modal; + ot->cancel = WM_border_select_cancel; - ot->poll= ED_operator_sequencer_active; + ot->poll = ED_operator_sequencer_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* rna */ WM_operator_properties_gesture_border(ot, TRUE); diff --git a/source/blender/editors/space_text/text_header.c b/source/blender/editors/space_text/text_header.c index b8e53f752e2..02de29e098b 100644 --- a/source/blender/editors/space_text/text_header.c +++ b/source/blender/editors/space_text/text_header.c @@ -117,13 +117,13 @@ static int text_properties_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_properties(wmOperatorType *ot) { /* identifiers */ - ot->name= "Properties"; - ot->description= "Toggle text properties panel"; - ot->idname= "TEXT_OT_properties"; + ot->name = "Properties"; + ot->description = "Toggle text properties panel"; + ot->idname = "TEXT_OT_properties"; /* api callbacks */ - ot->exec= text_properties_exec; - ot->poll= text_properties_poll; + ot->exec = text_properties_exec; + ot->poll = text_properties_poll; } /******************** XXX popup menus *******************/ diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index 9a64948c05c..fd4b334eeec 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -197,16 +197,16 @@ static int text_new_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_new(wmOperatorType *ot) { /* identifiers */ - ot->name= "Create Text Block"; - ot->idname= "TEXT_OT_new"; - ot->description= "Create a new text data block"; + ot->name = "Create Text Block"; + ot->idname = "TEXT_OT_new"; + ot->description = "Create a new text data block"; /* api callbacks */ - ot->exec= text_new_exec; - ot->poll= text_new_poll; + ot->exec = text_new_exec; + ot->poll = text_new_poll; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; } /******************* open operator *********************/ @@ -296,18 +296,18 @@ static int text_open_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void TEXT_OT_open(wmOperatorType *ot) { /* identifiers */ - ot->name= "Open Text Block"; - ot->idname= "TEXT_OT_open"; - ot->description= "Open a new text data block"; + ot->name = "Open Text Block"; + ot->idname = "TEXT_OT_open"; + ot->description = "Open a new text data block"; /* api callbacks */ - ot->exec= text_open_exec; - ot->invoke= text_open_invoke; - ot->cancel= text_open_cancel; - ot->poll= text_new_poll; + ot->exec = text_open_exec; + ot->invoke = text_open_invoke; + ot->cancel = text_open_cancel; + ot->poll = text_new_poll; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; /* properties */ WM_operator_properties_filesel(ot, FOLDERFILE|TEXTFILE|PYSCRIPTFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY); //XXX TODO, relative_path @@ -341,14 +341,14 @@ static int text_reload_exec(bContext *C, wmOperator *op) void TEXT_OT_reload(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reload"; - ot->idname= "TEXT_OT_reload"; - ot->description= "Reload active text data block from its file"; + ot->name = "Reload"; + ot->idname = "TEXT_OT_reload"; + ot->description = "Reload active text data block from its file"; /* api callbacks */ - ot->exec= text_reload_exec; - ot->invoke= WM_operator_confirm; - ot->poll= text_edit_poll; + ot->exec = text_reload_exec; + ot->invoke = WM_operator_confirm; + ot->poll = text_edit_poll; } /******************* delete operator *********************/ @@ -391,17 +391,17 @@ static int text_unlink_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_unlink(wmOperatorType *ot) { /* identifiers */ - ot->name= "Unlink"; - ot->idname= "TEXT_OT_unlink"; - ot->description= "Unlink active text data block"; + ot->name = "Unlink"; + ot->idname = "TEXT_OT_unlink"; + ot->description = "Unlink active text data block"; /* api callbacks */ - ot->exec= text_unlink_exec; - ot->invoke= WM_operator_confirm; - ot->poll= text_unlink_poll; + ot->exec = text_unlink_exec; + ot->invoke = WM_operator_confirm; + ot->poll = text_unlink_poll; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; } /******************* make internal operator *********************/ @@ -426,16 +426,16 @@ static int text_make_internal_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_make_internal(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Internal"; - ot->idname= "TEXT_OT_make_internal"; - ot->description= "Make active text file internal"; + ot->name = "Make Internal"; + ot->idname = "TEXT_OT_make_internal"; + ot->description = "Make active text file internal"; /* api callbacks */ - ot->exec= text_make_internal_exec; - ot->poll= text_edit_poll; + ot->exec = text_make_internal_exec; + ot->poll = text_edit_poll; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; } /******************* save operator *********************/ @@ -503,13 +503,13 @@ static int text_save_exec(bContext *C, wmOperator *op) void TEXT_OT_save(wmOperatorType *ot) { /* identifiers */ - ot->name= "Save"; - ot->idname= "TEXT_OT_save"; - ot->description= "Save active text data block"; + ot->name = "Save"; + ot->idname = "TEXT_OT_save"; + ot->description = "Save active text data block"; /* api callbacks */ - ot->exec= text_save_exec; - ot->poll= text_save_poll; + ot->exec = text_save_exec; + ot->poll = text_save_poll; } /******************* save as operator *********************/ @@ -560,14 +560,14 @@ static int text_save_as_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(even void TEXT_OT_save_as(wmOperatorType *ot) { /* identifiers */ - ot->name= "Save As"; - ot->idname= "TEXT_OT_save_as"; - ot->description= "Save active text file with options"; + ot->name = "Save As"; + ot->idname = "TEXT_OT_save_as"; + ot->description = "Save active text file with options"; /* api callbacks */ - ot->exec= text_save_as_exec; - ot->invoke= text_save_as_invoke; - ot->poll= text_edit_poll; + ot->exec = text_save_as_exec; + ot->invoke = text_save_as_invoke; + ot->poll = text_edit_poll; /* properties */ WM_operator_properties_filesel(ot, FOLDERFILE|TEXTFILE|PYSCRIPTFILE, FILE_SPECIAL, FILE_SAVE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY); //XXX TODO, relative_path @@ -630,16 +630,16 @@ static int text_run_script_exec(bContext *C, wmOperator *op) void TEXT_OT_run_script(wmOperatorType *ot) { /* identifiers */ - ot->name= "Run Script"; - ot->idname= "TEXT_OT_run_script"; - ot->description= "Run active script"; + ot->name = "Run Script"; + ot->idname = "TEXT_OT_run_script"; + ot->description = "Run active script"; /* api callbacks */ - ot->poll= text_run_script_poll; - ot->exec= text_run_script_exec; + ot->poll = text_run_script_poll; + ot->exec = text_run_script_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /******************* refresh pyconstraints operator *********************/ @@ -690,13 +690,13 @@ static int text_refresh_pyconstraints_exec(bContext *UNUSED(C), wmOperator *UNUS void TEXT_OT_refresh_pyconstraints(wmOperatorType *ot) { /* identifiers */ - ot->name= "Refresh PyConstraints"; - ot->idname= "TEXT_OT_refresh_pyconstraints"; - ot->description= "Refresh all pyconstraints"; + ot->name = "Refresh PyConstraints"; + ot->idname = "TEXT_OT_refresh_pyconstraints"; + ot->description = "Refresh all pyconstraints"; /* api callbacks */ - ot->exec= text_refresh_pyconstraints_exec; - ot->poll= text_edit_poll; + ot->exec = text_refresh_pyconstraints_exec; + ot->poll = text_edit_poll; } /******************* paste operator *********************/ @@ -814,13 +814,13 @@ static int text_paste_exec(bContext *C, wmOperator *op) void TEXT_OT_paste(wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste"; - ot->idname= "TEXT_OT_paste"; - ot->description= "Paste text from clipboard"; + ot->name = "Paste"; + ot->idname = "TEXT_OT_paste"; + ot->description = "Paste text from clipboard"; /* api callbacks */ - ot->exec= text_paste_exec; - ot->poll= text_edit_poll; + ot->exec = text_paste_exec; + ot->poll = text_edit_poll; /* properties */ RNA_def_boolean(ot->srna, "selection", 0, "Selection", "Paste text selected elsewhere rather than copied (X11 only)"); @@ -852,13 +852,13 @@ static int text_copy_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy"; - ot->idname= "TEXT_OT_copy"; - ot->description= "Copy selected text to clipboard"; + ot->name = "Copy"; + ot->idname = "TEXT_OT_copy"; + ot->description = "Copy selected text to clipboard"; /* api callbacks */ - ot->exec= text_copy_exec; - ot->poll= text_edit_poll; + ot->exec = text_copy_exec; + ot->poll = text_edit_poll; } /******************* cut operator *********************/ @@ -885,13 +885,13 @@ static int text_cut_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_cut(wmOperatorType *ot) { /* identifiers */ - ot->name= "Cut"; - ot->idname= "TEXT_OT_cut"; - ot->description= "Cut selected text to clipboard"; + ot->name = "Cut"; + ot->idname = "TEXT_OT_cut"; + ot->description = "Cut selected text to clipboard"; /* api callbacks */ - ot->exec= text_cut_exec; - ot->poll= text_edit_poll; + ot->exec = text_cut_exec; + ot->poll = text_edit_poll; } /******************* indent operator *********************/ @@ -920,13 +920,13 @@ static int text_indent_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_indent(wmOperatorType *ot) { /* identifiers */ - ot->name= "Indent"; - ot->idname= "TEXT_OT_indent"; - ot->description= "Indent selected text"; + ot->name = "Indent"; + ot->idname = "TEXT_OT_indent"; + ot->description = "Indent selected text"; /* api callbacks */ - ot->exec= text_indent_exec; - ot->poll= text_edit_poll; + ot->exec = text_indent_exec; + ot->poll = text_edit_poll; } /******************* unindent operator *********************/ @@ -955,13 +955,13 @@ static int text_unindent_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_unindent(wmOperatorType *ot) { /* identifiers */ - ot->name= "Unindent"; - ot->idname= "TEXT_OT_unindent"; - ot->description= "Unindent selected text"; + ot->name = "Unindent"; + ot->idname = "TEXT_OT_unindent"; + ot->description = "Unindent selected text"; /* api callbacks */ - ot->exec= text_unindent_exec; - ot->poll= text_edit_poll; + ot->exec = text_unindent_exec; + ot->poll = text_edit_poll; } /******************* line break operator *********************/ @@ -1002,13 +1002,13 @@ static int text_line_break_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_line_break(wmOperatorType *ot) { /* identifiers */ - ot->name= "Line Break"; - ot->idname= "TEXT_OT_line_break"; - ot->description= "Insert line break at cursor position"; + ot->name = "Line Break"; + ot->idname = "TEXT_OT_line_break"; + ot->description = "Insert line break at cursor position"; /* api callbacks */ - ot->exec= text_line_break_exec; - ot->poll= text_edit_poll; + ot->exec = text_line_break_exec; + ot->poll = text_edit_poll; } /******************* comment operator *********************/ @@ -1035,13 +1035,13 @@ static int text_comment_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_comment(wmOperatorType *ot) { /* identifiers */ - ot->name= "Comment"; - ot->idname= "TEXT_OT_comment"; - ot->description= "Convert selected text to comment"; + ot->name = "Comment"; + ot->idname = "TEXT_OT_comment"; + ot->description = "Convert selected text to comment"; /* api callbacks */ - ot->exec= text_comment_exec; - ot->poll= text_edit_poll; + ot->exec = text_comment_exec; + ot->poll = text_edit_poll; } /******************* uncomment operator *********************/ @@ -1069,13 +1069,13 @@ static int text_uncomment_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_uncomment(wmOperatorType *ot) { /* identifiers */ - ot->name= "Uncomment"; - ot->idname= "TEXT_OT_uncomment"; - ot->description= "Convert selected comment to text"; + ot->name = "Uncomment"; + ot->idname = "TEXT_OT_uncomment"; + ot->description = "Convert selected comment to text"; /* api callbacks */ - ot->exec= text_uncomment_exec; - ot->poll= text_edit_poll; + ot->exec = text_uncomment_exec; + ot->poll = text_edit_poll; } /******************* convert whitespace operator *********************/ @@ -1209,13 +1209,13 @@ static int text_convert_whitespace_exec(bContext *C, wmOperator *op) void TEXT_OT_convert_whitespace(wmOperatorType *ot) { /* identifiers */ - ot->name= "Convert Whitespace"; - ot->idname= "TEXT_OT_convert_whitespace"; - ot->description= "Convert whitespaces by type"; + ot->name = "Convert Whitespace"; + ot->idname = "TEXT_OT_convert_whitespace"; + ot->description = "Convert whitespaces by type"; /* api callbacks */ - ot->exec= text_convert_whitespace_exec; - ot->poll= text_edit_poll; + ot->exec = text_convert_whitespace_exec; + ot->poll = text_edit_poll; /* properties */ RNA_def_enum(ot->srna, "type", whitespace_type_items, TO_SPACES, "Type", "Type of whitespace to convert to"); @@ -1238,13 +1238,13 @@ static int text_select_all_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select All"; - ot->idname= "TEXT_OT_select_all"; - ot->description= "Select all text"; + ot->name = "Select All"; + ot->idname = "TEXT_OT_select_all"; + ot->description = "Select all text"; /* api callbacks */ - ot->exec= text_select_all_exec; - ot->poll= text_edit_poll; + ot->exec = text_select_all_exec; + ot->poll = text_edit_poll; } /******************* select line operator *********************/ @@ -1264,13 +1264,13 @@ static int text_select_line_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_select_line(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Line"; - ot->idname= "TEXT_OT_select_line"; - ot->description= "Select text by line"; + ot->name = "Select Line"; + ot->idname = "TEXT_OT_select_line"; + ot->description = "Select text by line"; /* api callbacks */ - ot->exec= text_select_line_exec; - ot->poll= text_edit_poll; + ot->exec = text_select_line_exec; + ot->poll = text_edit_poll; } /******************* select word operator *********************/ @@ -1291,13 +1291,13 @@ static int text_select_word_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_select_word(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Word"; - ot->idname= "TEXT_OT_select_word"; - ot->description= "Select word under cursor"; + ot->name = "Select Word"; + ot->idname = "TEXT_OT_select_word"; + ot->description = "Select word under cursor"; /* api callbacks */ - ot->exec= text_select_word_exec; - ot->poll= text_edit_poll; + ot->exec = text_select_word_exec; + ot->poll = text_edit_poll; } /******************* previous marker operator *********************/ @@ -1327,13 +1327,13 @@ static int text_previous_marker_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_previous_marker(wmOperatorType *ot) { /* identifiers */ - ot->name= "Previous Marker"; - ot->idname= "TEXT_OT_previous_marker"; - ot->description= "Move to previous marker"; + ot->name = "Previous Marker"; + ot->idname = "TEXT_OT_previous_marker"; + ot->description = "Move to previous marker"; /* api callbacks */ - ot->exec= text_previous_marker_exec; - ot->poll= text_edit_poll; + ot->exec = text_previous_marker_exec; + ot->poll = text_edit_poll; } /******************* next marker operator *********************/ @@ -1363,13 +1363,13 @@ static int text_next_marker_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_next_marker(wmOperatorType *ot) { /* identifiers */ - ot->name= "Next Marker"; - ot->idname= "TEXT_OT_next_marker"; - ot->description= "Move to next marker"; + ot->name = "Next Marker"; + ot->idname = "TEXT_OT_next_marker"; + ot->description = "Move to next marker"; /* api callbacks */ - ot->exec= text_next_marker_exec; - ot->poll= text_edit_poll; + ot->exec = text_next_marker_exec; + ot->poll = text_edit_poll; } /******************* clear all markers operator *********************/ @@ -1389,13 +1389,13 @@ static int text_clear_all_markers_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_markers_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear All Markers"; - ot->idname= "TEXT_OT_markers_clear"; - ot->description= "Clear all markers"; + ot->name = "Clear All Markers"; + ot->idname = "TEXT_OT_markers_clear"; + ot->description = "Clear all markers"; /* api callbacks */ - ot->exec= text_clear_all_markers_exec; - ot->poll= text_edit_poll; + ot->exec = text_clear_all_markers_exec; + ot->poll = text_edit_poll; } /************************ move operator ************************/ @@ -1902,13 +1902,13 @@ static int text_move_exec(bContext *C, wmOperator *op) void TEXT_OT_move(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Cursor"; - ot->idname= "TEXT_OT_move"; - ot->description= "Move cursor to position type"; + ot->name = "Move Cursor"; + ot->idname = "TEXT_OT_move"; + ot->description = "Move cursor to position type"; /* api callbacks */ - ot->exec= text_move_exec; - ot->poll= text_edit_poll; + ot->exec = text_move_exec; + ot->poll = text_edit_poll; /* properties */ RNA_def_enum(ot->srna, "type", move_type_items, LINE_BEGIN, "Type", "Where to move cursor to"); @@ -1926,13 +1926,13 @@ static int text_move_select_exec(bContext *C, wmOperator *op) void TEXT_OT_move_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Select"; - ot->idname= "TEXT_OT_move_select"; - ot->description= "Make selection from current cursor position to new cursor position type"; + ot->name = "Move Select"; + ot->idname = "TEXT_OT_move_select"; + ot->description = "Make selection from current cursor position to new cursor position type"; /* api callbacks */ - ot->exec= text_move_select_exec; - ot->poll= text_space_edit_poll; + ot->exec = text_move_select_exec; + ot->poll = text_space_edit_poll; /* properties */ RNA_def_enum(ot->srna, "type", move_type_items, LINE_BEGIN, "Type", "Where to move cursor to, to make a selection"); @@ -1968,14 +1968,14 @@ static int text_jump_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void TEXT_OT_jump(wmOperatorType *ot) { /* identifiers */ - ot->name= "Jump"; - ot->idname= "TEXT_OT_jump"; - ot->description= "Jump cursor to line"; + ot->name = "Jump"; + ot->idname = "TEXT_OT_jump"; + ot->description = "Jump cursor to line"; /* api callbacks */ - ot->invoke= text_jump_invoke; - ot->exec= text_jump_exec; - ot->poll= text_edit_poll; + ot->invoke = text_jump_invoke; + ot->exec = text_jump_exec; + ot->poll = text_edit_poll; /* properties */ RNA_def_int(ot->srna, "line", 1, 1, INT_MAX, "Line", "Line number to jump to", 1, 10000); @@ -2021,13 +2021,13 @@ static int text_delete_exec(bContext *C, wmOperator *op) void TEXT_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete"; - ot->idname= "TEXT_OT_delete"; - ot->description= "Delete text by cursor position"; + ot->name = "Delete"; + ot->idname = "TEXT_OT_delete"; + ot->description = "Delete text by cursor position"; /* api callbacks */ - ot->exec= text_delete_exec; - ot->poll= text_edit_poll; + ot->exec = text_delete_exec; + ot->poll = text_edit_poll; /* properties */ RNA_def_enum(ot->srna, "type", delete_type_items, DEL_NEXT_CHAR, "Type", "Which part of the text to delete"); @@ -2049,13 +2049,13 @@ static int text_toggle_overwrite_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_overwrite_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Overwrite"; - ot->idname= "TEXT_OT_overwrite_toggle"; - ot->description= "Toggle overwrite while typing"; + ot->name = "Toggle Overwrite"; + ot->idname = "TEXT_OT_overwrite_toggle"; + ot->description = "Toggle overwrite while typing"; /* api callbacks */ - ot->exec= text_toggle_overwrite_exec; - ot->poll= text_space_edit_poll; + ot->exec = text_toggle_overwrite_exec; + ot->poll = text_space_edit_poll; } /******************* scroll operator **********************/ @@ -2249,22 +2249,22 @@ static int text_scroll_invoke(bContext *C, wmOperator *op, wmEvent *event) void TEXT_OT_scroll(wmOperatorType *ot) { /* identifiers */ - ot->name= "Scroll"; + ot->name = "Scroll"; /* don't really see the difference between this and * scroll_bar. Both do basically the same thing (aside * from keymaps).*/ - ot->idname= "TEXT_OT_scroll"; - ot->description= "Scroll text screen"; + ot->idname = "TEXT_OT_scroll"; + ot->description = "Scroll text screen"; /* api callbacks */ - ot->exec= text_scroll_exec; - ot->invoke= text_scroll_invoke; - ot->modal= text_scroll_modal; - ot->cancel= text_scroll_cancel; - ot->poll= text_scroll_poll; + ot->exec = text_scroll_exec; + ot->invoke = text_scroll_invoke; + ot->modal = text_scroll_modal; + ot->cancel = text_scroll_cancel; + ot->poll = text_scroll_poll; /* flags */ - ot->flag= OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; + ot->flag = OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; /* properties */ RNA_def_int(ot->srna, "lines", 1, INT_MIN, INT_MAX, "Lines", "Number of lines to scroll", -100, 100); @@ -2343,21 +2343,21 @@ static int text_scroll_bar_invoke(bContext *C, wmOperator *op, wmEvent *event) void TEXT_OT_scroll_bar(wmOperatorType *ot) { /* identifiers */ - ot->name= "Scrollbar"; + ot->name = "Scrollbar"; /* don't really see the difference between this and * scroll. Both do basically the same thing (aside * from keymaps).*/ - ot->idname= "TEXT_OT_scroll_bar"; - ot->description= "Scroll text screen"; + ot->idname = "TEXT_OT_scroll_bar"; + ot->description = "Scroll text screen"; /* api callbacks */ - ot->invoke= text_scroll_bar_invoke; - ot->modal= text_scroll_modal; - ot->cancel= text_scroll_cancel; - ot->poll= text_region_scroll_poll; + ot->invoke = text_scroll_bar_invoke; + ot->modal = text_scroll_modal; + ot->cancel = text_scroll_cancel; + ot->poll = text_region_scroll_poll; /* flags */ - ot->flag= OPTYPE_BLOCKING; + ot->flag = OPTYPE_BLOCKING; /* properties */ RNA_def_int(ot->srna, "lines", 1, INT_MIN, INT_MAX, "Lines", "Number of lines to scroll", -100, 100); @@ -2679,15 +2679,15 @@ static int text_set_selection_cancel(bContext *C, wmOperator *op) void TEXT_OT_selection_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Selection"; - ot->idname= "TEXT_OT_selection_set"; - ot->description= "Set cursor selection"; + ot->name = "Set Selection"; + ot->idname = "TEXT_OT_selection_set"; + ot->description = "Set cursor selection"; /* api callbacks */ - ot->invoke= text_set_selection_invoke; - ot->modal= text_set_selection_modal; - ot->cancel= text_set_selection_cancel; - ot->poll= text_region_edit_poll; + ot->invoke = text_set_selection_invoke; + ot->modal = text_set_selection_modal; + ot->cancel = text_set_selection_cancel; + ot->poll = text_region_edit_poll; /* properties */ RNA_def_boolean(ot->srna, "select", 0, "Select", "Set selection end rather than cursor"); @@ -2733,14 +2733,14 @@ static int text_cursor_set_invoke(bContext *C, wmOperator *op, wmEvent *event) void TEXT_OT_cursor_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Cursor"; - ot->idname= "TEXT_OT_cursor_set"; - ot->description= "Set cursor position"; + ot->name = "Set Cursor"; + ot->idname = "TEXT_OT_cursor_set"; + ot->description = "Set cursor position"; /* api callbacks */ - ot->invoke= text_cursor_set_invoke; - ot->exec= text_cursor_set_exec; - ot->poll= text_region_edit_poll; + ot->invoke = text_cursor_set_invoke; + ot->exec = text_cursor_set_exec; + ot->poll = text_region_edit_poll; /* properties */ RNA_def_int(ot->srna, "x", 0, INT_MIN, INT_MAX, "X", "", INT_MIN, INT_MAX); @@ -2789,13 +2789,13 @@ static int text_line_number_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent void TEXT_OT_line_number(wmOperatorType *ot) { /* identifiers */ - ot->name= "Line Number"; - ot->idname= "TEXT_OT_line_number"; - ot->description= "The current line number"; + ot->name = "Line Number"; + ot->idname = "TEXT_OT_line_number"; + ot->description = "The current line number"; /* api callbacks */ - ot->invoke= text_line_number_invoke; - ot->poll= text_region_edit_poll; + ot->invoke = text_line_number_invoke; + ot->poll = text_region_edit_poll; } /******************* insert operator **********************/ @@ -2878,14 +2878,14 @@ void TEXT_OT_insert(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Insert"; - ot->idname= "TEXT_OT_insert"; - ot->description= "Insert text at cursor position"; + ot->name = "Insert"; + ot->idname = "TEXT_OT_insert"; + ot->description = "Insert text at cursor position"; /* api callbacks */ - ot->exec= text_insert_exec; - ot->invoke= text_insert_invoke; - ot->poll= text_edit_poll; + ot->exec = text_insert_exec; + ot->invoke = text_insert_invoke; + ot->poll = text_edit_poll; /* properties */ prop = RNA_def_string(ot->srna, "text", "", 0, "Text", "Text to insert at the cursor position"); @@ -2998,13 +2998,13 @@ static int text_find_exec(bContext *C, wmOperator *op) void TEXT_OT_find(wmOperatorType *ot) { /* identifiers */ - ot->name= "Find"; - ot->idname= "TEXT_OT_find"; - ot->description= "Find specified text"; + ot->name = "Find"; + ot->idname = "TEXT_OT_find"; + ot->description = "Find specified text"; /* api callbacks */ - ot->exec= text_find_exec; - ot->poll= text_space_edit_poll; + ot->exec = text_find_exec; + ot->poll = text_space_edit_poll; } /******************* replace operator *********************/ @@ -3017,13 +3017,13 @@ static int text_replace_exec(bContext *C, wmOperator *op) void TEXT_OT_replace(wmOperatorType *ot) { /* identifiers */ - ot->name= "Replace"; - ot->idname= "TEXT_OT_replace"; - ot->description= "Replace text with the specified text"; + ot->name = "Replace"; + ot->idname = "TEXT_OT_replace"; + ot->description = "Replace text with the specified text"; /* api callbacks */ - ot->exec= text_replace_exec; - ot->poll= text_space_edit_poll; + ot->exec = text_replace_exec; + ot->poll = text_space_edit_poll; } /******************* mark all operator *********************/ @@ -3036,13 +3036,13 @@ static int text_mark_all_exec(bContext *C, wmOperator *op) void TEXT_OT_mark_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Mark All"; - ot->idname= "TEXT_OT_mark_all"; - ot->description= "Mark all specified text"; + ot->name = "Mark All"; + ot->idname = "TEXT_OT_mark_all"; + ot->description = "Mark all specified text"; /* api callbacks */ - ot->exec= text_mark_all_exec; - ot->poll= text_space_edit_poll; + ot->exec = text_mark_all_exec; + ot->poll = text_space_edit_poll; } /******************* find set selected *********************/ @@ -3066,13 +3066,13 @@ static int text_find_set_selected_exec(bContext *C, wmOperator *op) void TEXT_OT_find_set_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= "Find Set Selected"; - ot->idname= "TEXT_OT_find_set_selected"; - ot->description= "Find specified text and set as selected"; + ot->name = "Find Set Selected"; + ot->idname = "TEXT_OT_find_set_selected"; + ot->description = "Find specified text and set as selected"; /* api callbacks */ - ot->exec= text_find_set_selected_exec; - ot->poll= text_space_edit_poll; + ot->exec = text_find_set_selected_exec; + ot->poll = text_space_edit_poll; } /******************* replace set selected *********************/ @@ -3093,13 +3093,13 @@ static int text_replace_set_selected_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_replace_set_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= "Replace Set Selected"; - ot->idname= "TEXT_OT_replace_set_selected"; - ot->description= "Replace text with specified text and set as selected"; + ot->name = "Replace Set Selected"; + ot->idname = "TEXT_OT_replace_set_selected"; + ot->description = "Replace text with specified text and set as selected"; /* api callbacks */ - ot->exec= text_replace_set_selected_exec; - ot->poll= text_space_edit_poll; + ot->exec = text_replace_set_selected_exec; + ot->poll = text_space_edit_poll; } /****************** resolve conflict operator ******************/ @@ -3228,14 +3228,14 @@ static int text_resolve_conflict_invoke(bContext *C, wmOperator *op, wmEvent *UN void TEXT_OT_resolve_conflict(wmOperatorType *ot) { /* identifiers */ - ot->name= "Resolve Conflict"; - ot->idname= "TEXT_OT_resolve_conflict"; - ot->description= "When external text is out of sync, resolve the conflict"; + ot->name = "Resolve Conflict"; + ot->idname = "TEXT_OT_resolve_conflict"; + ot->description = "When external text is out of sync, resolve the conflict"; /* api callbacks */ - ot->exec= text_resolve_conflict_exec; - ot->invoke= text_resolve_conflict_invoke; - ot->poll= text_save_poll; + ot->exec = text_resolve_conflict_exec; + ot->invoke = text_resolve_conflict_invoke; + ot->poll = text_save_poll; /* properties */ RNA_def_enum(ot->srna, "resolution", resolution_items, RESOLVE_IGNORE, "Resolution", "How to solve conflict due to differences in internal and external text"); @@ -3256,16 +3256,16 @@ static int text_to_3d_object_exec(bContext *C, wmOperator *op) void TEXT_OT_to_3d_object(wmOperatorType *ot) { /* identifiers */ - ot->name= "To 3D Object"; - ot->idname= "TEXT_OT_to_3d_object"; - ot->description= "Create 3d text object from active text data block"; + ot->name = "To 3D Object"; + ot->idname = "TEXT_OT_to_3d_object"; + ot->description = "Create 3d text object from active text data block"; /* api callbacks */ - ot->exec= text_to_3d_object_exec; - ot->poll= text_edit_poll; + ot->exec = text_to_3d_object_exec; + ot->poll = text_edit_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "split_lines", 0, "Split Lines", "Create one object per line in the text"); diff --git a/source/blender/editors/space_time/time_ops.c b/source/blender/editors/space_time/time_ops.c index 78d903a2997..ef0356d648e 100644 --- a/source/blender/editors/space_time/time_ops.c +++ b/source/blender/editors/space_time/time_ops.c @@ -75,16 +75,16 @@ static int time_set_sfra_exec (bContext *C, wmOperator *UNUSED(op)) static void TIME_OT_start_frame_set (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Start Frame"; - ot->idname= "TIME_OT_start_frame_set"; - ot->description="Set the start frame"; + ot->name = "Set Start Frame"; + ot->idname = "TIME_OT_start_frame_set"; + ot->description = "Set the start frame"; /* api callbacks */ - ot->exec= time_set_sfra_exec; - ot->poll= ED_operator_timeline_active; + ot->exec = time_set_sfra_exec; + ot->poll = ED_operator_timeline_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -117,16 +117,16 @@ static int time_set_efra_exec (bContext *C, wmOperator *UNUSED(op)) static void TIME_OT_end_frame_set (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set End Frame"; - ot->idname= "TIME_OT_end_frame_set"; - ot->description="Set the end frame"; + ot->name = "Set End Frame"; + ot->idname = "TIME_OT_end_frame_set"; + ot->description = "Set the end frame"; /* api callbacks */ - ot->exec= time_set_efra_exec; - ot->poll= ED_operator_timeline_active; + ot->exec = time_set_efra_exec; + ot->poll = ED_operator_timeline_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ************************ View All Operator *******************************/ @@ -159,16 +159,16 @@ static int time_view_all_exec (bContext *C, wmOperator *UNUSED(op)) static void TIME_OT_view_all (wmOperatorType *ot) { /* identifiers */ - ot->name= "View All"; - ot->idname= "TIME_OT_view_all"; - ot->description= "Show the entire playable frame range"; + ot->name = "View All"; + ot->idname = "TIME_OT_view_all"; + ot->description = "Show the entire playable frame range"; /* api callbacks */ - ot->exec= time_view_all_exec; - ot->poll= ED_operator_timeline_active; + ot->exec = time_view_all_exec; + ot->poll = ED_operator_timeline_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ************************** registration **********************************/ diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index c04f352a5d0..4ddc518b814 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -948,18 +948,18 @@ void VIEW3D_OT_rotate(wmOperatorType *ot) { /* identifiers */ - ot->name= "Rotate view"; + ot->name = "Rotate view"; ot->description = "Rotate the view"; - ot->idname= "VIEW3D_OT_rotate"; + ot->idname = "VIEW3D_OT_rotate"; /* api callbacks */ - ot->invoke= viewrotate_invoke; - ot->modal= viewrotate_modal; - ot->poll= ED_operator_region_view3d_active; - ot->cancel= viewrotate_cancel; + ot->invoke = viewrotate_invoke; + ot->modal = viewrotate_modal; + ot->poll = ED_operator_region_view3d_active; + ot->cancel = viewrotate_cancel; /* flags */ - ot->flag= OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; + ot->flag = OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; } /* NDOF utility functions @@ -1375,18 +1375,18 @@ void VIEW3D_OT_move(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move view"; + ot->name = "Move view"; ot->description = "Move the view"; - ot->idname= "VIEW3D_OT_move"; + ot->idname = "VIEW3D_OT_move"; /* api callbacks */ - ot->invoke= viewmove_invoke; - ot->modal= viewmove_modal; - ot->poll= ED_operator_view3d_active; - ot->cancel= viewmove_cancel; + ot->invoke = viewmove_invoke; + ot->modal = viewmove_modal; + ot->poll = ED_operator_view3d_active; + ot->cancel = viewmove_cancel; /* flags */ - ot->flag= OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; + ot->flag = OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; } /* ************************ viewzoom ******************************** */ @@ -1758,19 +1758,19 @@ static int viewzoom_cancel(bContext *C, wmOperator *op) void VIEW3D_OT_zoom(wmOperatorType *ot) { /* identifiers */ - ot->name= "Zoom View"; + ot->name = "Zoom View"; ot->description = "Zoom in/out in the view"; - ot->idname= "VIEW3D_OT_zoom"; + ot->idname = "VIEW3D_OT_zoom"; /* api callbacks */ - ot->invoke= viewzoom_invoke; - ot->exec= viewzoom_exec; - ot->modal= viewzoom_modal; - ot->poll= ED_operator_region_view3d_active; - ot->cancel= viewzoom_cancel; + ot->invoke = viewzoom_invoke; + ot->exec = viewzoom_exec; + ot->modal = viewzoom_modal; + ot->poll = ED_operator_region_view3d_active; + ot->cancel = viewzoom_cancel; /* flags */ - ot->flag= OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; + ot->flag = OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, "Delta", "", INT_MIN, INT_MAX); RNA_def_int(ot->srna, "mx", 0, 0, INT_MAX, "Zoom Position X", "", 0, INT_MAX); @@ -1991,19 +1991,19 @@ static int viewdolly_cancel(bContext *C, wmOperator *op) void VIEW3D_OT_dolly(wmOperatorType *ot) { /* identifiers */ - ot->name= "Dolly view"; + ot->name = "Dolly view"; ot->description = "Dolly in/out in the view"; - ot->idname= "VIEW3D_OT_dolly"; + ot->idname = "VIEW3D_OT_dolly"; /* api callbacks */ - ot->invoke= viewdolly_invoke; - ot->exec= viewdolly_exec; - ot->modal= viewdolly_modal; - ot->poll= viewdolly_poll; - ot->cancel= viewdolly_cancel; + ot->invoke = viewdolly_invoke; + ot->exec = viewdolly_exec; + ot->modal = viewdolly_modal; + ot->poll = viewdolly_poll; + ot->cancel = viewdolly_cancel; /* flags */ - ot->flag= OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; + ot->flag = OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, "Delta", "", INT_MIN, INT_MAX); RNA_def_int(ot->srna, "mx", 0, 0, INT_MAX, "Zoom Position X", "", 0, INT_MAX); @@ -2100,16 +2100,16 @@ static int view3d_all_exec(bContext *C, wmOperator *op) /* was view3d_home() in void VIEW3D_OT_view_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "View All"; + ot->name = "View All"; ot->description = "View all objects in scene"; - ot->idname= "VIEW3D_OT_view_all"; + ot->idname = "VIEW3D_OT_view_all"; /* api callbacks */ - ot->exec= view3d_all_exec; - ot->poll= ED_operator_region_view3d_active; + ot->exec = view3d_all_exec; + ot->poll = ED_operator_region_view3d_active; /* flags */ - ot->flag= 0; + ot->flag = 0; RNA_def_boolean(ot->srna, "center", 0, "Center", ""); } @@ -2247,16 +2247,16 @@ void VIEW3D_OT_view_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Selected"; + ot->name = "View Selected"; ot->description = "Move the view to the selection center"; - ot->idname= "VIEW3D_OT_view_selected"; + ot->idname = "VIEW3D_OT_view_selected"; /* api callbacks */ - ot->exec= viewselected_exec; - ot->poll= ED_operator_region_view3d_active; + ot->exec = viewselected_exec; + ot->poll = ED_operator_region_view3d_active; /* flags */ - ot->flag= 0; + ot->flag = 0; } static int viewcenter_cursor_exec(bContext *C, wmOperator *UNUSED(op)) @@ -2282,16 +2282,16 @@ static int viewcenter_cursor_exec(bContext *C, wmOperator *UNUSED(op)) void VIEW3D_OT_view_center_cursor(wmOperatorType *ot) { /* identifiers */ - ot->name= "Center View to Cursor"; - ot->description= "Center the view so that the cursor is in the middle of the view"; - ot->idname= "VIEW3D_OT_view_center_cursor"; + ot->name = "Center View to Cursor"; + ot->description = "Center the view so that the cursor is in the middle of the view"; + ot->idname = "VIEW3D_OT_view_center_cursor"; /* api callbacks */ - ot->exec= viewcenter_cursor_exec; - ot->poll= ED_operator_view3d_active; + ot->exec = viewcenter_cursor_exec; + ot->poll = ED_operator_view3d_active; /* flags */ - ot->flag= 0; + ot->flag = 0; } static int view3d_center_camera_exec(bContext *C, wmOperator *UNUSED(op)) /* was view3d_home() in 2.4x */ @@ -2327,16 +2327,16 @@ static int view3d_center_camera_exec(bContext *C, wmOperator *UNUSED(op)) /* was void VIEW3D_OT_view_center_camera(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Camera Center"; + ot->name = "View Camera Center"; ot->description = "Center the camera view"; - ot->idname= "VIEW3D_OT_view_center_camera"; + ot->idname = "VIEW3D_OT_view_center_camera"; /* api callbacks */ - ot->exec= view3d_center_camera_exec; - ot->poll= view3d_camera_user_poll; + ot->exec = view3d_center_camera_exec; + ot->poll = view3d_camera_user_poll; /* flags */ - ot->flag= 0; + ot->flag = 0; } /* ********************* Set render border operator ****************** */ @@ -2393,20 +2393,20 @@ static int render_border_exec(bContext *C, wmOperator *op) void VIEW3D_OT_render_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Render Border"; + ot->name = "Set Render Border"; ot->description = "Set the boundaries of the border render and enables border render"; - ot->idname= "VIEW3D_OT_render_border"; + ot->idname = "VIEW3D_OT_render_border"; /* api callbacks */ - ot->invoke= WM_border_select_invoke; - ot->exec= render_border_exec; - ot->modal= WM_border_select_modal; - ot->cancel= WM_border_select_cancel; + ot->invoke = WM_border_select_invoke; + ot->exec = render_border_exec; + ot->modal = WM_border_select_modal; + ot->cancel = WM_border_select_cancel; - ot->poll= view3d_camera_active_poll; + ot->poll = view3d_camera_active_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* rna */ RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX); @@ -2559,20 +2559,20 @@ static int view3d_zoom_border_invoke(bContext *C, wmOperator *op, wmEvent *event void VIEW3D_OT_zoom_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Zoom"; + ot->name = "Border Zoom"; ot->description = "Zoom in the view to the nearest object contained in the border"; - ot->idname= "VIEW3D_OT_zoom_border"; + ot->idname = "VIEW3D_OT_zoom_border"; /* api callbacks */ - ot->invoke= view3d_zoom_border_invoke; - ot->exec= view3d_zoom_border_exec; - ot->modal= WM_border_select_modal; - ot->cancel= WM_border_select_cancel; + ot->invoke = view3d_zoom_border_invoke; + ot->exec = view3d_zoom_border_exec; + ot->modal = WM_border_select_modal; + ot->cancel = WM_border_select_cancel; - ot->poll= ED_operator_region_view3d_active; + ot->poll = ED_operator_region_view3d_active; /* flags */ - ot->flag= 0; + ot->flag = 0; /* rna */ RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX); @@ -2615,16 +2615,16 @@ static int view3d_zoom_1_to_1_camera_exec(bContext *C, wmOperator *UNUSED(op)) void VIEW3D_OT_zoom_camera_1_to_1(wmOperatorType *ot) { /* identifiers */ - ot->name= "Zoom Camera 1:1"; + ot->name = "Zoom Camera 1:1"; ot->description = "Match the camera to 1:1 to the render output"; - ot->idname= "VIEW3D_OT_zoom_camera_1_to_1"; + ot->idname = "VIEW3D_OT_zoom_camera_1_to_1"; /* api callbacks */ - ot->exec= view3d_zoom_1_to_1_camera_exec; - ot->poll= view3d_camera_user_poll; + ot->exec = view3d_zoom_1_to_1_camera_exec; + ot->poll = view3d_camera_user_poll; /* flags */ - ot->flag= 0; + ot->flag = 0; } /* ********************* Changing view operator ****************** */ @@ -2856,16 +2856,16 @@ static int viewnumpad_exec(bContext *C, wmOperator *op) void VIEW3D_OT_viewnumpad(wmOperatorType *ot) { /* identifiers */ - ot->name= "View numpad"; + ot->name = "View numpad"; ot->description = "Set the view"; - ot->idname= "VIEW3D_OT_viewnumpad"; + ot->idname = "VIEW3D_OT_viewnumpad"; /* api callbacks */ - ot->exec= viewnumpad_exec; - ot->poll= ED_operator_rv3d_user_region_poll; + ot->exec = viewnumpad_exec; + ot->poll = ED_operator_rv3d_user_region_poll; /* flags */ - ot->flag= 0; + ot->flag = 0; RNA_def_enum(ot->srna, "type", prop_view_items, 0, "View", "The Type of view"); RNA_def_boolean(ot->srna, "align_active", 0, "Align Active", "Align to the active object's axis"); @@ -2929,16 +2929,16 @@ static int vieworbit_exec(bContext *C, wmOperator *op) void VIEW3D_OT_view_orbit(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Orbit"; + ot->name = "View Orbit"; ot->description = "Orbit the view"; - ot->idname= "VIEW3D_OT_view_orbit"; + ot->idname = "VIEW3D_OT_view_orbit"; /* api callbacks */ - ot->exec= vieworbit_exec; - ot->poll= ED_operator_rv3d_user_region_poll; + ot->exec = vieworbit_exec; + ot->poll = ED_operator_rv3d_user_region_poll; /* flags */ - ot->flag= 0; + ot->flag = 0; RNA_def_enum(ot->srna, "type", prop_view_orbit_items, 0, "Orbit", "Direction of View Orbit"); } @@ -2977,16 +2977,16 @@ static int viewpan_exec(bContext *C, wmOperator *op) void VIEW3D_OT_view_pan(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Pan"; + ot->name = "View Pan"; ot->description = "Pan the view"; - ot->idname= "VIEW3D_OT_view_pan"; + ot->idname = "VIEW3D_OT_view_pan"; /* api callbacks */ - ot->exec= viewpan_exec; - ot->poll= ED_operator_region_view3d_active; + ot->exec = viewpan_exec; + ot->poll = ED_operator_region_view3d_active; /* flags */ - ot->flag= 0; + ot->flag = 0; RNA_def_enum(ot->srna, "type", prop_view_pan_items, 0, "Pan", "Direction of View Pan"); } @@ -3014,16 +3014,16 @@ static int viewpersportho_exec(bContext *C, wmOperator *UNUSED(op)) void VIEW3D_OT_view_persportho(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Persp/Ortho"; + ot->name = "View Persp/Ortho"; ot->description = "Switch the current view from perspective/orthographic"; - ot->idname= "VIEW3D_OT_view_persportho"; + ot->idname = "VIEW3D_OT_view_persportho"; /* api callbacks */ - ot->exec= viewpersportho_exec; - ot->poll= ED_operator_rv3d_user_region_poll; + ot->exec = viewpersportho_exec; + ot->poll = ED_operator_rv3d_user_region_poll; /* flags */ - ot->flag= 0; + ot->flag = 0; } @@ -3083,7 +3083,7 @@ void VIEW3D_OT_background_image_add(wmOperatorType *ot) { /* identifiers */ ot->name = "Add Background Image"; - ot->description= "Add a new background image"; + ot->description = "Add a new background image"; ot->idname = "VIEW3D_OT_background_image_add"; /* api callbacks */ @@ -3122,7 +3122,7 @@ void VIEW3D_OT_background_image_remove(wmOperatorType *ot) { /* identifiers */ ot->name = "Remove Background Image"; - ot->description= "Remove a background image from the 3D view"; + ot->description = "Remove a background image from the 3D view"; ot->idname = "VIEW3D_OT_background_image_remove"; /* api callbacks */ @@ -3220,20 +3220,20 @@ void VIEW3D_OT_clip_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clipping Border"; + ot->name = "Clipping Border"; ot->description = "Set the view clipping border"; - ot->idname= "VIEW3D_OT_clip_border"; + ot->idname = "VIEW3D_OT_clip_border"; /* api callbacks */ - ot->invoke= view3d_clipping_invoke; - ot->exec= view3d_clipping_exec; - ot->modal= WM_border_select_modal; - ot->cancel= WM_border_select_cancel; + ot->invoke = view3d_clipping_invoke; + ot->exec = view3d_clipping_exec; + ot->modal = WM_border_select_modal; + ot->cancel = WM_border_select_cancel; - ot->poll= ED_operator_region_view3d_active; + ot->poll = ED_operator_region_view3d_active; /* flags */ - ot->flag= 0; + ot->flag = 0; /* rna */ RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX); @@ -3314,17 +3314,17 @@ void VIEW3D_OT_cursor3d(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set 3D Cursor"; + ot->name = "Set 3D Cursor"; ot->description = "Set the location of the 3D cursor"; - ot->idname= "VIEW3D_OT_cursor3d"; + ot->idname = "VIEW3D_OT_cursor3d"; /* api callbacks */ - ot->invoke= set_3dcursor_invoke; + ot->invoke = set_3dcursor_invoke; - ot->poll= ED_operator_view3d_active; + ot->poll = ED_operator_view3d_active; /* flags */ -// ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; +// ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* rna later */ @@ -3356,14 +3356,14 @@ void VIEW3D_OT_manipulator(wmOperatorType *ot) { /* identifiers */ - ot->name= "3D Manipulator"; + ot->name = "3D Manipulator"; ot->description = "Manipulate selected item by axis"; - ot->idname= "VIEW3D_OT_manipulator"; + ot->idname = "VIEW3D_OT_manipulator"; /* api callbacks */ - ot->invoke= manipulator_invoke; + ot->invoke = manipulator_invoke; - ot->poll= ED_operator_view3d_active; + ot->poll = ED_operator_view3d_active; /* properties to pass to transform */ Transform_Properties(ot, P_CONSTRAINT); @@ -3390,13 +3390,13 @@ static int enable_manipulator_invoke(bContext *C, wmOperator *op, wmEvent *UNUSE void VIEW3D_OT_enable_manipulator(wmOperatorType *ot) { /* identifiers */ - ot->name= "Enable 3D Manipulator"; + ot->name = "Enable 3D Manipulator"; ot->description = "Enable the transform manipulator for use"; - ot->idname= "VIEW3D_OT_enable_manipulator"; + ot->idname = "VIEW3D_OT_enable_manipulator"; /* api callbacks */ - ot->invoke= enable_manipulator_invoke; - ot->poll= ED_operator_view3d_active; + ot->invoke = enable_manipulator_invoke; + ot->poll = ED_operator_view3d_active; /* rna later */ RNA_def_boolean(ot->srna, "translate", 0, "Translate", "Enable the translate manipulator"); diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 541c8028fe5..532ca805125 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -254,17 +254,17 @@ static int view3d_layers_poll(bContext *C) void VIEW3D_OT_layers(wmOperatorType *ot) { /* identifiers */ - ot->name= "Layers"; - ot->description= "Toggle layer(s) visibility"; - ot->idname= "VIEW3D_OT_layers"; + ot->name = "Layers"; + ot->description = "Toggle layer(s) visibility"; + ot->idname = "VIEW3D_OT_layers"; /* api callbacks */ - ot->invoke= view3d_layers_invoke; - ot->exec= view3d_layers_exec; - ot->poll= view3d_layers_poll; + ot->invoke = view3d_layers_invoke; + ot->exec = view3d_layers_exec; + ot->poll = view3d_layers_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_int(ot->srna, "nr", 1, 0, 20, "Number", "The layer number to set, zero for all layers", 0, 20); RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Add this layer to the current view layers"); diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index a7c711968aa..22e5eabe5b0 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -997,18 +997,18 @@ static int view3d_lasso_select_exec(bContext *C, wmOperator *op) void VIEW3D_OT_select_lasso(wmOperatorType *ot) { - ot->name= "Lasso Select"; - ot->description= "Select items using lasso selection"; - ot->idname= "VIEW3D_OT_select_lasso"; + ot->name = "Lasso Select"; + ot->description = "Select items using lasso selection"; + ot->idname = "VIEW3D_OT_select_lasso"; - ot->invoke= WM_gesture_lasso_invoke; - ot->modal= WM_gesture_lasso_modal; - ot->exec= view3d_lasso_select_exec; - ot->poll= view3d_selectable_data; - ot->cancel= WM_gesture_lasso_cancel; + ot->invoke = WM_gesture_lasso_invoke; + ot->modal = WM_gesture_lasso_modal; + ot->exec = view3d_lasso_select_exec; + ot->poll = view3d_selectable_data; + ot->cancel = WM_gesture_lasso_cancel; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; RNA_def_collection_runtime(ot->srna, "path", &RNA_OperatorMousePath, "Path", ""); RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", "Deselect rather than select items"); @@ -1150,22 +1150,22 @@ void VIEW3D_OT_select_menu(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Select Menu"; + ot->name = "Select Menu"; ot->description = "Menu object selection"; - ot->idname= "VIEW3D_OT_select_menu"; + ot->idname = "VIEW3D_OT_select_menu"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= object_select_menu_exec; + ot->invoke = WM_menu_invoke; + ot->exec = object_select_menu_exec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* keyingset to use (dynamic enum) */ prop= RNA_def_enum(ot->srna, "name", DummyRNA_NULL_items, 0, "Object Name", ""); RNA_def_enum_funcs(prop, object_select_menu_enum_itemf); RNA_def_property_flag(prop, PROP_HIDDEN); - ot->prop= prop; + ot->prop = prop; RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everything first"); } @@ -2136,19 +2136,19 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op) void VIEW3D_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Select"; - ot->description= "Select items using border selection"; - ot->idname= "VIEW3D_OT_select_border"; + ot->name = "Border Select"; + ot->description = "Select items using border selection"; + ot->idname = "VIEW3D_OT_select_border"; /* api callbacks */ - ot->invoke= WM_border_select_invoke; - ot->exec= view3d_borderselect_exec; - ot->modal= WM_border_select_modal; - ot->poll= view3d_selectable_data; - ot->cancel= WM_border_select_cancel; + ot->invoke = WM_border_select_invoke; + ot->exec = view3d_borderselect_exec; + ot->modal = WM_border_select_modal; + ot->poll = view3d_selectable_data; + ot->cancel = WM_border_select_cancel; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; /* rna */ WM_operator_properties_gesture_border(ot, TRUE); @@ -2269,16 +2269,16 @@ static int view3d_select_invoke(bContext *C, wmOperator *op, wmEvent *event) void VIEW3D_OT_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Activate/Select"; - ot->description= "Activate/select item(s)"; - ot->idname= "VIEW3D_OT_select"; + ot->name = "Activate/Select"; + ot->description = "Activate/select item(s)"; + ot->idname = "VIEW3D_OT_select"; /* api callbacks */ - ot->invoke= view3d_select_invoke; - ot->poll= ED_operator_view3d_active; + ot->invoke = view3d_select_invoke; + ot->poll = ED_operator_view3d_active; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everything first"); @@ -2726,18 +2726,18 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op) void VIEW3D_OT_select_circle(wmOperatorType *ot) { - ot->name= "Circle Select"; - ot->description= "Select items using circle selection"; - ot->idname= "VIEW3D_OT_select_circle"; + ot->name = "Circle Select"; + ot->description = "Select items using circle selection"; + ot->idname = "VIEW3D_OT_select_circle"; - ot->invoke= WM_gesture_circle_invoke; - ot->modal= WM_gesture_circle_modal; - ot->exec= view3d_circle_select_exec; - ot->poll= view3d_selectable_data; - ot->cancel= WM_gesture_circle_cancel; + ot->invoke = WM_gesture_circle_invoke; + ot->modal = WM_gesture_circle_modal; + ot->exec = view3d_circle_select_exec; + ot->poll = view3d_selectable_data; + ot->cancel = WM_gesture_circle_cancel; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; RNA_def_int(ot->srna, "x", 0, INT_MIN, INT_MAX, "X", "", INT_MIN, INT_MAX); RNA_def_int(ot->srna, "y", 0, INT_MIN, INT_MAX, "Y", "", INT_MIN, INT_MAX); diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index ef02e96b47e..55cc5af493e 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -635,16 +635,16 @@ static int snap_sel_to_grid(bContext *C, wmOperator *UNUSED(op)) void VIEW3D_OT_snap_selected_to_grid(wmOperatorType *ot) { /* identifiers */ - ot->name= "Snap Selection to Grid"; - ot->description= "Snap selected item(s) to nearest grid node"; - ot->idname= "VIEW3D_OT_snap_selected_to_grid"; + ot->name = "Snap Selection to Grid"; + ot->description = "Snap selected item(s) to nearest grid node"; + ot->idname = "VIEW3D_OT_snap_selected_to_grid"; /* api callbacks */ - ot->exec= snap_sel_to_grid; - ot->poll= ED_operator_region_view3d_active; + ot->exec = snap_sel_to_grid; + ot->poll = ED_operator_region_view3d_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* *************************************************** */ @@ -759,16 +759,16 @@ static int snap_sel_to_curs(bContext *C, wmOperator *UNUSED(op)) void VIEW3D_OT_snap_selected_to_cursor(wmOperatorType *ot) { /* identifiers */ - ot->name= "Snap Selection to Cursor"; - ot->description= "Snap selected item(s) to cursor"; - ot->idname= "VIEW3D_OT_snap_selected_to_cursor"; + ot->name = "Snap Selection to Cursor"; + ot->description = "Snap selected item(s) to cursor"; + ot->idname = "VIEW3D_OT_snap_selected_to_cursor"; /* api callbacks */ - ot->exec= snap_sel_to_curs; - ot->poll= ED_operator_view3d_active; + ot->exec = snap_sel_to_curs; + ot->poll = ED_operator_view3d_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* *************************************************** */ @@ -795,16 +795,16 @@ static int snap_curs_to_grid(bContext *C, wmOperator *UNUSED(op)) void VIEW3D_OT_snap_cursor_to_grid(wmOperatorType *ot) { /* identifiers */ - ot->name= "Snap Cursor to Grid"; - ot->description= "Snap cursor to nearest grid node"; - ot->idname= "VIEW3D_OT_snap_cursor_to_grid"; + ot->name = "Snap Cursor to Grid"; + ot->description = "Snap cursor to nearest grid node"; + ot->idname = "VIEW3D_OT_snap_cursor_to_grid"; /* api callbacks */ - ot->exec= snap_curs_to_grid; - ot->poll= ED_operator_region_view3d_active; + ot->exec = snap_curs_to_grid; + ot->poll = ED_operator_region_view3d_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* **************************************************** */ @@ -958,16 +958,16 @@ static int snap_curs_to_sel(bContext *C, wmOperator *UNUSED(op)) void VIEW3D_OT_snap_cursor_to_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= "Snap Cursor to Selected"; - ot->description= "Snap cursor to center of selected item(s)"; - ot->idname= "VIEW3D_OT_snap_cursor_to_selected"; + ot->name = "Snap Cursor to Selected"; + ot->description = "Snap cursor to center of selected item(s)"; + ot->idname = "VIEW3D_OT_snap_cursor_to_selected"; /* api callbacks */ - ot->exec= snap_curs_to_sel; - ot->poll= ED_operator_view3d_active; + ot->exec = snap_curs_to_sel; + ot->poll = ED_operator_view3d_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ********************************************** */ @@ -1008,16 +1008,16 @@ static int snap_curs_to_active(bContext *C, wmOperator *UNUSED(op)) void VIEW3D_OT_snap_cursor_to_active(wmOperatorType *ot) { /* identifiers */ - ot->name= "Snap Cursor to Active"; - ot->description= "Snap cursor to active item"; - ot->idname= "VIEW3D_OT_snap_cursor_to_active"; + ot->name = "Snap Cursor to Active"; + ot->description = "Snap cursor to active item"; + ot->idname = "VIEW3D_OT_snap_cursor_to_active"; /* api callbacks */ - ot->exec= snap_curs_to_active; - ot->poll= ED_operator_view3d_active; + ot->exec = snap_curs_to_active; + ot->poll = ED_operator_view3d_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* **************************************************** */ @@ -1041,16 +1041,16 @@ static int snap_curs_to_center(bContext *C, wmOperator *UNUSED(op)) void VIEW3D_OT_snap_cursor_to_center(wmOperatorType *ot) { /* identifiers */ - ot->name= "Snap Cursor to Center"; - ot->description= "Snap cursor to the Center"; - ot->idname= "VIEW3D_OT_snap_cursor_to_center"; + ot->name = "Snap Cursor to Center"; + ot->description = "Snap cursor to the Center"; + ot->idname = "VIEW3D_OT_snap_cursor_to_center"; /* api callbacks */ - ot->exec= snap_curs_to_center; - ot->poll= ED_operator_view3d_active; + ot->exec = snap_curs_to_center; + ot->poll = ED_operator_view3d_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* **************************************************** */ diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c b/source/blender/editors/space_view3d/view3d_toolbar.c index 355febcde5d..3db9be02af1 100644 --- a/source/blender/editors/space_view3d/view3d_toolbar.c +++ b/source/blender/editors/space_view3d/view3d_toolbar.c @@ -257,14 +257,14 @@ static int view3d_toolshelf(bContext *C, wmOperator *UNUSED(op)) void VIEW3D_OT_toolshelf(wmOperatorType *ot) { - ot->name= "Tool Shelf"; - ot->description= "Toggles tool shelf display"; - ot->idname= "VIEW3D_OT_toolshelf"; + ot->name = "Tool Shelf"; + ot->description = "Toggles tool shelf display"; + ot->idname = "VIEW3D_OT_toolshelf"; - ot->exec= view3d_toolshelf; - ot->poll= ED_operator_view3d_active; + ot->exec = view3d_toolshelf; + ot->poll = ED_operator_view3d_active; /* flags */ - ot->flag= 0; + ot->flag = 0; } diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 7bd878351d9..5174c832ac4 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -334,14 +334,14 @@ void VIEW3D_OT_smoothview(wmOperatorType *ot) { /* identifiers */ - ot->name= "Smooth View"; - ot->idname= "VIEW3D_OT_smoothview"; - ot->description="The time to animate the change of view (in milliseconds)"; + ot->name = "Smooth View"; + ot->idname = "VIEW3D_OT_smoothview"; + ot->description = "The time to animate the change of view (in milliseconds)"; /* api callbacks */ - ot->invoke= view3d_smoothview_invoke; + ot->invoke = view3d_smoothview_invoke; - ot->poll= ED_operator_view3d_active; + ot->poll = ED_operator_view3d_active; } /* ****************** change view operators ****************** */ @@ -389,16 +389,16 @@ static int view3d_camera_to_view_poll(bContext *C) void VIEW3D_OT_camera_to_view(wmOperatorType *ot) { /* identifiers */ - ot->name= "Align Camera To View"; - ot->description= "Set camera view to active view"; - ot->idname= "VIEW3D_OT_camera_to_view"; + ot->name = "Align Camera To View"; + ot->description = "Set camera view to active view"; + ot->idname = "VIEW3D_OT_camera_to_view"; /* api callbacks */ - ot->exec= view3d_camera_to_view_exec; - ot->poll= view3d_camera_to_view_poll; + ot->exec = view3d_camera_to_view_exec; + ot->poll = view3d_camera_to_view_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* unlike VIEW3D_OT_view_selected this is for framing a render and not @@ -456,16 +456,16 @@ static int view3d_camera_to_view_selected_poll(bContext *C) void VIEW3D_OT_camera_to_view_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= "Camera Fit Frame to Selected"; - ot->description= "Move the camera so selected objects are framed"; - ot->idname= "VIEW3D_OT_camera_to_view_selected"; + ot->name = "Camera Fit Frame to Selected"; + ot->description = "Move the camera so selected objects are framed"; + ot->idname = "VIEW3D_OT_camera_to_view_selected"; /* api callbacks */ - ot->exec= view3d_camera_to_view_selected_exec; - ot->poll= view3d_camera_to_view_selected_poll; + ot->exec = view3d_camera_to_view_selected_exec; + ot->poll = view3d_camera_to_view_selected_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -510,16 +510,16 @@ void VIEW3D_OT_object_as_camera(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Active Object as Camera"; - ot->description= "Set the active object as the active camera for this view or scene"; - ot->idname= "VIEW3D_OT_object_as_camera"; + ot->name = "Set Active Object as Camera"; + ot->description = "Set the active object as the active camera for this view or scene"; + ot->idname = "VIEW3D_OT_object_as_camera"; /* api callbacks */ - ot->exec= view3d_setobjectascamera_exec; - ot->poll= ED_operator_rv3d_user_region_poll; + ot->exec = view3d_setobjectascamera_exec; + ot->poll = ED_operator_rv3d_user_region_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } /* ********************************** */ @@ -1580,15 +1580,15 @@ void VIEW3D_OT_localview(wmOperatorType *ot) { /* identifiers */ - ot->name= "Local View"; - ot->description= "Toggle display of selected object(s) separately and centered in view"; - ot->idname= "VIEW3D_OT_localview"; + ot->name = "Local View"; + ot->description = "Toggle display of selected object(s) separately and centered in view"; + ot->idname = "VIEW3D_OT_localview"; /* api callbacks */ - ot->exec= localview_exec; - ot->flag= OPTYPE_UNDO; /* localview changes object layer bitflags */ + ot->exec = localview_exec; + ot->flag = OPTYPE_UNDO; /* localview changes object layer bitflags */ - ot->poll= ED_operator_view3d_active; + ot->poll = ED_operator_view3d_active; } #ifdef WITH_GAMEENGINE @@ -1814,14 +1814,14 @@ void VIEW3D_OT_game_start(wmOperatorType *ot) { /* identifiers */ - ot->name= "Start Game Engine"; - ot->description= "Start game engine"; - ot->idname= "VIEW3D_OT_game_start"; + ot->name = "Start Game Engine"; + ot->description = "Start game engine"; + ot->idname = "VIEW3D_OT_game_start"; /* api callbacks */ - ot->exec= game_engine_exec; + ot->exec = game_engine_exec; - ot->poll= game_engine_poll; + ot->poll = game_engine_poll; } /* ************************************** */ diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index 69d29633972..dc96cf25586 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -155,21 +155,21 @@ static int snap_type_exec(bContext *C, wmOperator *op) static void TRANSFORM_OT_snap_type(wmOperatorType *ot) { /* identifiers */ - ot->name= "Snap Type"; - ot->description= "Set the snap element type"; - ot->idname= "TRANSFORM_OT_snap_type"; + ot->name = "Snap Type"; + ot->description = "Set the snap element type"; + ot->idname = "TRANSFORM_OT_snap_type"; /* api callbacks */ - ot->invoke= WM_menu_invoke; - ot->exec= snap_type_exec; + ot->invoke = WM_menu_invoke; + ot->exec = snap_type_exec; - ot->poll= ED_operator_areaactive; + ot->poll = ED_operator_areaactive; /* flags */ - ot->flag= OPTYPE_UNDO; + ot->flag = OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_enum(ot->srna, "type", snap_element_items, 0, "Type", "Set the snap element type"); + ot->prop = RNA_def_enum(ot->srna, "type", snap_element_items, 0, "Type", "Set the snap element type"); } @@ -203,7 +203,7 @@ static void TRANSFORM_OT_select_orientation(struct wmOperatorType *ot) /* identifiers */ ot->name = "Select Orientation"; - ot->description= "Select transformation orientation"; + ot->description = "Select transformation orientation"; ot->idname = "TRANSFORM_OT_select_orientation"; ot->flag = OPTYPE_UNDO; @@ -256,7 +256,7 @@ static void TRANSFORM_OT_delete_orientation(struct wmOperatorType *ot) { /* identifiers */ ot->name = "Delete Orientation"; - ot->description= "Delete transformation orientation"; + ot->description = "Delete transformation orientation"; ot->idname = "TRANSFORM_OT_delete_orientation"; ot->flag = OPTYPE_UNDO; @@ -291,7 +291,7 @@ static void TRANSFORM_OT_create_orientation(struct wmOperatorType *ot) { /* identifiers */ ot->name = "Create Orientation"; - ot->description= "Create transformation orientation from selection"; + ot->description = "Create transformation orientation from selection"; ot->idname = "TRANSFORM_OT_create_orientation"; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; @@ -517,7 +517,7 @@ void TRANSFORM_OT_translate(struct wmOperatorType *ot) { /* identifiers */ ot->name = "Translate"; - ot->description= "Translate selected items"; + ot->description = "Translate selected items"; ot->idname = OP_TRANSLATION; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -525,7 +525,7 @@ void TRANSFORM_OT_translate(struct wmOperatorType *ot) ot->invoke = transform_invoke; ot->exec = transform_exec; ot->modal = transform_modal; - ot->cancel = transform_cancel; + ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; RNA_def_float_vector_xyz(ot->srna, "value", 3, NULL, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX); @@ -537,7 +537,7 @@ void TRANSFORM_OT_resize(struct wmOperatorType *ot) { /* identifiers */ ot->name = "Resize"; - ot->description= "Resize selected items"; + ot->description = "Resize selected items"; ot->idname = OP_RESIZE; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -545,7 +545,7 @@ void TRANSFORM_OT_resize(struct wmOperatorType *ot) ot->invoke = transform_invoke; ot->exec = transform_exec; ot->modal = transform_modal; - ot->cancel = transform_cancel; + ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; RNA_def_float_vector(ot->srna, "value", 3, VecOne, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX); @@ -558,7 +558,7 @@ void TRANSFORM_OT_trackball(struct wmOperatorType *ot) { /* identifiers */ ot->name = "Trackball"; - ot->description= "Trackball style rotation of selected items"; + ot->description = "Trackball style rotation of selected items"; ot->idname = OP_TRACKBALL; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -566,7 +566,7 @@ void TRANSFORM_OT_trackball(struct wmOperatorType *ot) ot->invoke = transform_invoke; ot->exec = transform_exec; ot->modal = transform_modal; - ot->cancel = transform_cancel; + ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; RNA_def_float_vector(ot->srna, "value", 2, VecOne, -FLT_MAX, FLT_MAX, "Angle", "", -FLT_MAX, FLT_MAX); @@ -578,7 +578,7 @@ void TRANSFORM_OT_rotate(struct wmOperatorType *ot) { /* identifiers */ ot->name = "Rotate"; - ot->description= "Rotate selected items"; + ot->description = "Rotate selected items"; ot->idname = OP_ROTATION; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -586,7 +586,7 @@ void TRANSFORM_OT_rotate(struct wmOperatorType *ot) ot->invoke = transform_invoke; ot->exec = transform_exec; ot->modal = transform_modal; - ot->cancel = transform_cancel; + ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI*2, M_PI*2); @@ -601,7 +601,7 @@ void TRANSFORM_OT_tilt(struct wmOperatorType *ot) /* optionals - * "Tilt selected vertices" * "Specify an extra axis rotation for selected vertices of 3d curve" */ - ot->description= "Tilt selected control vertices of 3d curve"; + ot->description = "Tilt selected control vertices of 3d curve"; ot->idname = OP_TILT; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -609,7 +609,7 @@ void TRANSFORM_OT_tilt(struct wmOperatorType *ot) ot->invoke = transform_invoke; ot->exec = transform_exec; ot->modal = transform_modal; - ot->cancel = transform_cancel; + ot->cancel = transform_cancel; ot->poll = ED_operator_editcurve_3d; RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI*2, M_PI*2); @@ -621,7 +621,7 @@ void TRANSFORM_OT_warp(struct wmOperatorType *ot) { /* identifiers */ ot->name = "Warp"; - ot->description= "Warp selected items around the cursor"; + ot->description = "Warp selected items around the cursor"; ot->idname = OP_WARP; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -629,7 +629,7 @@ void TRANSFORM_OT_warp(struct wmOperatorType *ot) ot->invoke = transform_invoke; ot->exec = transform_exec; ot->modal = transform_modal; - ot->cancel = transform_cancel; + ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI*2, M_PI*2); @@ -642,7 +642,7 @@ void TRANSFORM_OT_shear(struct wmOperatorType *ot) { /* identifiers */ ot->name = "Shear"; - ot->description= "Shear selected items along the horizontal screen axis"; + ot->description = "Shear selected items along the horizontal screen axis"; ot->idname = OP_SHEAR; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -650,7 +650,7 @@ void TRANSFORM_OT_shear(struct wmOperatorType *ot) ot->invoke = transform_invoke; ot->exec = transform_exec; ot->modal = transform_modal; - ot->cancel = transform_cancel; + ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, "Offset", "", -FLT_MAX, FLT_MAX); @@ -663,7 +663,7 @@ void TRANSFORM_OT_push_pull(struct wmOperatorType *ot) { /* identifiers */ ot->name = "Push/Pull"; - ot->description= "Push/Pull selected items"; + ot->description = "Push/Pull selected items"; ot->idname = OP_PUSH_PULL; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -671,7 +671,7 @@ void TRANSFORM_OT_push_pull(struct wmOperatorType *ot) ot->invoke = transform_invoke; ot->exec = transform_exec; ot->modal = transform_modal; - ot->cancel = transform_cancel; + ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, "Distance", "", -FLT_MAX, FLT_MAX); @@ -683,7 +683,7 @@ void TRANSFORM_OT_shrink_fatten(struct wmOperatorType *ot) { /* identifiers */ ot->name = "Shrink/Fatten"; - ot->description= "Shrink/fatten selected vertices along normals"; + ot->description = "Shrink/fatten selected vertices along normals"; ot->idname = OP_SHRINK_FATTEN; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -691,7 +691,7 @@ void TRANSFORM_OT_shrink_fatten(struct wmOperatorType *ot) ot->invoke = transform_invoke; ot->exec = transform_exec; ot->modal = transform_modal; - ot->cancel = transform_cancel; + ot->cancel = transform_cancel; ot->poll = ED_operator_editmesh; RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, "Offset", "", -FLT_MAX, FLT_MAX); @@ -704,7 +704,7 @@ void TRANSFORM_OT_tosphere(struct wmOperatorType *ot) /* identifiers */ ot->name = "To Sphere"; //added "around mesh center" to differentiate between "MESH_OT_vertices_to_sphere()" - ot->description= "Move selected vertices outward in a spherical shape around mesh center"; + ot->description = "Move selected vertices outward in a spherical shape around mesh center"; ot->idname = OP_TOSPHERE; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -712,7 +712,7 @@ void TRANSFORM_OT_tosphere(struct wmOperatorType *ot) ot->invoke = transform_invoke; ot->exec = transform_exec; ot->modal = transform_modal; - ot->cancel = transform_cancel; + ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; RNA_def_float_factor(ot->srna, "value", 0, 0, 1, "Factor", "", 0, 1); @@ -724,7 +724,7 @@ void TRANSFORM_OT_mirror(struct wmOperatorType *ot) { /* identifiers */ ot->name = "Mirror"; - ot->description= "Mirror selected vertices around one or more axes"; + ot->description = "Mirror selected vertices around one or more axes"; ot->idname = OP_MIRROR; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -732,7 +732,7 @@ void TRANSFORM_OT_mirror(struct wmOperatorType *ot) ot->invoke = transform_invoke; ot->exec = transform_exec; ot->modal = transform_modal; - ot->cancel = transform_cancel; + ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; Transform_Properties(ot, P_CONSTRAINT|P_PROPORTIONAL); @@ -742,7 +742,7 @@ void TRANSFORM_OT_edge_slide(struct wmOperatorType *ot) { /* identifiers */ ot->name = "Edge Slide"; - ot->description= "Slide an edge loop along a mesh"; + ot->description = "Slide an edge loop along a mesh"; ot->idname = OP_EDGE_SLIDE; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -750,7 +750,7 @@ void TRANSFORM_OT_edge_slide(struct wmOperatorType *ot) ot->invoke = transform_invoke; ot->exec = transform_exec; ot->modal = transform_modal; - ot->cancel = transform_cancel; + ot->cancel = transform_cancel; ot->poll = ED_operator_editmesh; RNA_def_float_factor(ot->srna, "value", 0, -1.0f, 1.0f, "Factor", "", -1.0f, 1.0f); @@ -762,7 +762,7 @@ void TRANSFORM_OT_edge_crease(struct wmOperatorType *ot) { /* identifiers */ ot->name = "Edge Crease"; - ot->description= "Change the crease of edges"; + ot->description = "Change the crease of edges"; ot->idname = OP_EDGE_CREASE; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -770,7 +770,7 @@ void TRANSFORM_OT_edge_crease(struct wmOperatorType *ot) ot->invoke = transform_invoke; ot->exec = transform_exec; ot->modal = transform_modal; - ot->cancel = transform_cancel; + ot->cancel = transform_cancel; ot->poll = ED_operator_editmesh; RNA_def_float_factor(ot->srna, "value", 0, -1.0f, 1.0f, "Factor", "", -1.0f, 1.0f); @@ -782,7 +782,7 @@ void TRANSFORM_OT_seq_slide(struct wmOperatorType *ot) { /* identifiers */ ot->name = "Sequence Slide"; - ot->description= "Slide a sequence strip in time"; + ot->description = "Slide a sequence strip in time"; ot->idname = OP_SEQ_SLIDE; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -790,7 +790,7 @@ void TRANSFORM_OT_seq_slide(struct wmOperatorType *ot) ot->invoke = transform_invoke; ot->exec = transform_exec; ot->modal = transform_modal; - ot->cancel = transform_cancel; + ot->cancel = transform_cancel; ot->poll = ED_operator_sequencer_active; RNA_def_float_vector(ot->srna, "value", 2, VecOne, -FLT_MAX, FLT_MAX, "Angle", "", -FLT_MAX, FLT_MAX); @@ -804,15 +804,15 @@ void TRANSFORM_OT_transform(struct wmOperatorType *ot) /* identifiers */ ot->name = "Transform"; - ot->description= "Transform selected items by mode type"; + ot->description = "Transform selected items by mode type"; ot->idname = "TRANSFORM_OT_transform"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; /* api callbacks */ ot->invoke = transform_invoke; ot->exec = transform_exec; ot->modal = transform_modal; - ot->cancel = transform_cancel; + ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; prop= RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c index d3049e97f9e..5478da31f7a 100644 --- a/source/blender/editors/util/undo.c +++ b/source/blender/editors/util/undo.c @@ -313,26 +313,26 @@ static int ed_redo_exec(bContext *C, wmOperator *UNUSED(op)) void ED_OT_undo(wmOperatorType *ot) { /* identifiers */ - ot->name= "Undo"; - ot->description= "Undo previous action"; - ot->idname= "ED_OT_undo"; + ot->name = "Undo"; + ot->description = "Undo previous action"; + ot->idname = "ED_OT_undo"; /* api callbacks */ - ot->exec= ed_undo_exec; - ot->poll= ED_operator_screenactive; + ot->exec = ed_undo_exec; + ot->poll = ED_operator_screenactive; } void ED_OT_undo_push(wmOperatorType *ot) { /* identifiers */ - ot->name= "Undo Push"; - ot->description= "Add an undo state (internal use only)"; - ot->idname= "ED_OT_undo_push"; + ot->name = "Undo Push"; + ot->description = "Add an undo state (internal use only)"; + ot->idname = "ED_OT_undo_push"; /* api callbacks */ - ot->exec= ed_undo_push_exec; + ot->exec = ed_undo_push_exec; - ot->flag= OPTYPE_INTERNAL; + ot->flag = OPTYPE_INTERNAL; RNA_def_string(ot->srna, "message", "Add an undo step *function may be moved*", MAXUNDONAME, "Undo Message", ""); } @@ -340,13 +340,13 @@ void ED_OT_undo_push(wmOperatorType *ot) void ED_OT_redo(wmOperatorType *ot) { /* identifiers */ - ot->name= "Redo"; - ot->description= "Redo previous action"; - ot->idname= "ED_OT_redo"; + ot->name = "Redo"; + ot->description = "Redo previous action"; + ot->idname = "ED_OT_redo"; /* api callbacks */ - ot->exec= ed_redo_exec; - ot->poll= ED_operator_screenactive; + ot->exec = ed_redo_exec; + ot->poll = ED_operator_screenactive; } @@ -549,14 +549,14 @@ static int undo_history_exec(bContext *C, wmOperator *op) void ED_OT_undo_history(wmOperatorType *ot) { /* identifiers */ - ot->name= "Undo History"; - ot->description= "Redo specific action in history"; - ot->idname= "ED_OT_undo_history"; + ot->name = "Undo History"; + ot->description = "Redo specific action in history"; + ot->idname = "ED_OT_undo_history"; /* api callbacks */ - ot->invoke= undo_history_invoke; - ot->exec= undo_history_exec; - ot->poll= ED_operator_screenactive; + ot->invoke = undo_history_invoke; + ot->exec = undo_history_exec; + ot->poll = ED_operator_screenactive; RNA_def_int(ot->srna, "item", 0, 0, INT_MAX, "Item", "", 0, INT_MAX); diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 744a415b23c..f3ca618b547 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -1549,14 +1549,14 @@ static void UV_OT_align(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Align"; - ot->description= "Align selected UV vertices to an axis"; - ot->idname= "UV_OT_align"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Align"; + ot->description = "Align selected UV vertices to an axis"; + ot->idname = "UV_OT_align"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= align_exec; - ot->poll= ED_operator_image_active; /* requires space image */; + ot->exec = align_exec; + ot->poll = ED_operator_image_active; /* requires space image */; /* properties */ RNA_def_enum(ot->srna, "axis", axis_items, 'a', "Axis", "Axis to align UV locations on"); @@ -1574,14 +1574,14 @@ static int weld_exec(bContext *C, wmOperator *UNUSED(op)) static void UV_OT_weld(wmOperatorType *ot) { /* identifiers */ - ot->name= "Weld"; - ot->description= "Weld selected UV vertices together"; - ot->idname= "UV_OT_weld"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Weld"; + ot->description = "Weld selected UV vertices together"; + ot->idname = "UV_OT_weld"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= weld_exec; - ot->poll= ED_operator_uvedit; + ot->exec = weld_exec; + ot->poll = ED_operator_uvedit; } @@ -1684,14 +1684,14 @@ static int select_all_exec(bContext *C, wmOperator *op) static void UV_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "(De)select All"; - ot->description= "Change selection of all UV vertices"; - ot->idname= "UV_OT_select_all"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "(De)select All"; + ot->description = "Change selection of all UV vertices"; + ot->idname = "UV_OT_select_all"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= select_all_exec; - ot->poll= ED_operator_uvedit; + ot->exec = select_all_exec; + ot->poll = ED_operator_uvedit; WM_operator_properties_select_all(ot); } @@ -2045,15 +2045,15 @@ static int select_invoke(bContext *C, wmOperator *op, wmEvent *event) static void UV_OT_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select"; - ot->description= "Select UV vertices"; - ot->idname= "UV_OT_select"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Select"; + ot->description = "Select UV vertices"; + ot->idname = "UV_OT_select"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= select_exec; - ot->invoke= select_invoke; - ot->poll= ED_operator_image_active; /* requires space image */; + ot->exec = select_exec; + ot->invoke = select_invoke; + ot->poll = ED_operator_image_active; /* requires space image */; /* properties */ RNA_def_boolean(ot->srna, "extend", 0, @@ -2090,15 +2090,15 @@ static int select_loop_invoke(bContext *C, wmOperator *op, wmEvent *event) static void UV_OT_select_loop(wmOperatorType *ot) { /* identifiers */ - ot->name= "Loop Select"; - ot->description= "Select a loop of connected UV vertices"; - ot->idname= "UV_OT_select_loop"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Loop Select"; + ot->description = "Select a loop of connected UV vertices"; + ot->idname = "UV_OT_select_loop"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= select_loop_exec; - ot->invoke= select_loop_invoke; - ot->poll= ED_operator_image_active; /* requires space image */; + ot->exec = select_loop_exec; + ot->invoke = select_loop_invoke; + ot->poll = ED_operator_image_active; /* requires space image */; /* properties */ RNA_def_boolean(ot->srna, "extend", 0, @@ -2165,14 +2165,14 @@ static int select_linked_exec(bContext *C, wmOperator *op) static void UV_OT_select_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Linked"; - ot->description= "Select all UV vertices linked to the active UV map"; - ot->idname= "UV_OT_select_linked"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Select Linked"; + ot->description = "Select all UV vertices linked to the active UV map"; + ot->idname = "UV_OT_select_linked"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= select_linked_exec; - ot->poll= ED_operator_image_active; /* requires space image */ + ot->exec = select_linked_exec; + ot->poll = ED_operator_image_active; /* requires space image */ /* properties */ RNA_def_boolean(ot->srna, "extend", 0, @@ -2192,15 +2192,15 @@ static int select_linked_pick_exec(bContext *C, wmOperator *op) static void UV_OT_select_linked_pick(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Linked Pick"; - ot->description= "Select all UV vertices linked under the mouse"; - ot->idname= "UV_OT_select_linked_pick"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Select Linked Pick"; + ot->description = "Select all UV vertices linked under the mouse"; + ot->idname = "UV_OT_select_linked_pick"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->invoke= select_linked_pick_invoke; - ot->exec= select_linked_pick_exec; - ot->poll= ED_operator_image_active; /* requires space image */; + ot->invoke = select_linked_pick_invoke; + ot->exec = select_linked_pick_exec; + ot->poll = ED_operator_image_active; /* requires space image */; /* properties */ RNA_def_boolean(ot->srna, "extend", 0, @@ -2263,14 +2263,14 @@ static int unlink_selection_exec(bContext *C, wmOperator *op) static void UV_OT_unlink_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= "Unlink Selection"; - ot->description= "Unlink selected UV vertices from active UV map"; - ot->idname= "UV_OT_unlink_selected"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Unlink Selection"; + ot->description = "Unlink selected UV vertices from active UV map"; + ot->idname = "UV_OT_unlink_selected"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= unlink_selection_exec; - ot->poll= ED_operator_uvedit; + ot->exec = unlink_selection_exec; + ot->poll = ED_operator_uvedit; } /* ******************** border select operator **************** */ @@ -2528,19 +2528,19 @@ static int border_select_exec(bContext *C, wmOperator *op) static void UV_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Select"; - ot->description= "Select UV vertices using border selection"; - ot->idname= "UV_OT_select_border"; + ot->name = "Border Select"; + ot->description = "Select UV vertices using border selection"; + ot->idname = "UV_OT_select_border"; /* api callbacks */ - ot->invoke= WM_border_select_invoke; - ot->exec= border_select_exec; - ot->modal= WM_border_select_modal; - ot->poll= ED_operator_image_active; /* requires space image */; - ot->cancel= WM_border_select_cancel; + ot->invoke = WM_border_select_invoke; + ot->exec = border_select_exec; + ot->modal = WM_border_select_modal; + ot->poll = ED_operator_image_active; /* requires space image */; + ot->cancel = WM_border_select_cancel; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "pinned", 0, "Pinned", "Border select pinned UVs only"); @@ -2620,19 +2620,19 @@ static int circle_select_exec(bContext *C, wmOperator *op) static void UV_OT_circle_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Circle Select"; - ot->description= "Select UV vertices using circle selection"; - ot->idname= "UV_OT_circle_select"; + ot->name = "Circle Select"; + ot->description = "Select UV vertices using circle selection"; + ot->idname = "UV_OT_circle_select"; /* api callbacks */ - ot->invoke= WM_gesture_circle_invoke; - ot->modal= WM_gesture_circle_modal; - ot->exec= circle_select_exec; - ot->poll= ED_operator_image_active; /* requires space image */; - ot->cancel= WM_gesture_circle_cancel; + ot->invoke = WM_gesture_circle_invoke; + ot->modal = WM_gesture_circle_modal; + ot->exec = circle_select_exec; + ot->poll = ED_operator_image_active; /* requires space image */; + ot->cancel = WM_gesture_circle_cancel; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_int(ot->srna, "x", 0, INT_MIN, INT_MAX, "X", "", INT_MIN, INT_MAX); @@ -2696,14 +2696,14 @@ static void UV_OT_snap_cursor(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Snap Cursor"; - ot->description= "Snap cursor to target type"; - ot->idname= "UV_OT_snap_cursor"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Snap Cursor"; + ot->description = "Snap cursor to target type"; + ot->idname = "UV_OT_snap_cursor"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= snap_cursor_exec; - ot->poll= ED_operator_image_active; /* requires space image */; + ot->exec = snap_cursor_exec; + ot->poll = ED_operator_image_active; /* requires space image */; /* properties */ RNA_def_enum(ot->srna, "target", target_items, 0, "Target", "Target to snap the selected UVs to"); @@ -2909,14 +2909,14 @@ static void UV_OT_snap_selected(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Snap Selection"; - ot->description= "Snap selected UV vertices to target type"; - ot->idname= "UV_OT_snap_selected"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Snap Selection"; + ot->description = "Snap selected UV vertices to target type"; + ot->idname = "UV_OT_snap_selected"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= snap_selection_exec; - ot->poll= ED_operator_image_active; /* requires space image */; + ot->exec = snap_selection_exec; + ot->poll = ED_operator_image_active; /* requires space image */; /* properties */ RNA_def_enum(ot->srna, "target", target_items, 0, "Target", "Target to snap the selected UVs to"); @@ -2963,14 +2963,14 @@ static int pin_exec(bContext *C, wmOperator *op) static void UV_OT_pin(wmOperatorType *ot) { /* identifiers */ - ot->name= "Pin"; - ot->description= "Set/clear selected UV vertices as anchored between multiple unwrap operations"; - ot->idname= "UV_OT_pin"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Pin"; + ot->description = "Set/clear selected UV vertices as anchored between multiple unwrap operations"; + ot->idname = "UV_OT_pin"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= pin_exec; - ot->poll= ED_operator_uvedit; + ot->exec = pin_exec; + ot->poll = ED_operator_uvedit; /* properties */ RNA_def_boolean(ot->srna, "clear", 0, "Clear", "Clear pinning for the selection instead of setting it"); @@ -3011,14 +3011,14 @@ static int select_pinned_exec(bContext *C, wmOperator *UNUSED(op)) static void UV_OT_select_pinned(wmOperatorType *ot) { /* identifiers */ - ot->name= "Selected Pinned"; - ot->description= "Select all pinned UV vertices"; - ot->idname= "UV_OT_select_pinned"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Selected Pinned"; + ot->description = "Select all pinned UV vertices"; + ot->idname = "UV_OT_select_pinned"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= select_pinned_exec; - ot->poll= ED_operator_uvedit; + ot->exec = select_pinned_exec; + ot->poll = ED_operator_uvedit; } /********************** hide operator *********************/ @@ -3104,14 +3104,14 @@ static int hide_exec(bContext *C, wmOperator *op) static void UV_OT_hide(wmOperatorType *ot) { /* identifiers */ - ot->name= "Hide Selected"; - ot->description= "Hide (un)selected UV vertices"; - ot->idname= "UV_OT_hide"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Hide Selected"; + ot->description = "Hide (un)selected UV vertices"; + ot->idname = "UV_OT_hide"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= hide_exec; - ot->poll= ED_operator_uvedit; + ot->exec = hide_exec; + ot->poll = ED_operator_uvedit; /* props */ RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected"); @@ -3221,14 +3221,14 @@ static int reveal_exec(bContext *C, wmOperator *UNUSED(op)) static void UV_OT_reveal(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reveal Hidden"; - ot->description= "Reveal all hidden UV vertices"; - ot->idname= "UV_OT_reveal"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Reveal Hidden"; + ot->description = "Reveal all hidden UV vertices"; + ot->idname = "UV_OT_reveal"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= reveal_exec; - ot->poll= ED_operator_uvedit; + ot->exec = reveal_exec; + ot->poll = ED_operator_uvedit; } /******************** set 3d cursor operator ********************/ @@ -3264,17 +3264,17 @@ static int set_2d_cursor_invoke(bContext *C, wmOperator *op, wmEvent *event) static void UV_OT_cursor_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set 2D Cursor"; - ot->description= "Set 2D cursor location"; - ot->idname= "UV_OT_cursor_set"; + ot->name = "Set 2D Cursor"; + ot->description = "Set 2D cursor location"; + ot->idname = "UV_OT_cursor_set"; /* api callbacks */ - ot->exec= set_2d_cursor_exec; - ot->invoke= set_2d_cursor_invoke; - ot->poll= ED_operator_image_active; /* requires space image */; + ot->exec = set_2d_cursor_exec; + ot->invoke = set_2d_cursor_invoke; + ot->poll = ED_operator_image_active; /* requires space image */; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX, "Location", "Cursor location in normalised (0.0-1.0) coordinates", -10.0f, 10.0f); @@ -3330,17 +3330,17 @@ static int set_tile_invoke(bContext *C, wmOperator *op, wmEvent *event) static void UV_OT_tile_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Tile"; - ot->description= "Set UV image tile coordinates"; - ot->idname= "UV_OT_tile_set"; + ot->name = "Set Tile"; + ot->description = "Set UV image tile coordinates"; + ot->idname = "UV_OT_tile_set"; /* api callbacks */ - ot->exec= set_tile_exec; - ot->invoke= set_tile_invoke; - ot->poll= ED_operator_image_active; /* requires space image */; + ot->exec = set_tile_exec; + ot->invoke = set_tile_invoke; + ot->poll = ED_operator_image_active; /* requires space image */; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ RNA_def_int_vector(ot->srna, "tile", 2, NULL, 0, INT_MAX, "Tile", "Tile coordinate", 0, 10); @@ -3461,16 +3461,16 @@ static int seams_from_islands_exec(bContext *C, wmOperator *op) static void UV_OT_seams_from_islands(wmOperatorType *ot) { /* identifiers */ - ot->name= "Seams From Islands"; - ot->description= "Set mesh seams according to island setup in the UV editor"; - ot->idname= "UV_OT_seams_from_islands"; + ot->name = "Seams From Islands"; + ot->description = "Set mesh seams according to island setup in the UV editor"; + ot->idname = "UV_OT_seams_from_islands"; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= seams_from_islands_exec; - ot->poll= ED_operator_uvedit; + ot->exec = seams_from_islands_exec; + ot->poll = ED_operator_uvedit; RNA_def_boolean(ot->srna, "mark_seams", 1, "Mark Seams", "Mark boundary edges as seams"); RNA_def_boolean(ot->srna, "mark_sharp", 0, "Mark Sharp", "Mark boundary edges as sharp"); @@ -3510,16 +3510,16 @@ static int mark_seam_exec(bContext *C, wmOperator *UNUSED(op)) static void UV_OT_mark_seam(wmOperatorType *ot) { /* identifiers */ - ot->name= "Mark Seams"; - ot->description= "Mark selected UV edges as seams"; - ot->idname= "UV_OT_mark_seam"; + ot->name = "Mark Seams"; + ot->description = "Mark selected UV edges as seams"; + ot->idname = "UV_OT_mark_seam"; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= mark_seam_exec; - ot->poll= ED_operator_uvedit; + ot->exec = mark_seam_exec; + ot->poll = ED_operator_uvedit; } diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index 64c15f6f496..ad96142ae86 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -1451,7 +1451,7 @@ void UV_OT_stitch(wmOperatorType *ot) ot->modal = stitch_modal; ot->exec = stitch_exec; ot->cancel = stitch_cancel; - ot->poll= ED_operator_uvedit; + ot->poll = ED_operator_uvedit; /* properties */ RNA_def_boolean(ot->srna, "use_limit", 0, "Use Limit", "Stitch UVs within a specified limit distance"); diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index cfb0128486a..94879ff8e7f 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -684,17 +684,17 @@ static int minimize_stretch_cancel(bContext *C, wmOperator *op) void UV_OT_minimize_stretch(wmOperatorType *ot) { /* identifiers */ - ot->name= "Minimize Stretch"; - ot->idname= "UV_OT_minimize_stretch"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_GRAB_POINTER|OPTYPE_BLOCKING; - ot->description="Reduce UV stretching by relaxing angles"; + ot->name = "Minimize Stretch"; + ot->idname = "UV_OT_minimize_stretch"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_GRAB_POINTER|OPTYPE_BLOCKING; + ot->description = "Reduce UV stretching by relaxing angles"; /* api callbacks */ - ot->exec= minimize_stretch_exec; - ot->invoke= minimize_stretch_invoke; - ot->modal= minimize_stretch_modal; - ot->cancel= minimize_stretch_cancel; - ot->poll= ED_operator_uvedit; + ot->exec = minimize_stretch_exec; + ot->invoke = minimize_stretch_invoke; + ot->modal = minimize_stretch_modal; + ot->cancel = minimize_stretch_cancel; + ot->poll = ED_operator_uvedit; /* properties */ RNA_def_boolean(ot->srna, "fill_holes", 1, "Fill Holes", "Virtual fill holes in mesh before unwrapping, to better avoid overlaps and preserve symmetry"); @@ -737,13 +737,13 @@ static int pack_islands_exec(bContext *C, wmOperator *op) void UV_OT_pack_islands(wmOperatorType *ot) { /* identifiers */ - ot->name= "Pack Islands"; - ot->idname= "UV_OT_pack_islands"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Pack Islands"; + ot->idname = "UV_OT_pack_islands"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= pack_islands_exec; - ot->poll= ED_operator_uvedit; + ot->exec = pack_islands_exec; + ot->poll = ED_operator_uvedit; /* properties */ RNA_def_float_factor(ot->srna, "margin", 0.0f, 0.0f, 1.0f, "Margin", "Space between islands", 0.0f, 1.0f); @@ -777,13 +777,13 @@ static int average_islands_scale_exec(bContext *C, wmOperator *UNUSED(op)) void UV_OT_average_islands_scale(wmOperatorType *ot) { /* identifiers */ - ot->name= "Average Islands Scale"; - ot->idname= "UV_OT_average_islands_scale"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Average Islands Scale"; + ot->idname = "UV_OT_average_islands_scale"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= average_islands_scale_exec; - ot->poll= ED_operator_uvedit; + ot->exec = average_islands_scale_exec; + ot->poll = ED_operator_uvedit; } /**************** Live Unwrap *****************/ @@ -1191,14 +1191,14 @@ void UV_OT_unwrap(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Unwrap"; - ot->description= "Unwrap the mesh of the object being edited"; - ot->idname= "UV_OT_unwrap"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Unwrap"; + ot->description = "Unwrap the mesh of the object being edited"; + ot->idname = "UV_OT_unwrap"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= unwrap_exec; - ot->poll= ED_operator_uvmap; + ot->exec = unwrap_exec; + ot->poll = ED_operator_uvmap; /* properties */ RNA_def_enum(ot->srna, "method", method_items, 0, "Method", @@ -1304,13 +1304,13 @@ static int uv_from_view_poll(bContext *C) void UV_OT_from_view(wmOperatorType *ot) { /* identifiers */ - ot->name= "Project From View"; - ot->idname= "UV_OT_project_from_view"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Project From View"; + ot->idname = "UV_OT_project_from_view"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= uv_from_view_exec; - ot->poll= uv_from_view_poll; + ot->exec = uv_from_view_exec; + ot->poll = uv_from_view_poll; /* properties */ RNA_def_boolean(ot->srna, "orthographic", 0, "Orthographic", "Use orthographic projection"); @@ -1343,13 +1343,13 @@ static int reset_exec(bContext *C, wmOperator *UNUSED(op)) void UV_OT_reset(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reset"; - ot->idname= "UV_OT_reset"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Reset"; + ot->idname = "UV_OT_reset"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= reset_exec; - ot->poll= ED_operator_uvmap; + ot->exec = reset_exec; + ot->poll = ED_operator_uvmap; } /****************** Sphere Project operator ***************/ @@ -1444,13 +1444,13 @@ static int sphere_project_exec(bContext *C, wmOperator *op) void UV_OT_sphere_project(wmOperatorType *ot) { /* identifiers */ - ot->name= "Sphere Projection"; - ot->idname= "UV_OT_sphere_project"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Sphere Projection"; + ot->idname = "UV_OT_sphere_project"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= sphere_project_exec; - ot->poll= ED_operator_uvmap; + ot->exec = sphere_project_exec; + ot->poll = ED_operator_uvmap; /* properties */ uv_transform_properties(ot, 0); @@ -1517,13 +1517,13 @@ static int cylinder_project_exec(bContext *C, wmOperator *op) void UV_OT_cylinder_project(wmOperatorType *ot) { /* identifiers */ - ot->name= "Cylinder Projection"; - ot->idname= "UV_OT_cylinder_project"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Cylinder Projection"; + ot->idname = "UV_OT_cylinder_project"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= cylinder_project_exec; - ot->poll= ED_operator_uvmap; + ot->exec = cylinder_project_exec; + ot->poll = ED_operator_uvmap; /* properties */ uv_transform_properties(ot, 1); @@ -1595,13 +1595,13 @@ static int cube_project_exec(bContext *C, wmOperator *op) void UV_OT_cube_project(wmOperatorType *ot) { /* identifiers */ - ot->name= "Cube Projection"; - ot->idname= "UV_OT_cube_project"; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->name = "Cube Projection"; + ot->idname = "UV_OT_cube_project"; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* api callbacks */ - ot->exec= cube_project_exec; - ot->poll= ED_operator_uvmap; + ot->exec = cube_project_exec; + ot->poll = ED_operator_uvmap; /* properties */ RNA_def_float(ot->srna, "cube_size", 1.0f, 0.0f, FLT_MAX, "Cube Size", "Size of the cube to project on", 0.001f, 100.0f); diff --git a/source/blender/quicktime/apple/quicktime_export.c b/source/blender/quicktime/apple/quicktime_export.c index 6a4413fdc8d..0ad20d1e9ab 100644 --- a/source/blender/quicktime/apple/quicktime_export.c +++ b/source/blender/quicktime/apple/quicktime_export.c @@ -893,20 +893,20 @@ int fromcocoa_request_qtcodec_settings(bContext *C, wmOperator *op) void SCENE_OT_render_data_set_quicktime_codec(wmOperatorType *ot) { /* identifiers */ - ot->name= "Change codec"; - ot->description= "Change Quicktime codec Settings"; - ot->idname= "SCENE_OT_render_data_set_quicktime_codec"; + ot->name = "Change codec"; + ot->description = "Change Quicktime codec Settings"; + ot->idname = "SCENE_OT_render_data_set_quicktime_codec"; /* api callbacks */ #if defined(__APPLE__) && defined(GHOST_COCOA) ot->exec = cocoa_request_qtcodec_settings; #else - ot->exec= request_qtcodec_settings; + ot->exec = request_qtcodec_settings; #endif - ot->poll= ED_operator_setqtcodec; + ot->poll = ED_operator_setqtcodec; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } #endif /* USE_QTKIT */ diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index 107ebd8699c..ff811ae4ce7 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -714,7 +714,7 @@ void WM_modalkeymap_assign(wmKeyMap *km, const char *opname) wmOperatorType *ot= WM_operatortype_find(opname, 0); if(ot) - ot->modalkeymap= km; + ot->modalkeymap = km; else printf("error: modalkeymap_assign, unknown operator %s\n", opname); } diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 93aa362ec41..ed4f47249fc 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -145,14 +145,14 @@ void WM_operatortype_append(void (*opfunc)(wmOperatorType*)) wmOperatorType *ot; ot= MEM_callocN(sizeof(wmOperatorType), "operatortype"); - ot->srna= RNA_def_struct(&BLENDER_RNA, "", "OperatorProperties"); + ot->srna = RNA_def_struct(&BLENDER_RNA, "", "OperatorProperties"); /* Set the default i18n context now, so that opfunc can redefine it if needed! */ RNA_def_struct_translation_context(ot->srna, WM_OPERATOR_DEFAULT_I18NCONTEXT); opfunc(ot); if(ot->name==NULL) { fprintf(stderr, "ERROR: Operator %s has no name property!\n", ot->idname); - ot->name= N_("Dummy Name"); + ot->name = N_("Dummy Name"); } // XXX All ops should have a description but for now allow them not to. @@ -167,7 +167,7 @@ void WM_operatortype_append_ptr(void (*opfunc)(wmOperatorType*, void*), void *us wmOperatorType *ot; ot= MEM_callocN(sizeof(wmOperatorType), "operatortype"); - ot->srna= RNA_def_struct(&BLENDER_RNA, "", "OperatorProperties"); + ot->srna = RNA_def_struct(&BLENDER_RNA, "", "OperatorProperties"); /* Set the default i18n context now, so that opfunc can redefine it if needed! */ RNA_def_struct_translation_context(ot->srna, WM_OPERATOR_DEFAULT_I18NCONTEXT); opfunc(ot, userdata); @@ -352,20 +352,20 @@ wmOperatorType *WM_operatortype_append_macro(const char *idname, const char *nam } ot= MEM_callocN(sizeof(wmOperatorType), "operatortype"); - ot->srna= RNA_def_struct(&BLENDER_RNA, "", "OperatorProperties"); + ot->srna = RNA_def_struct(&BLENDER_RNA, "", "OperatorProperties"); - ot->idname= idname; - ot->name= name; - ot->flag= OPTYPE_MACRO|flag; + ot->idname = idname; + ot->name = name; + ot->flag = OPTYPE_MACRO|flag; - ot->exec= wm_macro_exec; - ot->invoke= wm_macro_invoke; - ot->modal= wm_macro_modal; - ot->cancel= wm_macro_cancel; - ot->poll= NULL; + ot->exec = wm_macro_exec; + ot->invoke = wm_macro_invoke; + ot->modal = wm_macro_modal; + ot->cancel = wm_macro_cancel; + ot->poll = NULL; if(!ot->description) /* XXX All ops should have a description but for now allow them not to. */ - ot->description= N_("(undocumented operator)"); + ot->description = N_("(undocumented operator)"); RNA_def_struct_ui_text(ot->srna, ot->name, ot->description); RNA_def_struct_identifier(ot->srna, ot->idname); @@ -381,17 +381,17 @@ void WM_operatortype_append_macro_ptr(void (*opfunc)(wmOperatorType*, void*), vo wmOperatorType *ot; ot= MEM_callocN(sizeof(wmOperatorType), "operatortype"); - ot->srna= RNA_def_struct(&BLENDER_RNA, "", "OperatorProperties"); + ot->srna = RNA_def_struct(&BLENDER_RNA, "", "OperatorProperties"); - ot->flag= OPTYPE_MACRO; - ot->exec= wm_macro_exec; - ot->invoke= wm_macro_invoke; - ot->modal= wm_macro_modal; - ot->cancel= wm_macro_cancel; - ot->poll= NULL; + ot->flag = OPTYPE_MACRO; + ot->exec = wm_macro_exec; + ot->invoke = wm_macro_invoke; + ot->modal = wm_macro_modal; + ot->cancel = wm_macro_cancel; + ot->poll = NULL; if(!ot->description) - ot->description= N_("(undocumented operator)"); + ot->description = N_("(undocumented operator)"); /* Set the default i18n context now, so that opfunc can redefine it if needed! */ RNA_def_struct_translation_context(ot->srna, WM_OPERATOR_DEFAULT_I18NCONTEXT); @@ -1174,13 +1174,13 @@ static int wm_debug_menu_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve static void WM_OT_debug_menu(wmOperatorType *ot) { - ot->name= "Debug Menu"; - ot->idname= "WM_OT_debug_menu"; - ot->description= "Open a popup to set the debug level"; + ot->name = "Debug Menu"; + ot->idname = "WM_OT_debug_menu"; + ot->description = "Open a popup to set the debug level"; - ot->invoke= wm_debug_menu_invoke; - ot->exec= wm_debug_menu_exec; - ot->poll= WM_operator_winactive; + ot->invoke = wm_debug_menu_invoke; + ot->exec = wm_debug_menu_exec; + ot->poll = WM_operator_winactive; RNA_def_int(ot->srna, "debug_value", 0, -10000, 10000, "Debug Value", "", INT_MIN, INT_MAX); } @@ -1344,12 +1344,12 @@ static int wm_splash_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *UNUSED static void WM_OT_splash(wmOperatorType *ot) { - ot->name= "Splash Screen"; - ot->idname= "WM_OT_splash"; - ot->description= "Opens a blocking popup region with release info"; + ot->name = "Splash Screen"; + ot->idname = "WM_OT_splash"; + ot->description = "Opens a blocking popup region with release info"; - ot->invoke= wm_splash_invoke; - ot->poll= WM_operator_winactive; + ot->invoke = wm_splash_invoke; + ot->poll = WM_operator_winactive; } @@ -1461,12 +1461,12 @@ static int wm_search_menu_poll(bContext *C) static void WM_OT_search_menu(wmOperatorType *ot) { - ot->name= "Search Menu"; - ot->idname= "WM_OT_search_menu"; + ot->name = "Search Menu"; + ot->idname = "WM_OT_search_menu"; - ot->invoke= wm_search_menu_invoke; - ot->exec= wm_search_menu_exec; - ot->poll= wm_search_menu_poll; + ot->invoke = wm_search_menu_invoke; + ot->exec = wm_search_menu_exec; + ot->poll = wm_search_menu_poll; } static int wm_call_menu_exec(bContext *C, wmOperator *op) @@ -1481,13 +1481,13 @@ static int wm_call_menu_exec(bContext *C, wmOperator *op) static void WM_OT_call_menu(wmOperatorType *ot) { - ot->name= "Call Menu"; - ot->idname= "WM_OT_call_menu"; + ot->name = "Call Menu"; + ot->idname = "WM_OT_call_menu"; - ot->exec= wm_call_menu_exec; - ot->poll= WM_operator_winactive; + ot->exec = wm_call_menu_exec; + ot->poll = WM_operator_winactive; - ot->flag= OPTYPE_INTERNAL; + ot->flag = OPTYPE_INTERNAL; RNA_def_string(ot->srna, "name", "", BKE_ST_MAXNAME, "Name", "Name of the menu"); } @@ -1508,44 +1508,44 @@ static int wm_operator_winactive_normal(bContext *C) static void WM_OT_window_duplicate(wmOperatorType *ot) { - ot->name= "Duplicate Window"; - ot->idname= "WM_OT_window_duplicate"; - ot->description="Duplicate the current Blender window"; + ot->name = "Duplicate Window"; + ot->idname = "WM_OT_window_duplicate"; + ot->description = "Duplicate the current Blender window"; - ot->exec= wm_window_duplicate_exec; - ot->poll= wm_operator_winactive_normal; + ot->exec = wm_window_duplicate_exec; + ot->poll = wm_operator_winactive_normal; } static void WM_OT_save_homefile(wmOperatorType *ot) { - ot->name= "Save User Settings"; - ot->idname= "WM_OT_save_homefile"; - ot->description="Make the current file the default .blend file"; + ot->name = "Save User Settings"; + ot->idname = "WM_OT_save_homefile"; + ot->description = "Make the current file the default .blend file"; - ot->invoke= WM_operator_confirm; - ot->exec= WM_write_homefile; - ot->poll= WM_operator_winactive; + ot->invoke = WM_operator_confirm; + ot->exec = WM_write_homefile; + ot->poll = WM_operator_winactive; } static void WM_OT_read_homefile(wmOperatorType *ot) { - ot->name= "Reload Start-Up File"; - ot->idname= "WM_OT_read_homefile"; - ot->description="Open the default file (doesn't save the current file)"; + ot->name = "Reload Start-Up File"; + ot->idname = "WM_OT_read_homefile"; + ot->description = "Open the default file (doesn't save the current file)"; - ot->invoke= WM_operator_confirm; - ot->exec= WM_read_homefile_exec; + ot->invoke = WM_operator_confirm; + ot->exec = WM_read_homefile_exec; /* ommit poll to run in background mode */ } static void WM_OT_read_factory_settings(wmOperatorType *ot) { - ot->name= "Load Factory Settings"; - ot->idname= "WM_OT_read_factory_settings"; - ot->description="Load default file and user preferences"; + ot->name = "Load Factory Settings"; + ot->idname = "WM_OT_read_factory_settings"; + ot->description = "Load default file and user preferences"; - ot->invoke= WM_operator_confirm; - ot->exec= WM_read_homefile_exec; + ot->invoke = WM_operator_confirm; + ot->exec = WM_read_homefile_exec; /* ommit poll to run in background mode */ } @@ -1623,12 +1623,12 @@ static int wm_open_mainfile_exec(bContext *C, wmOperator *op) static void WM_OT_open_mainfile(wmOperatorType *ot) { - ot->name= "Open Blender File"; - ot->idname= "WM_OT_open_mainfile"; - ot->description="Open a Blender file"; + ot->name = "Open Blender File"; + ot->idname = "WM_OT_open_mainfile"; + ot->description = "Open a Blender file"; - ot->invoke= wm_open_mainfile_invoke; - ot->exec= wm_open_mainfile_exec; + ot->invoke = wm_open_mainfile_invoke; + ot->exec = wm_open_mainfile_exec; /* ommit window poll so this can work in background mode */ WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, FILE_BLENDER, FILE_OPENFILE, @@ -1813,13 +1813,13 @@ static int wm_link_append_exec(bContext *C, wmOperator *op) static void WM_OT_link_append(wmOperatorType *ot) { - ot->name= "Link/Append from Library"; - ot->idname= "WM_OT_link_append"; - ot->description= "Link or Append from a Library .blend file"; + ot->name = "Link/Append from Library"; + ot->idname = "WM_OT_link_append"; + ot->description = "Link or Append from a Library .blend file"; - ot->invoke= wm_link_append_invoke; - ot->exec= wm_link_append_exec; - ot->poll= wm_link_append_poll; + ot->invoke = wm_link_append_invoke; + ot->exec = wm_link_append_exec; + ot->poll = wm_link_append_poll; ot->flag |= OPTYPE_UNDO; @@ -1856,12 +1856,12 @@ static int wm_recover_last_session_exec(bContext *C, wmOperator *op) static void WM_OT_recover_last_session(wmOperatorType *ot) { - ot->name= "Recover Last Session"; - ot->idname= "WM_OT_recover_last_session"; - ot->description="Open the last closed file (\"quit.blend\")"; + ot->name = "Recover Last Session"; + ot->idname = "WM_OT_recover_last_session"; + ot->description = "Open the last closed file (\"quit.blend\")"; - ot->exec= wm_recover_last_session_exec; - ot->poll= WM_operator_winactive; + ot->exec = wm_recover_last_session_exec; + ot->poll = WM_operator_winactive; } /* *************** recover auto save **************** */ @@ -1899,13 +1899,13 @@ static int wm_recover_auto_save_invoke(bContext *C, wmOperator *op, wmEvent *UNU static void WM_OT_recover_auto_save(wmOperatorType *ot) { - ot->name= "Recover Auto Save"; - ot->idname= "WM_OT_recover_auto_save"; - ot->description="Open an automatically saved file to recover it"; + ot->name = "Recover Auto Save"; + ot->idname = "WM_OT_recover_auto_save"; + ot->description = "Open an automatically saved file to recover it"; - ot->exec= wm_recover_auto_save_exec; - ot->invoke= wm_recover_auto_save_invoke; - ot->poll= WM_operator_winactive; + ot->exec = wm_recover_auto_save_exec; + ot->invoke = wm_recover_auto_save_invoke; + ot->poll = WM_operator_winactive; WM_operator_properties_filesel(ot, BLENDERFILE, FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH, FILE_LONGDISPLAY); } @@ -2018,13 +2018,13 @@ static int blend_save_check(bContext *UNUSED(C), wmOperator *op) static void WM_OT_save_as_mainfile(wmOperatorType *ot) { - ot->name= "Save As Blender File"; - ot->idname= "WM_OT_save_as_mainfile"; - ot->description="Save the current file in the desired location"; + ot->name = "Save As Blender File"; + ot->idname = "WM_OT_save_as_mainfile"; + ot->description = "Save the current file in the desired location"; - ot->invoke= wm_save_as_mainfile_invoke; - ot->exec= wm_save_as_mainfile_exec; - ot->check= blend_save_check; + ot->invoke = wm_save_as_mainfile_invoke; + ot->exec = wm_save_as_mainfile_exec; + ot->check = blend_save_check; /* ommit window poll so this can work in background mode */ WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, FILE_BLENDER, FILE_SAVE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY); @@ -2085,13 +2085,13 @@ static int wm_save_mainfile_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED( static void WM_OT_save_mainfile(wmOperatorType *ot) { - ot->name= "Save Blender File"; - ot->idname= "WM_OT_save_mainfile"; - ot->description="Save the current Blender file"; + ot->name = "Save Blender File"; + ot->idname = "WM_OT_save_mainfile"; + ot->description = "Save the current Blender file"; - ot->invoke= wm_save_mainfile_invoke; - ot->exec= wm_save_as_mainfile_exec; - ot->check= blend_save_check; + ot->invoke = wm_save_mainfile_invoke; + ot->exec = wm_save_as_mainfile_exec; + ot->check = blend_save_check; /* ommit window poll so this can work in background mode */ WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, FILE_BLENDER, FILE_SAVE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY); @@ -2142,12 +2142,12 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op) static void WM_OT_collada_export(wmOperatorType *ot) { - ot->name= "Export COLLADA"; - ot->idname= "WM_OT_collada_export"; + ot->name = "Export COLLADA"; + ot->idname = "WM_OT_collada_export"; - ot->invoke= wm_collada_export_invoke; - ot->exec= wm_collada_export_exec; - ot->poll= WM_operator_winactive; + ot->invoke = wm_collada_export_invoke; + ot->exec = wm_collada_export_exec; + ot->poll = WM_operator_winactive; WM_operator_properties_filesel(ot, FOLDERFILE|COLLADAFILE, FILE_BLENDER, FILE_SAVE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY); RNA_def_boolean(ot->srna, "selected", 0, "Export only selected", @@ -2176,12 +2176,12 @@ static int wm_collada_import_exec(bContext *C, wmOperator *op) static void WM_OT_collada_import(wmOperatorType *ot) { - ot->name= "Import COLLADA"; - ot->idname= "WM_OT_collada_import"; + ot->name = "Import COLLADA"; + ot->idname = "WM_OT_collada_import"; - ot->invoke= WM_operator_filesel; - ot->exec= wm_collada_import_exec; - ot->poll= WM_operator_winactive; + ot->invoke = WM_operator_filesel; + ot->exec = wm_collada_import_exec; + ot->poll = WM_operator_winactive; WM_operator_properties_filesel(ot, FOLDERFILE|COLLADAFILE, FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY); } @@ -2193,12 +2193,12 @@ static void WM_OT_collada_import(wmOperatorType *ot) static void WM_OT_window_fullscreen_toggle(wmOperatorType *ot) { - ot->name= "Toggle Fullscreen"; - ot->idname= "WM_OT_window_fullscreen_toggle"; - ot->description="Toggle the current window fullscreen"; + ot->name = "Toggle Fullscreen"; + ot->idname = "WM_OT_window_fullscreen_toggle"; + ot->description = "Toggle the current window fullscreen"; - ot->exec= wm_window_fullscreen_toggle_exec; - ot->poll= WM_operator_winactive; + ot->exec = wm_window_fullscreen_toggle_exec; + ot->poll = WM_operator_winactive; } static int wm_exit_blender_op(bContext *C, wmOperator *op) @@ -2212,13 +2212,13 @@ static int wm_exit_blender_op(bContext *C, wmOperator *op) static void WM_OT_quit_blender(wmOperatorType *ot) { - ot->name= "Quit Blender"; - ot->idname= "WM_OT_quit_blender"; - ot->description= "Quit Blender"; + ot->name = "Quit Blender"; + ot->idname = "WM_OT_quit_blender"; + ot->description = "Quit Blender"; - ot->invoke= WM_operator_confirm; - ot->exec= wm_exit_blender_op; - ot->poll= WM_operator_winactive; + ot->invoke = WM_operator_confirm; + ot->exec = wm_exit_blender_op; + ot->poll = WM_operator_winactive; } /* *********************** */ @@ -2233,12 +2233,12 @@ static int wm_console_toggle_op(bContext *UNUSED(C), wmOperator *UNUSED(op)) static void WM_OT_console_toggle(wmOperatorType *ot) { - ot->name= "Toggle System Console"; - ot->idname= "WM_OT_console_toggle"; - ot->description= "Toggle System Console"; + ot->name = "Toggle System Console"; + ot->idname = "WM_OT_console_toggle"; + ot->description = "Toggle System Console"; - ot->exec= wm_console_toggle_op; - ot->poll= WM_operator_winactive; + ot->exec = wm_console_toggle_op; + ot->poll = WM_operator_winactive; } #endif @@ -2518,14 +2518,14 @@ int WM_gesture_circle_cancel(bContext *C, wmOperator *op) /* template to copy from */ void WM_OT_circle_gesture(wmOperatorType *ot) { - ot->name= "Circle Gesture"; - ot->idname= "WM_OT_circle_gesture"; - ot->description="Enter rotate mode with a circular gesture"; + ot->name = "Circle Gesture"; + ot->idname = "WM_OT_circle_gesture"; + ot->description = "Enter rotate mode with a circular gesture"; - ot->invoke= WM_gesture_circle_invoke; - ot->modal= WM_gesture_circle_modal; + ot->invoke = WM_gesture_circle_invoke; + ot->modal = WM_gesture_circle_modal; - ot->poll= WM_operator_winactive; + ot->poll = WM_operator_winactive; RNA_def_property(ot->srna, "x", PROP_INT, PROP_NONE); RNA_def_property(ot->srna, "y", PROP_INT, PROP_NONE); @@ -2764,15 +2764,15 @@ void WM_OT_lasso_gesture(wmOperatorType *ot) { PropertyRNA *prop; - ot->name= "Lasso Gesture"; - ot->idname= "WM_OT_lasso_gesture"; - ot->description="Select objects within the lasso as you move the pointer"; + ot->name = "Lasso Gesture"; + ot->idname = "WM_OT_lasso_gesture"; + ot->description = "Select objects within the lasso as you move the pointer"; - ot->invoke= WM_gesture_lasso_invoke; - ot->modal= WM_gesture_lasso_modal; - ot->exec= gesture_lasso_exec; + ot->invoke = WM_gesture_lasso_invoke; + ot->modal = WM_gesture_lasso_modal; + ot->exec = gesture_lasso_exec; - ot->poll= WM_operator_winactive; + ot->poll = WM_operator_winactive; prop= RNA_def_property(ot->srna, "path", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_runtime(prop, &RNA_OperatorMousePath); @@ -2878,15 +2878,15 @@ void WM_OT_straightline_gesture(wmOperatorType *ot) { PropertyRNA *prop; - ot->name= "Straight Line Gesture"; - ot->idname= "WM_OT_straightline_gesture"; - ot->description="Draw a straight line as you move the pointer"; + ot->name = "Straight Line Gesture"; + ot->idname = "WM_OT_straightline_gesture"; + ot->description = "Draw a straight line as you move the pointer"; - ot->invoke= WM_gesture_straightline_invoke; - ot->modal= WM_gesture_straightline_modal; - ot->exec= gesture_straightline_exec; + ot->invoke = WM_gesture_straightline_invoke; + ot->modal = WM_gesture_straightline_modal; + ot->exec = gesture_straightline_exec; - ot->poll= WM_operator_winactive; + ot->poll = WM_operator_winactive; WM_operator_properties_gesture_straightline(ot, 0); } @@ -3383,14 +3383,14 @@ static int radial_control_modal(bContext *C, wmOperator *op, wmEvent *event) static void WM_OT_radial_control(wmOperatorType *ot) { - ot->name= "Radial Control"; - ot->idname= "WM_OT_radial_control"; + ot->name = "Radial Control"; + ot->idname = "WM_OT_radial_control"; - ot->invoke= radial_control_invoke; - ot->modal= radial_control_modal; - ot->cancel= radial_control_cancel; + ot->invoke = radial_control_invoke; + ot->modal = radial_control_modal; + ot->cancel = radial_control_cancel; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; + ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; /* all paths relative to the context */ RNA_def_string(ot->srna, "data_path_primary", "", 0, "Primary Data Path", "Primary path of property to be set by the radial control"); @@ -3525,15 +3525,15 @@ static int redraw_timer_exec(bContext *C, wmOperator *op) static void WM_OT_redraw_timer(wmOperatorType *ot) { - ot->name= "Redraw Timer"; - ot->idname= "WM_OT_redraw_timer"; - ot->description="Simple redraw timer to test the speed of updating the interface"; + ot->name = "Redraw Timer"; + ot->idname = "WM_OT_redraw_timer"; + ot->description = "Simple redraw timer to test the speed of updating the interface"; - ot->invoke= WM_menu_invoke; - ot->exec= redraw_timer_exec; - ot->poll= WM_operator_winactive; + ot->invoke = WM_menu_invoke; + ot->exec = redraw_timer_exec; + ot->poll = WM_operator_winactive; - ot->prop= RNA_def_enum(ot->srna, "type", redraw_timer_type_items, 0, "Type", ""); + ot->prop = RNA_def_enum(ot->srna, "type", redraw_timer_type_items, 0, "Type", ""); RNA_def_int(ot->srna, "iterations", 10, 1,INT_MAX, "Iterations", "Number of times to redraw", 1,1000); } @@ -3548,11 +3548,11 @@ static int memory_statistics_exec(bContext *UNUSED(C), wmOperator *UNUSED(op)) static void WM_OT_memory_statistics(wmOperatorType *ot) { - ot->name= "Memory Statistics"; - ot->idname= "WM_OT_memory_statistics"; - ot->description= "Print memory statistics to the console"; + ot->name = "Memory Statistics"; + ot->idname = "WM_OT_memory_statistics"; + ot->description = "Print memory statistics to the console"; - ot->exec= memory_statistics_exec; + ot->exec = memory_statistics_exec; } /* ************************** memory statistics for testing ***************** */ @@ -3570,11 +3570,11 @@ static int dependency_relations_exec(bContext *C, wmOperator *UNUSED(op)) static void WM_OT_dependency_relations(wmOperatorType *ot) { - ot->name= "Dependency Relations"; - ot->idname= "WM_OT_dependency_relations"; - ot->description= "Print dependency graph relations to the console"; + ot->name = "Dependency Relations"; + ot->idname = "WM_OT_dependency_relations"; + ot->description = "Print dependency graph relations to the console"; - ot->exec= dependency_relations_exec; + ot->exec = dependency_relations_exec; } /* ******************************************************* */ @@ -3610,11 +3610,11 @@ static int wm_ndof_sensitivity_exec(bContext *UNUSED(C), wmOperator *op) static void WM_OT_ndof_sensitivity_change(wmOperatorType *ot) { - ot->name= "Change NDOF sensitivity"; - ot->idname= "WM_OT_ndof_sensitivity_change"; - ot->description="Change NDOF sensitivity"; + ot->name = "Change NDOF sensitivity"; + ot->idname = "WM_OT_ndof_sensitivity_change"; + ot->description = "Change NDOF sensitivity"; - ot->exec= wm_ndof_sensitivity_exec; + ot->exec = wm_ndof_sensitivity_exec; RNA_def_boolean(ot->srna, "decrease", 1, "Decrease NDOF sensitivity", "If true then action decreases NDOF sensitivity instead of increasing"); RNA_def_boolean(ot->srna, "fast", 0, "Fast NDOF sensitivity change", "If true then sensitivity changes 50%, otherwise 10%"); |