diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-05-04 08:00:53 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-04 08:00:53 +0400 |
commit | b5c2598a6b31f63ee6d52c61d6ab5195a576ec56 (patch) | |
tree | 8fa9e72bc46e7f586a71e92057ab93a31278cdf4 /source | |
parent | 41dbd19b4d19daada4f0189107b4f3aa9a043869 (diff) |
use UNUSED in some more function args, no functional changes.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/render/render_internal.c | 4 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 12 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 12 |
3 files changed, 11 insertions, 17 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 3890eedeb57..7f90e298504 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -840,7 +840,7 @@ void RENDER_OT_render(wmOperatorType *ot) /* *********************** cancel render viewer *************** */ -static int render_view_cancel_exec(bContext *C, wmOperator *UNUSED(unused)) +static int render_view_cancel_exec(bContext *C, wmOperator *UNUSED(op)) { wmWindow *win= CTX_wm_window(C); ScrArea *sa= CTX_wm_area(C); @@ -887,7 +887,7 @@ void RENDER_OT_view_cancel(struct wmOperatorType *ot) /* *********************** show render viewer *************** */ -static int render_view_show_invoke(bContext *C, wmOperator *UNUSED(unused), wmEvent *event) +static int render_view_show_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *event) { wmWindow *wincur = CTX_wm_window(C); diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 1ed4764c629..c7733ced1f3 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -3518,14 +3518,12 @@ static void sculpt_brush_exit_tex(Sculpt *sd) ntreeEndExecTree(mtex->tex->nodetree); } -static void sculpt_stroke_done(bContext *C, struct PaintStroke *unused) +static void sculpt_stroke_done(bContext *C, struct PaintStroke *UNUSED(stroke)) { Object *ob= CTX_data_active_object(C); SculptSession *ss = ob->sculpt; Sculpt *sd = CTX_data_tool_settings(C)->sculpt; - (void)unused; - // reset values used to draw brush after completing the stroke sd->draw_anchored= 0; sd->draw_pressure= 0; @@ -3655,12 +3653,10 @@ static void SCULPT_OT_brush_stroke(wmOperatorType *ot) /**** Reset the copy of the mesh that is being sculpted on (currently just for the layer brush) ****/ -static int sculpt_set_persistent_base(bContext *C, wmOperator *unused) +static int sculpt_set_persistent_base(bContext *C, wmOperator *UNUSED(op)) { SculptSession *ss = CTX_data_active_object(C)->sculpt; - (void)unused; - if(ss) { if(ss->layer_co) MEM_freeN(ss->layer_co); @@ -3692,7 +3688,7 @@ static void sculpt_init_session(Scene *scene, Object *ob) sculpt_update_mesh_elements(scene, ob, 0); } -static int sculpt_toggle_mode(bContext *C, wmOperator *unused) +static int sculpt_toggle_mode(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); ToolSettings *ts = CTX_data_tool_settings(C); @@ -3700,8 +3696,6 @@ static int sculpt_toggle_mode(bContext *C, wmOperator *unused) MultiresModifierData *mmd= sculpt_multires_active(scene, ob); int flush_recalc= 0; - (void)unused; - /* multires in sculpt mode could have different from object mode subdivision level */ flush_recalc |= mmd && mmd->sculptlvl != mmd->lvl; /* if object has got active modifiers, it's dm could be different in sculpt mode */ diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 0b4d5ccbbfc..e06e71d6a0e 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -313,7 +313,7 @@ static void rna_Scene_layer_set(PointerRNA *ptr, const int *values) scene->lay= ED_view3d_scene_layer_set(scene->lay, values, &scene->layact); } -static void rna_Scene_view3d_update(Main *bmain, Scene *unused, PointerRNA *ptr) +static void rna_Scene_view3d_update(Main *bmain, Scene *UNUSED(scene_unused), PointerRNA *ptr) { Scene *scene= (Scene*)ptr->data; @@ -740,14 +740,14 @@ static int rna_RenderSettings_engine_get(PointerRNA *ptr) return 0; } -static void rna_Scene_glsl_update(Main *bmain, Scene *unused, PointerRNA *ptr) +static void rna_Scene_glsl_update(Main *bmain, Scene *UNUSED(scene_unused), PointerRNA *ptr) { Scene *scene= (Scene*)ptr->id.data; DAG_id_tag_update(&scene->id, 0); } -static void rna_RenderSettings_color_management_update(Main *bmain, Scene *unused, PointerRNA *ptr) +static void rna_RenderSettings_color_management_update(Main *bmain, Scene *UNUSED(scene_unused), PointerRNA *ptr) { /* reset image nodes */ Scene *scene= (Scene*)ptr->id.data; @@ -769,7 +769,7 @@ static void rna_RenderSettings_color_management_update(Main *bmain, Scene *unuse } } - rna_Scene_glsl_update(bmain, unused, ptr); + rna_Scene_glsl_update(bmain, scene, ptr); } static void rna_SceneRenderLayer_name_set(PointerRNA *ptr, const char *value) @@ -815,7 +815,7 @@ static void rna_SceneRenderLayer_layer_set(PointerRNA *ptr, const int *values) rl->lay= ED_view3d_scene_layer_set(rl->lay, values, NULL); } -static void rna_SceneRenderLayer_pass_update(Main *bmain, Scene *unused, PointerRNA *ptr) +static void rna_SceneRenderLayer_pass_update(Main *bmain, Scene *UNUSED(scene_unused), PointerRNA *ptr) { Scene *scene= (Scene*)ptr->id.data; @@ -832,7 +832,7 @@ static void rna_Scene_use_nodes_set(PointerRNA *ptr, int value) ED_node_composit_default(scene); } -static void rna_Physics_update(Main *bmain, Scene *unused, PointerRNA *ptr) +static void rna_Physics_update(Main *bmain, Scene *UNUSED(scene_unused), PointerRNA *ptr) { Scene *scene= (Scene*)ptr->id.data; Base *base; |