[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36575] branches/bmesh/blender/source: tag unused arguments, quiet some warnings
Campbell Barton
ideasman42 at gmail.com
Mon May 9 16:32:55 CEST 2011
Revision: 36575
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36575
Author: campbellbarton
Date: 2011-05-09 14:32:55 +0000 (Mon, 09 May 2011)
Log Message:
-----------
tag unused arguments, quiet some warnings
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/context.c
branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
branches/bmesh/blender/source/blender/bmesh/bmesh_class.h
branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
branches/bmesh/blender/source/blender/bmesh/bmesh_walkers.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
branches/bmesh/blender/source/blender/bmesh/operators/createops.c
branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
branches/bmesh/blender/source/blender/editors/armature/editarmature.c
branches/bmesh/blender/source/blender/editors/curve/editcurve.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
branches/bmesh/blender/source/blender/editors/mesh/editface.c
branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
branches/bmesh/blender/source/blender/editors/metaball/mball_edit.c
branches/bmesh/blender/source/blender/editors/object/object_lattice.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_snap.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_toolbar.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_array.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_bevel.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_edgesplit.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_ngoninterp.c
branches/bmesh/blender/source/blender/python/intern/bpy.c
branches/bmesh/blender/source/creator/creator.c
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-05-09 13:13:16 UTC (rev 36574)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-05-09 14:32:55 UTC (rev 36575)
@@ -1023,7 +1023,7 @@
}
}
-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;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2011-05-09 13:13:16 UTC (rev 36574)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2011-05-09 14:32:55 UTC (rev 36575)
@@ -1865,7 +1865,7 @@
}
}
-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);
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/context.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/context.c 2011-05-09 13:13:16 UTC (rev 36574)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/context.c 2011-05-09 14:32:55 UTC (rev 36575)
@@ -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 @@
#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 @@
return 1;
}
-FILE *CTX_rec_file(bContext *C)
+FILE *CTX_rec_file(bContext *UNUSED(C))
{
static FILE *f = NULL;
if (!f)
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c 2011-05-09 13:13:16 UTC (rev 36574)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c 2011-05-09 14:32:55 UTC (rev 36575)
@@ -471,7 +471,7 @@
}
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 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 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_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;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c 2011-05-09 13:13:16 UTC (rev 36574)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c 2011-05-09 14:32:55 UTC (rev 36575)
@@ -397,7 +397,7 @@
}
}
-static void bmDM_recalcTesselation(DerivedMesh *dm)
+static void bmDM_recalcTesselation(DerivedMesh *UNUSED(dm))
{
//EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm;
@@ -488,7 +488,7 @@
}
}
-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 @@
BMIter iter;
int i, draw;
+ /*BMESH_TODO*/
+ (void)useColors;
+ (void)setMaterial;
+
if (bmdm->vertexCos) {
BMVert *eve;
@@ -956,9 +960,15 @@
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 @@
MEM_freeN(self);
}
-void bmDM_nulliterFree(void *self)
+void bmDM_nulliterFree(void *UNUSED(self))
{
}
@@ -1590,7 +1600,7 @@
}
-DerivedMesh *getEditDerivedBMesh(BMEditMesh *em, Object *ob,
+DerivedMesh *getEditDerivedBMesh(BMEditMesh *em, Object *UNUSED(ob),
float (*vertexCos)[3])
{
EditDerivedBMesh *bmdm = MEM_callocN(sizeof(*bmdm), "bmdm");
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c 2011-05-09 13:13:16 UTC (rev 36574)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c 2011-05-09 14:32:55 UTC (rev 36575)
@@ -955,7 +955,7 @@
/* 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 @@
*/
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)
{
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2011-05-09 13:13:16 UTC (rev 36574)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2011-05-09 14:32:55 UTC (rev 36575)
@@ -221,7 +221,12 @@
}
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 @@
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);
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_class.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_class.h 2011-05-09 13:13:16 UTC (rev 36574)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_class.h 2011-05-09 14:32:55 UTC (rev 36575)
@@ -173,7 +173,6 @@
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;
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h 2011-05-09 13:13:16 UTC (rev 36574)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h 2011-05-09 14:32:55 UTC (rev 36575)
@@ -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 @@
}
#endif
-#endif /* _BMESH_OPERATOR_H */
+#endif /* _BMESH_OPERATOR_API_H */
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h 2011-05-09 13:13:16 UTC (rev 36574)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h 2011-05-09 14:32:55 UTC (rev 36575)
@@ -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 @@
DEL_EDGESFACES,
DEL_FACES,
DEL_ALL ,
- DEL_ONLYTAGGED,
+ DEL_ONLYTAGGED
};
/*quad innervert values*/
@@ -21,7 +21,7 @@
SUBD_INNERVERT,
SUBD_PATH,
SUBD_FAN,
- SUBD_STRAIGHT_CUT,
+ SUBD_STRAIGHT_CUT
};
/* similar face selection slot values */
@@ -31,7 +31,7 @@
SIMFACE_AREA,
SIMFACE_PERIMETER,
SIMFACE_NORMAL,
- SIMFACE_COPLANAR,
+ SIMFACE_COPLANAR
};
/* similar edge selection slot values */
@@ -42,14 +42,14 @@
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 {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list