diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-09 02:24:41 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-09 02:24:41 +0400 |
commit | 3c4987f98378d44eda133311c65aa19412e4cd38 (patch) | |
tree | 4371b4117d3290e60a58190481e926ebb17fcf28 /source/blender/editors | |
parent | ec33687d6cf74775e37fdc1a14e22dea08289cb1 (diff) |
Fix for a number of compiler warnings as well as a bug hidden by the warnings.
Patch contribution by Bastien Montagne, thanks!
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 4 | ||||
-rw-r--r-- | source/blender/editors/render/render_shading.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index c353b64607d..3153cc72562 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -2014,13 +2014,13 @@ static bAnimChannelType ACF_DSNTREE = /* LineStyle Expander ------------------------------------------- */ // TODO: just get this from RNA? -static int acf_dslinestyle_icon(bAnimListElem *ale) +static int acf_dslinestyle_icon(bAnimListElem *UNUSED(ale)) { return ICON_BRUSH_DATA; /* FIXME */ } /* get the appropriate flag(s) for the setting when it is valid */ -static int acf_dslinestyle_setting_flag(bAnimContext *ac, int setting, short *neg) +static int acf_dslinestyle_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ *neg= 0; diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 34677650f80..5e23015f194 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -703,7 +703,7 @@ static int freestyle_active_lineset_poll(bContext *C) return FRS_get_active_lineset(&srl->freestyleConfig) != NULL; } -static int freestyle_lineset_copy_exec(bContext *C, wmOperator *op) +static int freestyle_lineset_copy_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene= CTX_data_scene(C); SceneRenderLayer *srl = (SceneRenderLayer*) BLI_findlink(&scene->r.layers, scene->r.actlay); @@ -730,7 +730,7 @@ void SCENE_OT_freestyle_lineset_copy(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; } -static int freestyle_lineset_paste_exec(bContext *C, wmOperator *op) +static int freestyle_lineset_paste_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene= CTX_data_scene(C); SceneRenderLayer *srl = (SceneRenderLayer*) BLI_findlink(&scene->r.layers, scene->r.actlay); |