diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-07-28 21:06:31 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-28 21:06:31 +0400 |
commit | fc4a7775112045c604bef0eacbe1dc3cc609d0f3 (patch) | |
tree | 33558d967b181b8b89f00fe4e55f3c35e2033d44 /source/blender/editors/space_view3d | |
parent | b8e06518c9626fcf3791a00fecb88cb6b3902947 (diff) |
use '_exec' suffix for operator execute callbacks, also picky change to sizeof() use in BLI_array.h
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_buttons.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_snap.c | 24 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_toolbar.c | 4 |
3 files changed, 16 insertions, 16 deletions
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index dab20651537..75e7605df6b 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -1171,7 +1171,7 @@ void view3d_buttons_register(ARegionType *art) BLI_addtail(&art->paneltypes, pt); } -static int view3d_properties(bContext *C, wmOperator *UNUSED(op)) +static int view3d_properties_toggle_exec(bContext *C, wmOperator *UNUSED(op)) { ScrArea *sa = CTX_wm_area(C); ARegion *ar = view3d_has_buttons_region(sa); @@ -1188,7 +1188,7 @@ void VIEW3D_OT_properties(wmOperatorType *ot) ot->description = "Toggles the properties panel display"; ot->idname = "VIEW3D_OT_properties"; - ot->exec = view3d_properties; + ot->exec = view3d_properties_toggle_exec; ot->poll = ED_operator_view3d_active; /* flags */ diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index a2dd7d510bd..facbd45606d 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -532,7 +532,7 @@ static void make_trans_verts(Object *obedit, float min[3], float max[3], int mod /* *********************** operators ******************** */ -static int snap_sel_to_grid(bContext *C, wmOperator *UNUSED(op)) +static int snap_sel_to_grid_exec(bContext *C, wmOperator *UNUSED(op)) { Object *obedit = CTX_data_edit_object(C); Scene *scene = CTX_data_scene(C); @@ -664,7 +664,7 @@ void VIEW3D_OT_snap_selected_to_grid(wmOperatorType *ot) ot->idname = "VIEW3D_OT_snap_selected_to_grid"; /* api callbacks */ - ot->exec = snap_sel_to_grid; + ot->exec = snap_sel_to_grid_exec; ot->poll = ED_operator_region_view3d_active; /* flags */ @@ -673,7 +673,7 @@ void VIEW3D_OT_snap_selected_to_grid(wmOperatorType *ot) /* *************************************************** */ -static int snap_sel_to_curs(bContext *C, wmOperator *op) +static int snap_sel_to_curs_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); Scene *scene = CTX_data_scene(C); @@ -832,7 +832,7 @@ void VIEW3D_OT_snap_selected_to_cursor(wmOperatorType *ot) ot->idname = "VIEW3D_OT_snap_selected_to_cursor"; /* api callbacks */ - ot->exec = snap_sel_to_curs; + ot->exec = snap_sel_to_curs_exec; ot->poll = ED_operator_view3d_active; /* flags */ @@ -844,7 +844,7 @@ void VIEW3D_OT_snap_selected_to_cursor(wmOperatorType *ot) /* *************************************************** */ -static int snap_curs_to_grid(bContext *C, wmOperator *UNUSED(op)) +static int snap_curs_to_grid_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); RegionView3D *rv3d = CTX_wm_region_data(C); @@ -871,7 +871,7 @@ void VIEW3D_OT_snap_cursor_to_grid(wmOperatorType *ot) ot->idname = "VIEW3D_OT_snap_cursor_to_grid"; /* api callbacks */ - ot->exec = snap_curs_to_grid; + ot->exec = snap_curs_to_grid_exec; ot->poll = ED_operator_region_view3d_active; /* flags */ @@ -1029,7 +1029,7 @@ static bool snap_curs_to_sel_ex(bContext *C, float cursor[3]) return true; } -static int snap_curs_to_sel(bContext *C, wmOperator *UNUSED(op)) +static int snap_curs_to_sel_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); View3D *v3d = CTX_wm_view3d(C); @@ -1055,7 +1055,7 @@ void VIEW3D_OT_snap_cursor_to_selected(wmOperatorType *ot) ot->idname = "VIEW3D_OT_snap_cursor_to_selected"; /* api callbacks */ - ot->exec = snap_curs_to_sel; + ot->exec = snap_curs_to_sel_exec; ot->poll = ED_operator_view3d_active; /* flags */ @@ -1064,7 +1064,7 @@ void VIEW3D_OT_snap_cursor_to_selected(wmOperatorType *ot) /* ********************************************** */ -static int snap_curs_to_active(bContext *C, wmOperator *UNUSED(op)) +static int snap_curs_to_active_exec(bContext *C, wmOperator *UNUSED(op)) { Object *obedit = CTX_data_edit_object(C); Object *obact = CTX_data_active_object(C); @@ -1113,7 +1113,7 @@ void VIEW3D_OT_snap_cursor_to_active(wmOperatorType *ot) ot->idname = "VIEW3D_OT_snap_cursor_to_active"; /* api callbacks */ - ot->exec = snap_curs_to_active; + ot->exec = snap_curs_to_active_exec; ot->poll = ED_operator_view3d_active; /* flags */ @@ -1122,7 +1122,7 @@ void VIEW3D_OT_snap_cursor_to_active(wmOperatorType *ot) /* **************************************************** */ /*New Code - Snap Cursor to Center -*/ -static int snap_curs_to_center(bContext *C, wmOperator *UNUSED(op)) +static int snap_curs_to_center_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); View3D *v3d = CTX_wm_view3d(C); @@ -1144,7 +1144,7 @@ void VIEW3D_OT_snap_cursor_to_center(wmOperatorType *ot) ot->idname = "VIEW3D_OT_snap_cursor_to_center"; /* api callbacks */ - ot->exec = snap_curs_to_center; + ot->exec = snap_curs_to_center_exec; ot->poll = ED_operator_view3d_active; /* flags */ diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c b/source/blender/editors/space_view3d/view3d_toolbar.c index ebb9a7b8c81..f5f59c935df 100644 --- a/source/blender/editors/space_view3d/view3d_toolbar.c +++ b/source/blender/editors/space_view3d/view3d_toolbar.c @@ -258,7 +258,7 @@ void view3d_tool_props_register(ARegionType *art) /* ********** operator to open/close toolshelf region */ -static int view3d_toolshelf(bContext *C, wmOperator *UNUSED(op)) +static int view3d_toolshelf_toggle_exec(bContext *C, wmOperator *UNUSED(op)) { ScrArea *sa = CTX_wm_area(C); ARegion *ar = view3d_has_tools_region(sa); @@ -275,7 +275,7 @@ void VIEW3D_OT_toolshelf(wmOperatorType *ot) ot->description = "Toggles tool shelf display"; ot->idname = "VIEW3D_OT_toolshelf"; - ot->exec = view3d_toolshelf; + ot->exec = view3d_toolshelf_toggle_exec; ot->poll = ED_operator_view3d_active; /* flags */ |