[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35650] branches/bmesh/blender/source/ blender/bmesh: bmesh, less warnings
Campbell Barton
ideasman42 at gmail.com
Sun Mar 20 15:49:17 CET 2011
Revision: 35650
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35650
Author: campbellbarton
Date: 2011-03-20 14:49:16 +0000 (Sun, 20 Mar 2011)
Log Message:
-----------
bmesh, less warnings
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_queries.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c
branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
branches/bmesh/blender/source/blender/bmesh/operators/extrudeops.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2011-03-20 14:07:16 UTC (rev 35649)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2011-03-20 14:49:16 UTC (rev 35650)
@@ -258,7 +258,7 @@
BLI_array_staticdeclare(verts, VERT_BUF_SIZE);
BMFace *f = NULL;
BMEdge *e;
- int overlap = 0, i, j, v1found, reverse;
+ int overlap = 0, i, /* j,*/ v1found, reverse;
/*this code is hideous, yeek. I'll have to think about ways of
cleaning it up. basically, it now combines the old BM_Make_Ngon
@@ -466,7 +466,7 @@
BMEdge *e, *e2, **edges = NULL, **etable = NULL;
BLI_array_declare(edges);
BLI_array_declare(etable);
- BMLoop *l, *l2, **loops = NULL;
+ BMLoop *l, /* *l2,*/ **loops = NULL;
BLI_array_declare(loops);
BMFace *f, *f2, **ftable = NULL;
BLI_array_declare(ftable);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c 2011-03-20 14:07:16 UTC (rev 35649)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c 2011-03-20 14:49:16 UTC (rev 35650)
@@ -80,9 +80,9 @@
*/
-void BM_Data_Vert_Average(BMesh *bm, BMFace *f)
+void BM_Data_Vert_Average(BMesh *UNUSED(bm), BMFace *UNUSED(f))
{
- BMIter iter;
+ // BMIter iter;
}
/**
@@ -95,7 +95,7 @@
* Nothing
*/
-void BM_Data_Facevert_Edgeinterp(BMesh *bm, BMVert *v1, BMVert *v2, BMVert *v, BMEdge *e1, float fac){
+void BM_Data_Facevert_Edgeinterp(BMesh *bm, BMVert *v1, BMVert *UNUSED(v2), BMVert *v, BMEdge *e1, float fac){
void *src[2];
float w[2];
BMLoop *l=NULL, *v1loop = NULL, *vloop = NULL, *v2loop = NULL;
@@ -263,7 +263,7 @@
static void update_data_blocks(BMesh *bm, CustomData *olddata, CustomData *data)
{
BMIter iter;
- BLI_mempool *oldpool = olddata->pool;
+ // BLI_mempool *oldpool = olddata->pool;
void *block;
CustomData_bmesh_init_pool(data, data==&bm->ldata ? 2048 : 512);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c 2011-03-20 14:07:16 UTC (rev 35649)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c 2011-03-20 14:49:16 UTC (rev 35650)
@@ -365,7 +365,7 @@
*/
void *BMIter_New(BMIter *iter, BMesh *bm, int type, void *data)
{
- int argtype;
+ /* int argtype; */
iter->type = type;
iter->bm = bm;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c 2011-03-20 14:07:16 UTC (rev 35649)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c 2011-03-20 14:49:16 UTC (rev 35650)
@@ -118,8 +118,8 @@
void BM_Select_Vert(BMesh *bm, BMVert *v, int select)
{
- BMIter iter;
- BMEdge *e;
+ /* BMIter iter; */
+ /* BMEdge *e; */
if(select) {
if (!BM_TestHFlag(v, BM_SELECT)) bm->totvertsel += 1;
@@ -342,7 +342,7 @@
else if(head->type == BM_FACE) BM_Select_Face(bm, (BMFace*)element, select);
}
-int BM_Selected(BMesh *bm, void *element)
+int BM_Selected(BMesh *UNUSED(bm), void *element)
{
BMHeader *head = element;
return BM_TestHFlag(head, BM_SELECT);
@@ -568,12 +568,12 @@
#define SETPIN(ele) pin ? BM_SetHFlag(ele, BM_PINNED) : BM_ClearHFlag(ele, BM_PINNED);
-void BM_Pin_Vert(BMesh *bm, BMVert *v, int pin)
+void BM_Pin_Vert(BMesh *UNUSED(bm), BMVert *v, int pin)
{
SETPIN(v);
}
-void BM_Pin_Edge(BMesh *bm, BMEdge *e, int pin)
+void BM_Pin_Edge(BMesh *UNUSED(bm), BMEdge *e, int pin)
{
SETPIN(e->v1);
SETPIN(e->v2);
@@ -658,7 +658,7 @@
{
BMIter iter;
BMFace *f;
- BMVert *v;
+ /* BMVert *v; */
/*edge hiding: faces around the edge*/
BM_ITER(f, &iter, bm, BM_FACES_OF_EDGE, e) {
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c 2011-03-20 14:07:16 UTC (rev 35649)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c 2011-03-20 14:49:16 UTC (rev 35650)
@@ -292,10 +292,10 @@
*
*/
-void bmesh_begin_edit(BMesh *bm){
+void bmesh_begin_edit(BMesh *UNUSED(bm)){
}
-void bmesh_end_edit(BMesh *bm, int flag){
+void bmesh_end_edit(BMesh *bm, int UNUSED(flag)){
/*compute normals, clear temp flags and flush selections*/
BM_Compute_Normals(bm);
BM_SelectMode_Flush(bm);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c 2011-03-20 14:07:16 UTC (rev 35649)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c 2011-03-20 14:49:16 UTC (rev 35650)
@@ -286,8 +286,8 @@
* Returns -
* BMFace pointer
*/
-
-BMFace *BM_Split_Face(BMesh *bm, BMFace *f, BMVert *v1, BMVert *v2, BMLoop **nl, BMEdge *example)
+
+BMFace *BM_Split_Face(BMesh *bm, BMFace *f, BMVert *v1, BMVert *v2, BMLoop **nl, BMEdge *UNUSED(example))
{
BMFace *nf;
nf = bmesh_sfme(bm,f,v1,v2,nl, NULL);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c 2011-03-20 14:07:16 UTC (rev 35649)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c 2011-03-20 14:49:16 UTC (rev 35650)
@@ -79,7 +79,7 @@
}
*/
-void BM_SubClass(BMesh *bm, BMLayerType *type)
+void BM_SubClass(BMesh *UNUSED(bm), BMLayerType *UNUSED(type))
{
}
@@ -173,7 +173,6 @@
static BMLoop *bmesh_create_loop(BMesh *bm, BMVert *v, BMEdge *e, BMFace *f, BMLoop *example){
BMLoop *l=NULL;
- int i;
l = BLI_mempool_calloc(bm->lpool);
l->next = l->prev = NULL;
@@ -191,7 +190,7 @@
if (bm->slpool)
l->head.layerdata = BLI_mempool_calloc(bm->slpool);
- inherit_loop(bm, l, f);
+ inherit_loop(bm, (BMBaseLoop *)l, (BMBaseFace *)f);
if(example)
CustomData_bmesh_copy_data(&bm->ldata, &bm->ldata, example->head.data, &l->head.data);
@@ -203,7 +202,7 @@
BMLoop *BM_Add_FaceBoundary(BMesh *bm, BMFace *f, BMVert *startv, BMEdge *starte) {
BMBaseLoopList *lst = BLI_mempool_calloc(bm->looplistpool);
- BMLoop *l = (BMLoop*)bmesh_create_loop(bm, startv, starte, (BMBaseFace*)f, NULL);
+ BMLoop *l = (BMLoop*)bmesh_create_loop(bm, startv, starte, f, NULL);
int i;
bmesh_radial_append(starte, l);
@@ -245,7 +244,7 @@
startl->v = (BMBaseVert*) verts[0];
startl->e = (BMBaseEdge*) edges[0];
for (i=1; i<len; i++) {
- l = bmesh_create_loop(bm, verts[i], edges[i], f, edges[i]->l);
+ l = (BMBaseLoop *)bmesh_create_loop(bm, verts[i], edges[i], (BMFace *)f, edges[i]->l);
if (bm->baselevel >= LAYER_ADJ) {
BMLoop *bl = (BMLoop*)l;
@@ -287,7 +286,7 @@
return (BMFace*) f;
}
-int bmesh_check_element(BMesh *bm, void *element, int type) {
+int bmesh_check_element(BMesh *UNUSED(bm), void *element, int type) {
BMHeader *head = element;
int err = 0;
@@ -440,7 +439,7 @@
lnext = l->next;
if (bm->baselevel >= LAYER_ADJ)
- bmesh_radial_remove_loop((BMLoop*)l, l->e);
+ bmesh_radial_remove_loop((BMLoop*)l, (BMEdge *)l->e);
bmesh_kill_loop(bm, (BMLoop*)l);
l = lnext;
@@ -633,7 +632,7 @@
return bmesh_loop_reverse_loop(bm, f, f->loops.first);
}
-void bmesh_systag_elements(BMesh *bm, void *veles, int tot, int flag)
+void bmesh_systag_elements(BMesh *UNUSED(bm), void *veles, int tot, int flag)
{
BMHeader **eles = veles;
int i;
@@ -643,7 +642,7 @@
}
}
-void bmesh_clear_systag_elements(BMesh *bm, void *veles, int tot, int flag)
+void bmesh_clear_systag_elements(BMesh *UNUSED(bm), void *veles, int tot, int flag)
{
BMHeader **eles = veles;
int i;
@@ -741,7 +740,7 @@
BLI_array_staticdeclare(delverts, 64);
BMVert *v1=NULL, *v2=NULL;
ListBase holes = {NULL, NULL};
- char *err = NULL;
+ const char *err = NULL;
int i, tote=0;
if (!totface) {
@@ -885,7 +884,7 @@
return NULL;
}
-static BMFace *bmesh_addpolylist(BMesh *bm, BMFace *example) {
+static BMFace *bmesh_addpolylist(BMesh *bm, BMFace *UNUSED(example)) {
BMBaseFace *f;
BMBaseLoopList *lst;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c 2011-03-20 14:07:16 UTC (rev 35649)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c 2011-03-20 14:49:16 UTC (rev 35650)
@@ -57,7 +57,7 @@
*
*/
-void BMO_push(BMesh *bm, BMOperator *op)
+void BMO_push(BMesh *bm, BMOperator *UNUSED(op))
{
bm->stackdepth++;
@@ -148,7 +148,7 @@
*
*/
-void BMO_Finish_Op(BMesh *bm, BMOperator *op)
+void BMO_Finish_Op(BMesh *UNUSED(bm), BMOperator *op)
{
BMOpSlot *slot;
int i;
@@ -220,7 +220,7 @@
}
BLI_ghashIterator_init(&it, source_slot->data.ghash);
- for (;srcmap=BLI_ghashIterator_getValue(&it);
+ for (; (srcmap=BLI_ghashIterator_getValue(&it));
BLI_ghashIterator_step(&it))
{
dstmap = BLI_memarena_alloc(dest_op->arena,
@@ -278,7 +278,7 @@
if (size == 4) {
memcpy(slot->data.p, mat, sizeof(float)*4*4);
} else if (size == 3) {
- copy_m4_m3(slot->data.p, mat);
+ copy_m4_m3(slot->data.p, (float (*)[3])mat);
} else {
printf("yeek! invalid size in BMO_Set_Mat!\n");
@@ -397,7 +397,7 @@
return count;
}
-void BMO_Clear_Flag_All(BMesh *bm, BMOperator *op, int type, int flag) {
+void BMO_Clear_Flag_All(BMesh *bm, BMOperator *UNUSED(op), int type, int flag) {
BMIter iter;
BMHeader *ele;
int i=0, types[3] = {BM_VERTS_OF_MESH, BM_EDGES_OF_MESH, BM_FACES_OF_MESH};
@@ -416,7 +416,7 @@
}
}
-int BMO_CountSlotBuf(struct BMesh *bm, struct BMOperator *op, const char *slotname)
+int BMO_CountSlotBuf(struct BMesh *UNUSED(bm), struct BMOperator *op, const char *slotname)
{
BMOpSlot *slot = BMO_GetSlot(op, slotname);
@@ -427,7 +427,7 @@
return slot->len;
}
-int BMO_CountSlotMap(BMesh *bm, BMOperator *op, const char *slotname)
+int BMO_CountSlotMap(BMesh *UNUSED(bm), BMOperator *op, const char *slotname)
{
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list