kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

tag unused arguments, quiet some warnings

Browse Source
This commit is contained in:
Campbell Barton 2011-05-09 14:32:55 +00:00
parent 5776d7ff9c
commit 5ba0c2c049
35 changed files with 110 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/DerivedMesh.c
View File

@ -1023,7 +1023,7 @@ static void shapekey_layers_to_keyblocks(DerivedMesh *dm, Mesh *me, int actshape
}
}
static void add_shapekey_layers(DerivedMesh *dm, Mesh *me, Object *ob)
static void add_shapekey_layers(DerivedMesh *dm, Mesh *me, Object *UNUSED(ob))
{
KeyBlock *kb;
Key *key = me->key;

2
source/blender/blenkernel/intern/cdderivedmesh.c
View File

@ -1865,7 +1865,7 @@ static void loops_to_customdata_corners(BMesh *bm, CustomData *facedata,
}
}
DerivedMesh *CDDM_from_BMEditMesh(BMEditMesh *em, Mesh *me, int use_mdisps)
DerivedMesh *CDDM_from_BMEditMesh(BMEditMesh *em, Mesh *UNUSED(me), int use_mdisps)
{
DerivedMesh *dm = CDDM_new(em->bm->totvert, em->bm->totedge,
em->tottri, em->bm->totloop, em->bm->totface);

5
source/blender/blenkernel/intern/context.c
View File

@ -44,6 +44,7 @@
#include "RNA_access.h"
#include "BLI_utildefines.h"
#include "BLI_listbase.h"
#include "BLI_string.h"
#include "PIL_time.h"
@ -122,7 +123,7 @@ bContext *CTX_copy(const bContext *C)
#if defined(EVENT_RECORDER) && !defined(BUILDING_GAMEPLAYER)
extern GHOST_SystemHandle g_system;
int CTX_rec_events(bContext *C)
int CTX_rec_events(bContext *UNUSED(C))
{
return GHOST_RecordingEvents(g_system);
}
@ -139,7 +140,7 @@ int CTX_rec_events_set(bContext *C, int state)
return 1;
}
FILE *CTX_rec_file(bContext *C)
FILE *CTX_rec_file(bContext *UNUSED(C))
{
static FILE *f = NULL;
if (!f)

13
source/blender/blenkernel/intern/customdata.c
View File

@ -471,7 +471,7 @@ static void layerSwap_mdisps(void *data, const int *ci)
}
static void layerInterp_mdisps(void **sources, float *UNUSED(weights),
float *sub_weights, int count, void *dest)
float *UNUSED(sub_weights), int UNUSED(count), void *dest)
{
MDisps *d = dest;
@ -505,7 +505,10 @@ static void layerCopy_mdisps(const void *source, void *dest, int count)
static void layerValidate_mdisps(void *data, int sub_elements)
{
#if 0
#if 1 /*BMESH_TODO*/
(void)data;
(void)sub_elements;
#else
MDisps *disps = data;
if(disps->disps) {
int corners = multires_mdisp_corners(disps);
@ -864,7 +867,7 @@ static void layerDefault_mcol(void *data, int count)
}
static void layerInterp_bweight(void **sources, float *weights,
float *sub_weights, int count, void *dest)
float *UNUSED(sub_weights), int count, void *dest)
{
float *f = dest, *src;
float **in = (float **)sources;
@ -883,10 +886,10 @@ static void layerInterp_bweight(void **sources, float *weights,
}
static void layerInterp_shapekey(void **sources, float *weights,
float *sub_weights, int count, void *dest)
float *UNUSED(sub_weights), int count, void *dest)
{
float *co = dest, *src;
float **in = sources;
float **in = (float **)sources;
int i, j, k;
if(count <= 0) return;

22
source/blender/blenkernel/intern/editderivedbmesh.c
View File

@ -397,7 +397,7 @@ static void bmdm_recalc_lookups(EditDerivedBMesh *bmdm)
}
}
static void bmDM_recalcTesselation(DerivedMesh *dm)
static void bmDM_recalcTesselation(DerivedMesh *UNUSED(dm))
{
//EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm;
@ -488,7 +488,7 @@ static void bmDM_drawMappedEdges(DerivedMesh *dm, int (*setDrawOptions)(void *us
}
}
static void bmDM_drawEdges(DerivedMesh *dm, int drawLooseEdges, int drawAllEdges)
static void bmDM_drawEdges(DerivedMesh *dm, int UNUSED(drawLooseEdges), int UNUSED(drawAllEdges))
{
bmDM_drawMappedEdges(dm, NULL, NULL);
}
@ -632,6 +632,10 @@ static void bmDM_drawMappedFaces(DerivedMesh *dm,
BMIter iter;
int i, draw;
/*BMESH_TODO*/
(void)useColors;
(void)setMaterial;
if (bmdm->vertexCos) {
BMVert *eve;
@ -956,9 +960,15 @@ static void bmDM_drawMappedFacesTex(DerivedMesh *dm, int (*setDrawOptions)(void
static void bmDM_drawMappedFacesGLSL(DerivedMesh *dm,
int (*setMaterial)(int, void *attribs),
int (*setDrawOptions)(void *userData, int index), void *userData)
int (*setDrawOptions)(void *userData, int index), void *userData)
{
#if 0
#if 1
(void)dm;
(void)setMaterial;
(void)setDrawOptions;
(void)userData;
#else /*BMESH_TODO*/
EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm;
BMesh *bm= bmdm->tc->bm;
float (*vertexCos)[3]= bmdm->vertexCos;
@ -1469,7 +1479,7 @@ void bmDM_iterFree(void *self)
MEM_freeN(self);
}
void bmDM_nulliterFree(void *self)
void bmDM_nulliterFree(void *UNUSED(self))
{
}
@ -1590,7 +1600,7 @@ CustomData *bmDm_getFaceDataLayout(DerivedMesh *dm)
}
DerivedMesh *getEditDerivedBMesh(BMEditMesh *em, Object *ob,
DerivedMesh *getEditDerivedBMesh(BMEditMesh *em, Object *UNUSED(ob),
float (*vertexCos)[3])
{
EditDerivedBMesh *bmdm = MEM_callocN(sizeof(*bmdm), "bmdm");

4
source/blender/blenkernel/intern/mesh.c
View File

@ -955,7 +955,7 @@ static void mfaces_strip_loose(MFace *mface, int *totface)
/* Create edges based on known verts and faces */
static void make_edges_mdata(MVert *UNUSED(allvert), MFace *allface, MLoop *allloop,
MPoly *allpoly, int UNUSED(totvert), int totface, int totloop, int totpoly,
MPoly *allpoly, int UNUSED(totvert), int totface, int UNUSED(totloop), int totpoly,
int old, MEdge **alledge, int *_totedge)
{
MPoly *mpoly;
@ -2263,7 +2263,7 @@ void mesh_loops_to_tri_corners(CustomData *fdata, CustomData *ldata,
*/
int mesh_recalcTesselation(CustomData *fdata,
CustomData *ldata, CustomData *pdata,
MVert *mvert, int totface, int totloop,
MVert *mvert, int totface, int UNUSED(totloop),
int totpoly, int use_poly_origindex,
int use_face_origindex)
{

9
source/blender/blenkernel/intern/subsurf_ccg.c
View File

@ -221,7 +221,12 @@ static void get_face_uv_map_vert(UvVertMap *vmap, struct MFace *mf, int fi, CCGV
}
static int ss_sync_from_uv(CCGSubSurf *ss, CCGSubSurf *origss, DerivedMesh *dm, MTFace *tface) {
#if 0
#if 1 /*BMESH_TODO*/
(void)ss;
(void)origss;
(void)dm;
(void)tface;
#else
MFace *mface = dm->getTessFaceArray(dm);
MVert *mvert = dm->getVertArray(dm);
int totvert = dm->getNumVerts(dm);
@ -1758,7 +1763,7 @@ static void cgdm_drawFacesGLSL(DerivedMesh *dm, int (*setMaterial)(int, void *at
dm->drawMappedFacesGLSL(dm, setMaterial, NULL, NULL);
}
static void cgdm_drawFacesColored(DerivedMesh *dm, int useTwoSided, unsigned char *col1, unsigned char *col2) {
static void cgdm_drawFacesColored(DerivedMesh *dm, int UNUSED(useTwoSided), unsigned char *col1, unsigned char *col2) {
CCGDerivedMesh *cgdm = (CCGDerivedMesh*) dm;
CCGSubSurf *ss = cgdm->ss;
CCGFaceIterator *fi = ccgSubSurf_getFaceIterator(ss);

1
source/blender/bmesh/bmesh_class.h
View File

@ -173,7 +173,6 @@ typedef struct BMFaceCut {
here as well (except it's not saved in files obviously, or interpolating, or all the other things the CD
system does)*/
#define BMSC_GETSELF(bm, e, type) (void*)(((char*)((BMHeader*)(e))->layerdata) + bm->layer_offsets[(type)->__index])
#define BMSC_DEFAULT_LAYERSIZE sizeof(LayerType)
#define BM_SUBCLASS_HEAD struct BMLayerType *type; int __index;

6
source/blender/bmesh/bmesh_operator_api.h
View File

@ -1,5 +1,5 @@
#ifndef _BMESH_OPERATOR_H
#define _BMESH_OPERATOR_H
#ifndef _BMESH_OPERATOR_API_H
#define _BMESH_OPERATOR_API_H
#ifdef __cplusplus
extern "C" {
@ -493,4 +493,4 @@ BM_INLINE void *BMO_Get_MapPointer(BMesh *bm, BMOperator *op, const char *slotna
}
#endif
#endif /* _BMESH_OPERATOR_H */
#endif /* _BMESH_OPERATOR_API_H */

14
source/blender/bmesh/bmesh_operators.h
View File

@ -1,5 +1,5 @@
#ifndef BM_OPERATORS_H
#define BM_OPERATORS_H
#ifndef _BMESH_OPERATORS_H
#define _BMESH_OPERATORS_H
/*see comments in intern/bmesh_opdefines.c for documentation of specific operators*/
@ -13,7 +13,7 @@ enum {
DEL_EDGESFACES,
DEL_FACES,
DEL_ALL ,
DEL_ONLYTAGGED,
DEL_ONLYTAGGED
};
/*quad innervert values*/
@ -21,7 +21,7 @@ enum {
SUBD_INNERVERT,
SUBD_PATH,
SUBD_FAN,
SUBD_STRAIGHT_CUT,
SUBD_STRAIGHT_CUT
};
/* similar face selection slot values */
@ -31,7 +31,7 @@ enum {
SIMFACE_AREA,
SIMFACE_PERIMETER,
SIMFACE_NORMAL,
SIMFACE_COPLANAR,
SIMFACE_COPLANAR
};
/* similar edge selection slot values */
@ -42,14 +42,14 @@ enum {
SIMEDGE_FACE_ANGLE,
SIMEDGE_CREASE,
SIMEDGE_SEAM,
SIMEDGE_SHARP,
SIMEDGE_SHARP
};
/* similar vertex selection slot values */
enum {
SIMVERT_NORMAL = 0,
SIMVERT_FACE,
SIMVERT_VGROUP,
SIMVERT_VGROUP
};
enum {

2
source/blender/bmesh/bmesh_walkers.h
View File

@ -77,7 +77,7 @@ enum {
BMW_ISLAND,
/*do not intitialze function pointers and struct size in BMW_Init*/
BMW_CUSTOM,
BMW_MAXWALKERS,
BMW_MAXWALKERS
};
#endif

2
source/blender/bmesh/intern/bmesh_operators.c
View File

@ -48,7 +48,7 @@ const int BMOP_OPSLOT_TYPEINFO[] = {
sizeof(element_mapping)
};
void BMO_Set_OpFlag(BMesh *bm, BMOperator *op, int flag)
void BMO_Set_OpFlag(BMesh *UNUSED(bm), BMOperator *op, int flag)
{
op->flag |= flag;
}

11
source/blender/bmesh/operators/createops.c
View File

@ -65,7 +65,7 @@ static int count_edge_faces(BMesh *bm, BMEdge *e);
/**** rotation system code ***/
#define rs_get_edge_link(e, v, ed) (Link*)((v) == ((BMEdge*)(e))->v1 ? &(((EdgeData*)(ed))->dlink1) : &(((EdgeData*)(ed))->dlink2))
#define rs_get_edge_link(e, v, ed) ((v) == ((BMEdge*)(e))->v1 ? (Link*)&(((EdgeData*)(ed))->dlink1) : (Link*)&(((EdgeData*)(ed))->dlink2))
int rotsys_append_edge(struct BMEdge *e, struct BMVert *v,
EdgeData *edata, VertData *vdata)
@ -122,7 +122,7 @@ void rotsys_remove_edge(struct BMEdge *e, struct BMVert *v,
}
struct BMEdge *rotsys_nextedge(struct BMEdge *e, struct BMVert *v,
EdgeData *edata, VertData *vdata)
EdgeData *edata, VertData *UNUSED(vdata))
{
if (v == e->v1)
return edata[BMINDEX_GET(e)].dlink1.next;
@ -132,7 +132,7 @@ struct BMEdge *rotsys_nextedge(struct BMEdge *e, struct BMVert *v,
}
BMEdge *rotsys_prevedge(BMEdge *e, BMVert *v,
EdgeData *edata, VertData *vdata)
EdgeData *edata, VertData *UNUSED(vdata))
{
if (v == e->v1)
return edata[BMINDEX_GET(e)].dlink1.prev;
@ -141,7 +141,7 @@ BMEdge *rotsys_prevedge(BMEdge *e, BMVert *v,
return NULL;
}
struct BMEdge *rotsys_reverse(struct BMEdge *e, struct BMVert *v, EdgeData *edata, VertData *vdata)
struct BMEdge *rotsys_reverse(struct BMEdge *UNUSED(e), struct BMVert *v, EdgeData *edata, VertData *vdata)
{
BMEdge **edges = NULL;
BMEdge *e2;
@ -644,7 +644,7 @@ EPath *edge_path_new(PathBase *pb, BMVert *start, BMEdge *starte)
return path;
}
float edge_weight_path(EPath *path, EdgeData *edata, VertData *vdata)
float edge_weight_path(EPath *path, EdgeData *edata, VertData *UNUSED(vdata))
{
EPathNode *node, *first=path->nodes.first;
float w = 0.0;
@ -653,6 +653,7 @@ float edge_weight_path(EPath *path, EdgeData *edata, VertData *vdata)
if (node->e && node != path->nodes.first) {
w += edata[BMINDEX_GET(node->e)].ftag;
if (node->prev) {
/*BMESH_TODO*/
//w += len_v3v3(node->v->co, first->e->v1->co)*0.0001f;
//w += len_v3v3(node->v->co, first->e->v2->co)*0.0001f;
}

2
source/blender/bmesh/operators/edgesplitop.c
View File

@ -120,7 +120,7 @@ static BMFace *remake_face(BMesh *bm, EdgeTag *etags, BMFace *f, BMVert **verts)
return f2;
}
void tag_out_edges(BMesh *bm, EdgeTag *etags, BMOperator *op)
void tag_out_edges(BMesh *bm, EdgeTag *etags, BMOperator *UNUSED(op))
{
EdgeTag *et;
BMIter iter;

2
source/blender/bmesh/operators/subdivideop.c
View File

@ -168,7 +168,7 @@ BMEdge *connect_smallest_face(BMesh *bm, BMVert *v1, BMVert *v2, BMFace **nf) {
return NULL;
}
/* calculates offset for co, based on fractal, sphere or smooth settings */
static void alter_co(BMesh *bm, BMVert *v, BMEdge *origed, subdparams *params, float perc,
static void alter_co(BMesh *bm, BMVert *v, BMEdge *UNUSED(origed), subdparams *params, float perc,
BMVert *vsta, BMVert *vend)
{
float vec1[3], fac;

2
source/blender/editors/armature/editarmature.c
View File

@ -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;

4
source/blender/editors/curve/editcurve.c
View File

@ -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;

5
source/blender/editors/mesh/bmesh_select.c
View File

@ -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) {

2
source/blender/editors/mesh/editface.c
View File

@ -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;

10
source/blender/editors/mesh/knifetool.c
View File

@ -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;

4
source/blender/editors/metaball/mball_edit.c
View File

@ -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;

4
source/blender/editors/object/object_lattice.c
View File

@ -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;

14
source/blender/editors/space_view3d/drawobject.c
View File

@ -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;

2
source/blender/editors/space_view3d/view3d_snap.c
View File

@ -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];

2
source/blender/editors/space_view3d/view3d_toolbar.c
View File

@ -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));

2
source/blender/editors/transform/transform_conversions.c
View File

@ -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;

4
source/blender/editors/uvedit/uvedit_buttons.c
View File

@ -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;

4
source/blender/editors/uvedit/uvedit_ops.c
View File

@ -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 */

2
source/blender/editors/uvedit/uvedit_unwrap_ops.c
View File

@ -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;

10
source/blender/modifiers/intern/MOD_array.c
View File

@ -107,8 +107,8 @@ static void foreachObjectLink(
walk(userData, ob, &amd->offset_ob);
}
static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene *scene,
Object *ob, DagNode *obNode)
static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene *UNUSED(scene),
Object *UNUSED(ob), DagNode *obNode)
{
ArrayModifierData *amd = (ArrayModifierData*) md;
@ -309,7 +309,7 @@ static int calc_mapping(IndexMapEntry *indexMap, int oldIndex, int copyNum)
static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
Scene *scene, Object *ob, DerivedMesh *dm,
int initFlags)
int UNUSED(initFlags))
{
DerivedMesh *cddm = dm; //copying shouldn't be necassary here, as all modifiers return CDDM's
BMEditMesh *em = CDDM_To_BMesh(ob, cddm, NULL);
@ -515,7 +515,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob, DerivedMesh *derivedData,
int useRenderParams, int isFinalCalc)
int UNUSED(useRenderParams), int UNUSED(isFinalCalc))
{
DerivedMesh *result;
ArrayModifierData *amd = (ArrayModifierData*) md;
@ -529,7 +529,7 @@ static DerivedMesh *applyModifier(
}
static DerivedMesh *applyModifierEM(
ModifierData *md, Object *ob, struct BMEditMesh *editData,
ModifierData *md, Object *ob, struct BMEditMesh *UNUSED(editData),
DerivedMesh *derivedData)
{
return applyModifier(md, ob, derivedData, 0, 1);

7
source/blender/modifiers/intern/MOD_bevel.c
View File

@ -91,7 +91,10 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
int UNUSED(useRenderParams),
int UNUSED(isFinalCalc))
{
#if 0
#if 1 /*BMESH_TODO*/
(void)md;
return CDDM_copy(derivedData, 0);
#else
DerivedMesh *result;
BME_Mesh *bm;
@ -115,8 +118,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
CDDM_calc_normals(result);
#endif
return CDDM_copy(derivedData, 0);
}
static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob,

8
source/blender/modifiers/intern/MOD_edgesplit.c
View File

@ -90,7 +90,7 @@ BM_INLINE EdgeNode *edge_get_node(EdgeData *e, int ov)
return NULL;
}
BM_INLINE VertUser *edge_get_vuser(MemBase *b, EdgeData *edge, int ov)
BM_INLINE VertUser *edge_get_vuser(MemBase *UNUSED(b), EdgeData *edge, int ov)
{
if (ov == edge->v1)
return edge->v1user;
@ -377,7 +377,7 @@ static void copyData(ModifierData *md, ModifierData *target)
}
static DerivedMesh *edgesplitModifier_do(EdgeSplitModifierData *emd,
Object *ob, DerivedMesh *dm)
Object *UNUSED(ob), DerivedMesh *dm)
{
if(!(emd->flags & (MOD_EDGESPLIT_FROMANGLE | MOD_EDGESPLIT_FROMFLAG)))
return dm;
@ -387,7 +387,7 @@ static DerivedMesh *edgesplitModifier_do(EdgeSplitModifierData *emd,
static DerivedMesh *applyModifier(
ModifierData *md, Object *ob, DerivedMesh *derivedData,
int useRenderParams, int isFinalCalc)
int UNUSED(useRenderParams), int UNUSED(isFinalCalc))
{
DerivedMesh *result;
EdgeSplitModifierData *emd = (EdgeSplitModifierData*) md;
@ -401,7 +401,7 @@ static DerivedMesh *applyModifier(
}
static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob,
BMEditMesh *editData, DerivedMesh *derivedData)
BMEditMesh *UNUSED(editData), DerivedMesh *derivedData)
{
return applyModifier(md, ob, derivedData, 0, 1);
}

2
source/blender/modifiers/intern/MOD_ngoninterp.c
View File

@ -66,7 +66,7 @@ static void copyData(ModifierData *md, ModifierData *target)
tmmd->resolution = mmd->resolution;
}
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
DerivedMesh *derivedData,
int UNUSED(useRenderParams),
int UNUSED(isFinalCalc))

2
source/blender/python/intern/bpy.c
View File

@ -60,7 +60,7 @@
#include "../generic/blf_py_api.h"
#include "../generic/IDProp.h"
//#include "AUD_PyInit.h"
#include "AUD_PyInit.h"
PyObject *bpy_package_py= NULL;

4
source/creator/creator.c
View File

@ -356,7 +356,7 @@ double PIL_check_seconds_timer(void);
}
}*/
void segmentation_handler(int sig)
void segmentation_handler(int UNUSED(sig))
{
char fname[256];
@ -374,7 +374,7 @@ void segmentation_handler(int sig)
*(int*)NULL = 0;
}
static int nocrashhandler(int argc, const char **argv, void *data)
static int nocrashhandler(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
{
no_handler = 1;