diff options
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/armature/editarmature.c | 2 | ||||
-rw-r--r-- | source/blender/editors/curve/editcurve.c | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/bmesh_select.c | 5 | ||||
-rw-r--r-- | source/blender/editors/mesh/editface.c | 2 | ||||
-rwxr-xr-x | source/blender/editors/mesh/knifetool.c | 10 | ||||
-rw-r--r-- | source/blender/editors/metaball/mball_edit.c | 4 | ||||
-rw-r--r-- | source/blender/editors/object/object_lattice.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 14 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_snap.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_toolbar.c | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 2 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_buttons.c | 4 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 4 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_unwrap_ops.c | 2 |
14 files changed, 35 insertions, 26 deletions
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 4c639140845..ea478a5e8b4 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -2245,7 +2245,7 @@ typedef struct UndoArmature { ListBase lb; } UndoArmature; -static void undoBones_to_editBones(void *uarmv, void *armv, void *data) +static void undoBones_to_editBones(void *uarmv, void *armv, void *UNUSED(data)) { UndoArmature *uarm= uarmv; bArmature *arm= armv; diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 3c6234dece7..5801120dde4 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -6955,7 +6955,7 @@ static void *undo_check_lastsel(void *lastsel, Nurb *nu, Nurb *newnu) return NULL; } -static void undoCurve_to_editCurve(void *ucu, void *edata, void *obe) +static void undoCurve_to_editCurve(void *ucu, void *UNUSED(edata), void *obe) { Object *obedit= obe; Curve *cu= (Curve*)obedit->data; @@ -7005,7 +7005,7 @@ static void undoCurve_to_editCurve(void *ucu, void *edata, void *obe) ED_curve_updateAnimPaths(obedit); } -static void *editCurve_to_undoCurve(void *edata, void *obe) +static void *editCurve_to_undoCurve(void *UNUSED(edata), void *obe) { Object *obedit= obe; Curve *cu= (Curve*)obedit->data; diff --git a/source/blender/editors/mesh/bmesh_select.c b/source/blender/editors/mesh/bmesh_select.c index d9485672492..c09b9def160 100644 --- a/source/blender/editors/mesh/bmesh_select.c +++ b/source/blender/editors/mesh/bmesh_select.c @@ -1870,7 +1870,10 @@ void em_deselect_nth_vert(EditMesh *em, int nth, EditVert *eve_act) int EM_deselect_nth(BMEditMesh *em, int nth) { -#if 0 //BMESH_TODO +#if 1 /*BMESH_TODO*/ + (void)em; + (void)nth; +#else EditSelection *ese; ese = ((EditSelection*)em->selected.last); if(ese) { diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index 5a03d283aea..80651b301ab 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -349,7 +349,7 @@ void paintface_select_linked(bContext *UNUSED(C), Object *ob, short UNUSED(mval[ } /* note: caller needs to run paintface_flush_flags(ob) after this */ -void paintface_deselect_all_visible(Object *ob, int action, short flush_flags) +void paintface_deselect_all_visible(Object *ob, int action, short UNUSED(flush_flags)) { Mesh *me; MPoly *mface; diff --git a/source/blender/editors/mesh/knifetool.c b/source/blender/editors/mesh/knifetool.c index 52d169ee3cb..9d907a82482 100755 --- a/source/blender/editors/mesh/knifetool.c +++ b/source/blender/editors/mesh/knifetool.c @@ -584,13 +584,13 @@ static void knife_add_cut(knifetool_opdata *kcd) } } -static void knife_finish_cut(knifetool_opdata *kcd) +static void knife_finish_cut(knifetool_opdata *UNUSED(kcd)) { } /* modal loop selection drawing callback */ -static void knifetool_draw(const bContext *C, ARegion *ar, void *arg) +static void knifetool_draw(const bContext *UNUSED(C), ARegion *UNUSED(ar), void *arg) { knifetool_opdata *kcd = arg; @@ -891,7 +891,7 @@ BMEdgeHit *knife_edge_tri_isect(knifetool_opdata *kcd, BMBVHTree *bmtree, float return edges; } -void knife_bgl_get_mats(knifetool_opdata *kcd, bglMats *mats) +void knife_bgl_get_mats(knifetool_opdata *UNUSED(kcd), bglMats *mats) { bgl_get_mats(mats); //copy_m4_m4(mats->modelview, kcd->vc.rv3d->viewmat); @@ -1656,7 +1656,7 @@ void knife_recalc_projmat(knifetool_opdata *kcd) } /* called when modal loop selection is done... */ -static void knifetool_exit (bContext *C, wmOperator *op) +static void knifetool_exit (bContext *UNUSED(C), wmOperator *op) { knifetool_opdata *kcd= op->customdata; @@ -1687,7 +1687,7 @@ static void knifetool_exit (bContext *C, wmOperator *op) } /* called when modal loop selection gets set up... */ -static int knifetool_init (bContext *C, wmOperator *op, int do_cut) +static int knifetool_init (bContext *C, wmOperator *op, int UNUSED(do_cut)) { knifetool_opdata *kcd; diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index 3f839c7a3bf..7eb75dce79b 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -556,7 +556,7 @@ static void freeMetaElemlist(ListBase *lb) } -static void undoMball_to_editMball(void *lbu, void *lbe, void *obe) +static void undoMball_to_editMball(void *lbu, void *lbe, void *UNUSED(obe)) { ListBase *lb= lbu; ListBase *editelems= lbe; @@ -574,7 +574,7 @@ static void undoMball_to_editMball(void *lbu, void *lbe, void *obe) } -static void *editMball_to_undoMball(void *lbe, void *obe) +static void *editMball_to_undoMball(void *lbe, void *UNUSED(obe)) { ListBase *editelems= lbe; ListBase *lb; diff --git a/source/blender/editors/object/object_lattice.c b/source/blender/editors/object/object_lattice.c index ff1de99aaf5..5921144436c 100644 --- a/source/blender/editors/object/object_lattice.c +++ b/source/blender/editors/object/object_lattice.c @@ -367,7 +367,7 @@ typedef struct UndoLattice { int pntsu, pntsv, pntsw; } UndoLattice; -static void undoLatt_to_editLatt(void *data, void *edata, void *obdata) +static void undoLatt_to_editLatt(void *data, void *edata, void *UNUSED(obdata)) { UndoLattice *ult= (UndoLattice*)data; EditLatt *editlatt= (EditLatt *)edata; @@ -376,7 +376,7 @@ static void undoLatt_to_editLatt(void *data, void *edata, void *obdata) memcpy(editlatt->latt->def, ult->def, a*sizeof(BPoint)); } -static void *editLatt_to_undoLatt(void *edata, void *obdata) +static void *editLatt_to_undoLatt(void *edata, void *UNUSED(obdata)) { UndoLattice *ult= MEM_callocN(sizeof(UndoLattice), "UndoLattice"); EditLatt *editlatt= (EditLatt *)edata; diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index a317eb3288f..7b0bb2dcf7a 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -1806,7 +1806,7 @@ static int check_pinned_face(BMesh *bm, BMFace *efa) } static void draw_dm_vert_pins__mapFunc(void *userData, int index, - float *co, float *no_f, short *no_s) + float *co, float *UNUSED(no_f), short *UNUSED(no_s)) { struct {BMEditMesh *em; Mesh *me;} *data = userData; BMVert *eve = EDBM_get_vert_for_index(data->em, index); @@ -2301,7 +2301,13 @@ static void draw_em_fancy_edges(BMEditMesh *em, Scene *scene, View3D *v3d, static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, BMEditMesh *em, UnitSettings *unit) { -#if 0 +#if 1 + (void)v3d; + (void)rv3d; + (void)ob; + (void)em; + (void)unit; +#else /*BMESH_TODO*/ Mesh *me= ob->data; EditEdge *eed; EditFace *efa; @@ -2677,7 +2683,7 @@ static void draw_mesh_object_outline(View3D *v3d, Object *ob, DerivedMesh *dm) } } -static int wpaint__setSolidDrawOptions(void *userData, int UNUSED(index), int *drawSmooth_r) +static int wpaint__setSolidDrawOptions(void *UNUSED(userData), int UNUSED(index), int *drawSmooth_r) { *drawSmooth_r = 1; return 1; @@ -6622,7 +6628,7 @@ static void bbs_mesh_solid_EM(BMEditMesh *em, Scene *scene, View3D *v3d, } } -static int bbs_mesh_solid__setDrawOpts(void *userData, int index, int *UNUSED(drawSmooth_r)) +static int bbs_mesh_solid__setDrawOpts(void *UNUSED(userData), int index, int *UNUSED(drawSmooth_r)) { WM_set_framebuffer_index_color(index+1); return 1; diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index 14e46a2c65b..12100863cb1 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -191,7 +191,7 @@ static void special_transvert_update(Object *obedit) } } -static void set_mapped_co(void *vuserdata, int index, float *co, float *no, short *no_s) +static void set_mapped_co(void *vuserdata, int index, float *co, float *UNUSED(no), short *UNUSED(no_s)) { void ** userdata = vuserdata; BMEditMesh *em = userdata[0]; diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c b/source/blender/editors/space_view3d/view3d_toolbar.c index 20d3db2b599..c049f1f9821 100644 --- a/source/blender/editors/space_view3d/view3d_toolbar.c +++ b/source/blender/editors/space_view3d/view3d_toolbar.c @@ -280,7 +280,7 @@ void VIEW3D_OT_toolshelf(wmOperatorType *ot) #ifdef EVENT_RECORDER -static int view3d_evtrec(bContext *C, wmOperator *op) +static int view3d_evtrec(bContext *C, wmOperator *UNUSED(op)) { CTX_rec_events_set(C, !CTX_rec_events(C)); diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 0e8e91e5918..ea8c88a82c8 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -1989,7 +1989,7 @@ inline void VertsToTransData(TransInfo *t, TransData *td, BMesh *em, BMVert *eve /* *********************** CrazySpace correction. Now without doing subsurf optimal ****************** */ -static void make_vertexcos__mapFunc(void *userData, int index, float *co, float *no_f, short *no_s) +static void make_vertexcos__mapFunc(void *userData, int index, float *co, float *UNUSED(no_f), short *UNUSED(no_s)) { float *vec = userData; diff --git a/source/blender/editors/uvedit/uvedit_buttons.c b/source/blender/editors/uvedit/uvedit_buttons.c index 5338a1229b6..2a69a7d6abc 100644 --- a/source/blender/editors/uvedit/uvedit_buttons.c +++ b/source/blender/editors/uvedit/uvedit_buttons.c @@ -64,7 +64,7 @@ /* UV Utilities */ -static int uvedit_center(Scene *scene, BMEditMesh *em, Image *ima, float center[2]) +static int uvedit_center(Scene *scene, BMEditMesh *em, Image *UNUSED(ima), float center[2]) { BMFace *f; BMLoop *l; @@ -91,7 +91,7 @@ static int uvedit_center(Scene *scene, BMEditMesh *em, Image *ima, float center[ return tot; } -static void uvedit_translate(Scene *scene, BMEditMesh *em, Image *ima, float delta[2]) +static void uvedit_translate(Scene *scene, BMEditMesh *em, Image *UNUSED(ima), float delta[2]) { BMFace *f; BMLoop *l; diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index de749be8457..10ef3bb2bd0 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -690,7 +690,7 @@ static void find_nearest_uv_face(Scene *scene, Image *ima, BMEditMesh *em, float } } -static int nearest_uv_between(BMEditMesh *em, BMFace *efa, int nverts, int id, +static int nearest_uv_between(BMEditMesh *em, BMFace *efa, int UNUSED(nverts), int id, float co[2], float uv[2]) { BMLoop *l; @@ -2461,7 +2461,7 @@ static void UV_OT_select_border(wmOperatorType *ot) /* ******************** circle select operator **************** */ -static void select_uv_inside_ellipse(BMEditMesh *em, SpaceImage *sima, Scene *scene, int select, +static void select_uv_inside_ellipse(BMEditMesh *em, SpaceImage *UNUSED(sima), Scene *scene, int select, float *offset, float *ell, BMLoop *l, MLoopUV *luv) { /* normalized ellipse: ell[0] = scaleX, ell[1] = scaleY */ diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index 3fc53174447..f10745adb8b 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -1162,7 +1162,7 @@ static void uv_sphere_project(float target[2], float source[3], float center[3], target[0] -= 1.0f; } -static void uv_map_mirror(BMEditMesh *em, BMFace *efa, MTexPoly *tf) +static void uv_map_mirror(BMEditMesh *em, BMFace *efa, MTexPoly *UNUSED(tf)) { BMLoop *l; BMIter liter; |