Revision: 36472
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36472
Author: campbellbarton
Date: 2011-05-04 04:00:53 +0000 (Wed, 04 May 2011)
Log Message:
-----------
use UNUSED in some more function args, no functional changes.
Modified Paths:
--------------
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c
2011-05-04 03:34:55 UTC (rev 36471)
+++ trunk/blender/source/blender/editors/render/render_internal.c
2011-05-04 04:00:53 UTC (rev 36472)
@@ -840,7 +840,7 @@
/* *********************** 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 @@
/* *********************** 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);
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2011-05-04
03:34:55 UTC (rev 36471)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2011-05-04
04:00:53 UTC (rev 36472)
@@ -3518,14 +3518,12 @@
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 @@
/**** 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 @@
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 @@
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 */
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2011-05-04
03:34:55 UTC (rev 36471)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2011-05-04
04:00:53 UTC (rev 36472)
@@ -313,7 +313,7 @@
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 @@
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 @@
}
}
- 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 @@
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 @@
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;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
