From b93594bf3019ba3c412b7291f4a5cdfc9752dcf8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 9 May 2011 05:09:07 +0000 Subject: quiet more compiler warnings, also found a bug using printf rather then fprintf. --- source/blender/blenkernel/BKE_mesh.h | 2 +- source/blender/blenkernel/intern/DerivedMesh.c | 2 +- source/blender/blenkernel/intern/customdata.c | 2 +- source/blender/blenkernel/intern/mesh.c | 4 ++-- source/blender/blenkernel/intern/subsurf_ccg.c | 2 +- source/blender/blenlib/BLI_array.h | 8 ++++---- source/blender/bmesh/bmesh_operator_api.h | 2 +- source/blender/bmesh/intern/bmesh_mesh.c | 4 ++-- source/blender/bmesh/intern/bmesh_operators.c | 6 +++--- source/blender/bmesh/intern/bmesh_walkers.c | 2 +- source/blender/bmesh/operators/createops.c | 2 +- source/blender/editors/include/ED_mesh.h | 2 +- source/blender/editors/mesh/bmesh_tools.c | 5 ++++- source/blender/makesrna/intern/rna_mesh_api.c | 2 +- source/blender/modifiers/intern/MOD_bevel.c | 2 +- source/blender/modifiers/intern/MOD_displace.c | 2 +- source/blender/modifiers/intern/MOD_meshdeform.c | 2 +- source/blender/modifiers/intern/MOD_ngoninterp.c | 2 +- source/blender/modifiers/intern/MOD_particleinstance.c | 2 +- source/blender/modifiers/intern/MOD_screw.c | 2 +- source/blender/modifiers/intern/MOD_shapekey.c | 4 ++-- source/blender/modifiers/intern/MOD_shrinkwrap.c | 2 +- source/blender/modifiers/intern/MOD_simpledeform.c | 2 +- source/blender/modifiers/intern/MOD_smooth.c | 2 +- source/blender/modifiers/intern/MOD_subsurf.c | 2 +- source/blender/modifiers/intern/MOD_uvproject.c | 2 +- source/blender/modifiers/intern/MOD_wave.c | 2 +- 27 files changed, 38 insertions(+), 35 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 44d1f9f1427..93455f03a9e 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -118,7 +118,7 @@ void mesh_calc_tessface_normals(struct MVert *mverts, int numVerts,struct MFace differences we care about. should be usable with leaf's testing framework I get RNA work done, will use hackish testing code for now.*/ -char *mesh_cmp(struct Mesh *me1, struct Mesh *me2, float thresh); +const char *mesh_cmp(struct Mesh *me1, struct Mesh *me2, float thresh); struct BoundBox *mesh_get_bb(struct Object *ob); void mesh_get_texspace(struct Mesh *me, float *loc_r, float *rot_r, float *size_r); diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index a8617773658..d285b718c6a 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1048,7 +1048,7 @@ static void add_shapekey_layers(DerivedMesh *dm, Mesh *me, Object *ob) } for (b=0; btotelem; b++, cos++) { - copy_v3_v3(cos, ((float*)kb->data)+b*3); + copy_v3_v3((float *)cos, ((float*)kb->data)+b*3); } } } diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index bf7b67486bf..48db92d367d 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -867,7 +867,7 @@ static void layerInterp_bweight(void **sources, float *weights, float *sub_weights, int count, void *dest) { float *f = dest, *src; - float **in = sources; + float **in = (float **)sources; int i; if(count <= 0) return; diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 1c1e6ffe067..86559636f26 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -98,7 +98,7 @@ enum { MESHCMP_CDLAYERS_MISMATCH, }; -static char *cmpcode_to_str(int code) +static const char *cmpcode_to_str(int code) { switch (code) { case MESHCMP_DVERT_WEIGHTMISMATCH: @@ -276,7 +276,7 @@ int customdata_compare(CustomData *c1, CustomData *c2, Mesh *m1, Mesh *m2, float } /*used for testing. returns an error string the two meshes don't match*/ -char *mesh_cmp(Mesh *me1, Mesh *me2, float thresh) +const char *mesh_cmp(Mesh *me1, Mesh *me2, float thresh) { int c; diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 5b7884a4f98..903bd317baa 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -1179,7 +1179,7 @@ DMFaceIter *cgdm_newFaceIter(DerivedMesh *dm) fiter->head.step(fiter); - return fiter; + return (DMFaceIter *)fiter; } static void ccgDM_copyFinalFaceArray(DerivedMesh *dm, MFace *mface) diff --git a/source/blender/blenlib/BLI_array.h b/source/blender/blenlib/BLI_array.h index bc8a1222ba6..8d502a97f06 100644 --- a/source/blender/blenlib/BLI_array.h +++ b/source/blender/blenlib/BLI_array.h @@ -64,7 +64,7 @@ behaviour, though it may not be the best in practice. /*this returns the entire size of the array, including any buffering.*/ #define BLI_array_totalsize_dyn(arr) ((arr)==NULL ? 0 : MEM_allocN_len(arr) / sizeof(*arr)) -#define BLI_array_totalsize(arr) ((signed int)((arr == _##arr##_static && arr != NULL) ? (sizeof(_##arr##_static) / sizeof(*arr)) : BLI_array_totalsize_dyn(arr))) +#define BLI_array_totalsize(arr) ((signed int)(((void *)(arr) == (void *)_##arr##_static && (void *)(arr) != NULL) ? (sizeof(_##arr##_static) / sizeof(*arr)) : BLI_array_totalsize_dyn(arr))) /*this returns the logical size of the array, not including buffering.*/ #define BLI_array_count(arr) _##arr##_count @@ -74,12 +74,12 @@ behaviour, though it may not be the best in practice. BLI_array_totalsize(arr) > _##arr##_count ? ++_##arr##_count : \ ((_##arr##_tmp = MEM_callocN(sizeof(*arr)*(_##arr##_count*2+2), #arr " " __FILE__ " ")),\ (arr && memcpy(_##arr##_tmp, arr, sizeof(*arr) * _##arr##_count)),\ - (arr && (arr != (void*)_##arr##_static ? (MEM_freeN(arr), arr) : arr)),\ + (arr && ((void *)(arr) != (void*)_##arr##_static ? (MEM_freeN(arr), arr) : arr)),\ (arr = _##arr##_tmp),\ _##arr##_count++) /*returns length of array*/ -#define BLI_array_growone(arr) (arr==NULL && _##arr##_static != NULL ? ((arr=(void*)_##arr##_static), ++_##arr##_count) : _BLI_array_growone(arr)) +#define BLI_array_growone(arr) ((void *)(arr)==NULL && (void *)(_##arr##_static) != NULL ? ((arr=(void*)_##arr##_static), ++_##arr##_count) : _BLI_array_growone(arr)) /*appends an item to the array and returns a pointer to the item in the array. item is not a pointer, but actual data value.*/ @@ -87,7 +87,7 @@ behaviour, though it may not be the best in practice. /*grow an array by a specified number of items.*/ #define BLI_array_growitems(arr, num) {int _i; for (_i=0; _i<(num); _i++) {BLI_array_growone(arr);}} -#define BLI_array_free(arr) if (arr && arr != _##arr##_static) MEM_freeN(arr) +#define BLI_array_free(arr) if (arr && (char *)arr != _##arr##_static) MEM_freeN(arr) #define BLI_array_pop(arr) ((arr&&_##arr##_count) ? arr[--_##arr##_count] : 0) /*resets the logical size of an array to zero, but doesn't diff --git a/source/blender/bmesh/bmesh_operator_api.h b/source/blender/bmesh/bmesh_operator_api.h index 770bca7e886..57bcd2eb69c 100644 --- a/source/blender/bmesh/bmesh_operator_api.h +++ b/source/blender/bmesh/bmesh_operator_api.h @@ -356,7 +356,7 @@ typedef struct BMOIter { int cur; //for arrays struct GHashIterator giter; void *val; - int restrict; + int restrictmask; } BMOIter; void *BMO_FirstElem(BMOperator *op, const char *slotname); diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index f9444abf206..3180ac4c8de 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -345,7 +345,7 @@ void bmesh_set_mdisps_space(BMesh *bm, int from, int to) MDisps *mdisps; BMFace *f; BMIter iter; - int i; + // int i= 0; // UNUSED multires_set_space(dm, ob, from, to); @@ -372,7 +372,7 @@ void bmesh_set_mdisps_space(BMesh *bm, int from, int to) } mdisps++; - i += 1; + // i += 1; } } diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c index 699e6f96e22..04b8a81ad49 100644 --- a/source/blender/bmesh/intern/bmesh_operators.c +++ b/source/blender/bmesh/intern/bmesh_operators.c @@ -895,7 +895,7 @@ void *BMO_FirstElem(BMOperator *op, const char *slotname) } void *BMO_IterNew(BMOIter *iter, BMesh *UNUSED(bm), BMOperator *op, - const char *slotname, int restrict) + const char *slotname, int restrictmask) { BMOpSlot *slot = BMO_GetSlot(op, slotname); @@ -903,7 +903,7 @@ void *BMO_IterNew(BMOIter *iter, BMesh *UNUSED(bm), BMOperator *op, iter->slot = slot; iter->cur = 0; - iter->restrict = restrict; + iter->restrictmask = restrictmask; if (iter->slot->slottype == BMOP_OPSLOT_MAPPING) { if (iter->slot->data.ghash) @@ -922,7 +922,7 @@ void *BMO_IterStep(BMOIter *iter) if (iter->cur >= iter->slot->len) return NULL; h = ((void**)iter->slot->data.buf)[iter->cur++]; - while (!(iter->restrict & h->type)) { + while (!(iter->restrictmask & h->type)) { if (iter->cur >= iter->slot->len) return NULL; h = ((void**)iter->slot->data.buf)[iter->cur++]; } diff --git a/source/blender/bmesh/intern/bmesh_walkers.c b/source/blender/bmesh/intern/bmesh_walkers.c index b6dc26fb6a9..09b6fba80a9 100644 --- a/source/blender/bmesh/intern/bmesh_walkers.c +++ b/source/blender/bmesh/intern/bmesh_walkers.c @@ -101,7 +101,7 @@ void BMW_Init(BMWalker *walker, BMesh *bm, int type, int searchmask, int flag) if (type >= BMW_MAXWALKERS || type < 0) { bmesh_error(); - printf(stderr, "Invalid walker type in BMW_Init; type: %d, searchmask: %d, flag: %d\n", type, searchmask, flag); + fprintf(stderr, "Invalid walker type in BMW_Init; type: %d, searchmask: %d, flag: %d\n", type, searchmask, flag); } if (type != BMW_CUSTOM) { diff --git a/source/blender/bmesh/operators/createops.c b/source/blender/bmesh/operators/createops.c index 6ad85d7d439..1cba72b797e 100644 --- a/source/blender/bmesh/operators/createops.c +++ b/source/blender/bmesh/operators/createops.c @@ -116,7 +116,7 @@ void rotsys_remove_edge(struct BMEdge *e, struct BMVert *v, } if (vd->e == e) - vd->e = e!=e1->next ? (BMEdge*)e1->next : NULL; + vd->e = (e != (BMEdge *)e1->next) ? (BMEdge*)e1->next : NULL; e1->next = e1->prev = NULL; } diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index adbaa419684..df5201b3f3d 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -75,7 +75,7 @@ struct Material; struct Object; struct rcti; struct wmOperator; -struct ToolSeetings; +struct ToolSettings; // edge and face flag both #define EM_FGON 2 diff --git a/source/blender/editors/mesh/bmesh_tools.c b/source/blender/editors/mesh/bmesh_tools.c index 93b4fabe80f..7791ddb38af 100644 --- a/source/blender/editors/mesh/bmesh_tools.c +++ b/source/blender/editors/mesh/bmesh_tools.c @@ -4499,6 +4499,7 @@ static void xsortvert_flag__doSetX(void *userData, EditVert *UNUSED(eve), int x, /* all verts with (flag & 'flag') are sorted */ static void xsortvert_flag(bContext *UNUSED(C), int UNUSED(flag)) { + /*BMESH_TODO*/ #if 0 //hrm, geometry isn't in linked lists anymore. . . ViewContext vc; BMEditMesh *em; @@ -4627,7 +4628,9 @@ static int mesh_vertices_randomize_exec(bContext *C, wmOperator *UNUSED(op)) { Object *obedit= CTX_data_edit_object(C); BMEditMesh *em= ((Mesh *)obedit->data)->edit_btmesh; - //hashvert_flag(em, SELECT); +#if 0 /*BMESH TODO*/ + hashvert_flag(em, SELECT); +#endif return OPERATOR_FINISHED; } diff --git a/source/blender/makesrna/intern/rna_mesh_api.c b/source/blender/makesrna/intern/rna_mesh_api.c index 8912a576710..d237664df0f 100644 --- a/source/blender/makesrna/intern/rna_mesh_api.c +++ b/source/blender/makesrna/intern/rna_mesh_api.c @@ -44,7 +44,7 @@ #ifdef RNA_RUNTIME const char *rna_Mesh_unit_test_compare(struct Mesh *mesh, bContext *C, struct Mesh *mesh2) { - char *ret = mesh_cmp(mesh, mesh2, FLT_EPSILON*60); + const char *ret = mesh_cmp(mesh, mesh2, FLT_EPSILON*60); if (!ret) ret = "Same"; diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index b952e92de4e..dfd88eef57d 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -120,7 +120,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob), } static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, - EditMesh *UNUSED(editData), + struct BMEditMesh *UNUSED(editData), DerivedMesh *derivedData) { return applyModifier(md, ob, derivedData, 0, 1); diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index 1f111aca48a..17e7940c1ee 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -255,7 +255,7 @@ static void deformVerts(ModifierData *md, Object *ob, } static void deformVertsEM( - ModifierData *md, Object *ob, struct EditMesh *editData, + ModifierData *md, Object *ob, struct BMEditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) { DerivedMesh *dm= get_cddm(ob, editData, derivedData, vertexCos); diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index 890121fdd44..48799510ad9 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -364,7 +364,7 @@ static void deformVerts(ModifierData *md, Object *ob, } static void deformVertsEM(ModifierData *md, Object *ob, - struct EditMesh *UNUSED(editData), + struct BMEditMesh *UNUSED(editData), DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) diff --git a/source/blender/modifiers/intern/MOD_ngoninterp.c b/source/blender/modifiers/intern/MOD_ngoninterp.c index c3b5382910d..930980ba8c7 100644 --- a/source/blender/modifiers/intern/MOD_ngoninterp.c +++ b/source/blender/modifiers/intern/MOD_ngoninterp.c @@ -71,7 +71,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, int UNUSED(useRenderParams), int UNUSED(isFinalCalc)) { - NgonInterpModifierData *nmd= (MaskModifierData *)md; + NgonInterpModifierData *nmd= (NgonInterpModifierData *)md; DerivedMesh *dm= derivedData, *result= NULL; DerivedMesh *cddm, *dummy; MFace *mf; diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index a2aa0e47e54..8077f20d40a 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -321,7 +321,7 @@ static DerivedMesh * applyModifier(ModifierData *md, Object *ob, return dm; } static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, - struct EditMesh *UNUSED(editData), + struct BMEditMesh *UNUSED(editData), DerivedMesh *derivedData) { return applyModifier(md, ob, derivedData, 0, 1); diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index db7482b79ee..49753aeb7e9 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -868,7 +868,7 @@ static void foreachObjectLink( static DerivedMesh *applyModifierEM( ModifierData *md, Object *ob, - struct EditMesh *UNUSED(editData), + struct BMEditMesh *UNUSED(editData), DerivedMesh *derivedData) { return applyModifier(md, ob, derivedData, 0, 1); diff --git a/source/blender/modifiers/intern/MOD_shapekey.c b/source/blender/modifiers/intern/MOD_shapekey.c index 94d23de6573..254814feb37 100644 --- a/source/blender/modifiers/intern/MOD_shapekey.c +++ b/source/blender/modifiers/intern/MOD_shapekey.c @@ -92,7 +92,7 @@ static void deformMatrices(ModifierData *md, Object *ob, DerivedMesh *derivedDat } static void deformVertsEM(ModifierData *md, Object *ob, - struct EditMesh *UNUSED(editData), + struct BMEditMesh *UNUSED(editData), DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) @@ -104,7 +104,7 @@ static void deformVertsEM(ModifierData *md, Object *ob, } static void deformMatricesEM(ModifierData *UNUSED(md), Object *ob, - struct EditMesh *UNUSED(editData), + struct BMEditMesh *UNUSED(editData), DerivedMesh *UNUSED(derivedData), float (*vertexCos)[3], float (*defMats)[3][3], diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c index e1fc4bc969f..bbb426b83b1 100644 --- a/source/blender/modifiers/intern/MOD_shrinkwrap.c +++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c @@ -130,7 +130,7 @@ static void deformVerts(ModifierData *md, Object *ob, dm->release(dm); } -static void deformVertsEM(ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) +static void deformVertsEM(ModifierData *md, Object *ob, struct BMEditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) { DerivedMesh *dm = derivedData; CustomDataMask dataMask = requiredDataMask(ob, md); diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c index ea4771b679a..dcc7f6f629f 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.c +++ b/source/blender/modifiers/intern/MOD_simpledeform.c @@ -348,7 +348,7 @@ static void deformVerts(ModifierData *md, Object *ob, } static void deformVertsEM(ModifierData *md, Object *ob, - struct EditMesh *editData, + struct BMEditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) diff --git a/source/blender/modifiers/intern/MOD_smooth.c b/source/blender/modifiers/intern/MOD_smooth.c index 5f76fad14b1..9e316fc2fae 100644 --- a/source/blender/modifiers/intern/MOD_smooth.c +++ b/source/blender/modifiers/intern/MOD_smooth.c @@ -236,7 +236,7 @@ static void deformVerts( } static void deformVertsEM( - ModifierData *md, Object *ob, struct EditMesh *editData, + ModifierData *md, Object *ob, struct BMEditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) { DerivedMesh *dm= get_dm(ob, editData, derivedData, NULL, 0); diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index fa3d8ae9a33..48865d3ed5f 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.c +++ b/source/blender/modifiers/intern/MOD_subsurf.c @@ -112,7 +112,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob), } static DerivedMesh *applyModifierEM(ModifierData *md, Object *UNUSED(ob), - struct EditMesh *UNUSED(editData), + struct BMEditMesh *UNUSED(editData), DerivedMesh *derivedData) { SubsurfModifierData *smd = (SubsurfModifierData*) md; diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index a6ff728af37..6be1002bb00 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -399,7 +399,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, } static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, - struct EditMesh *UNUSED(editData), + struct BMEditMesh *UNUSED(editData), DerivedMesh *derivedData) { return applyModifier(md, ob, derivedData, 0, 1); diff --git a/source/blender/modifiers/intern/MOD_wave.c b/source/blender/modifiers/intern/MOD_wave.c index 11cf159edc9..edff3ba7599 100644 --- a/source/blender/modifiers/intern/MOD_wave.c +++ b/source/blender/modifiers/intern/MOD_wave.c @@ -429,7 +429,7 @@ static void deformVerts(ModifierData *md, Object *ob, } static void deformVertsEM( - ModifierData *md, Object *ob, struct EditMesh *editData, + ModifierData *md, Object *ob, struct BMEditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) { DerivedMesh *dm= derivedData; -- cgit v1.2.3