From 0526fcf13f6a05aa1a5b32549f566e8c15c47d5e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 3 Dec 2012 08:11:04 +0000 Subject: [PATCH] revert part of r52720, Id rather leave these as-is, even if they give warnings under some configurations. --- .../blenkernel/intern/editderivedmesh.c | 2 +- source/blender/bmesh/operators/bmo_extrude.c | 4 +-- .../blender/bmesh/operators/bmo_symmetrize.c | 1 - source/blender/bmesh/operators/bmo_utils.c | 32 +++++++++---------- source/blender/bmesh/tools/bmesh_bevel.c | 3 -- .../bmesh/tools/bmesh_decimate_collapse.c | 1 - .../editors/transform/transform_conversions.c | 4 +-- 7 files changed, 21 insertions(+), 26 deletions(-) diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index d7b29a262a0..321a61ce238 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -189,7 +189,7 @@ static void BMEdit_RecalcTessellation_intern(BMEditMesh *tm) #endif /* USE_TESSFACE_SPEEDUP */ else { - ScanFillVert *sf_vert = NULL, *sf_vert_last = NULL, *sf_vert_first = NULL; + ScanFillVert *sf_vert, *sf_vert_last = NULL, *sf_vert_first = NULL; /* ScanFillEdge *e; */ /* UNUSED */ ScanFillFace *sf_tri; int totfilltri; diff --git a/source/blender/bmesh/operators/bmo_extrude.c b/source/blender/bmesh/operators/bmo_extrude.c index 45c937d8bba..065a1b57737 100644 --- a/source/blender/bmesh/operators/bmo_extrude.c +++ b/source/blender/bmesh/operators/bmo_extrude.c @@ -55,8 +55,8 @@ void bmo_extrude_discrete_faces_exec(BMesh *bm, BMOperator *op) BMIter liter, liter2; BMFace *f, *f2, *f3; BMLoop *l, *l2, *l3, *l4, *l_tmp; - BMEdge **edges = NULL, *e, *laste = NULL; - BMVert *v = NULL, *lastv, *firstv; + BMEdge **edges = NULL, *e, *laste; + BMVert *v, *lastv, *firstv; BLI_array_declare(edges); int i; diff --git a/source/blender/bmesh/operators/bmo_symmetrize.c b/source/blender/bmesh/operators/bmo_symmetrize.c index ee0717d177b..248c7268ac6 100644 --- a/source/blender/bmesh/operators/bmo_symmetrize.c +++ b/source/blender/bmesh/operators/bmo_symmetrize.c @@ -178,7 +178,6 @@ static void symm_split_asymmetric_edges(Symm *symm) plane_co[symm->axis][2], &lambda, TRUE); BLI_assert(r); - (void)r; madd_v3_v3v3fl(co, e->v1->co, edge_dir, lambda); co[symm->axis] = 0; diff --git a/source/blender/bmesh/operators/bmo_utils.c b/source/blender/bmesh/operators/bmo_utils.c index 34b2e96f82d..64dbf0cc0e7 100644 --- a/source/blender/bmesh/operators/bmo_utils.c +++ b/source/blender/bmesh/operators/bmo_utils.c @@ -494,10 +494,10 @@ void bmo_rotate_uvs_exec(BMesh *bm, BMOperator *op) BMO_ITER (fs, &fs_iter, op->slots_in, "faces", BM_FACE) { if (CustomData_has_layer(&(bm->ldata), CD_MLOOPUV)) { if (use_ccw == FALSE) { /* same loops direction */ - BMLoop *lf; /* current face loops */ - MLoopUV *f_luv = NULL; /* first face loop uv */ - float p_uv[2] = {0.0f, 0.0f}; /* previous uvs */ - float t_uv[2]; /* tmp uvs */ + BMLoop *lf; /* current face loops */ + MLoopUV *f_luv; /* first face loop uv */ + float p_uv[2]; /* previous uvs */ + float t_uv[2]; /* tmp uvs */ int n = 0; BM_ITER_ELEM (lf, &l_iter, fs, BM_LOOPS_OF_FACE) { @@ -518,10 +518,10 @@ void bmo_rotate_uvs_exec(BMesh *bm, BMOperator *op) copy_v2_v2(f_luv->uv, p_uv); } else { /* counter loop direction */ - BMLoop *lf; /* current face loops */ - MLoopUV *p_luv; /* previous loop uv */ - MLoopUV *luv = NULL; - float t_uv[2] = {0.0f, 0.0f}; /* current uvs */ + BMLoop *lf; /* current face loops */ + MLoopUV *p_luv; /* previous loop uv */ + MLoopUV *luv; + float t_uv[2]; /* current uvs */ int n = 0; BM_ITER_ELEM (lf, &l_iter, fs, BM_LOOPS_OF_FACE) { @@ -599,10 +599,10 @@ void bmo_rotate_colors_exec(BMesh *bm, BMOperator *op) BMO_ITER (fs, &fs_iter, op->slots_in, "faces", BM_FACE) { if (CustomData_has_layer(&(bm->ldata), CD_MLOOPCOL)) { if (use_ccw == FALSE) { /* same loops direction */ - BMLoop *lf; /* current face loops */ - MLoopCol *f_lcol = NULL; /* first face loop color */ - MLoopCol p_col; /* previous color */ - MLoopCol t_col; /* tmp color */ + BMLoop *lf; /* current face loops */ + MLoopCol *f_lcol; /* first face loop color */ + MLoopCol p_col; /* previous color */ + MLoopCol t_col; /* tmp color */ int n = 0; BM_ITER_ELEM (lf, &l_iter, fs, BM_LOOPS_OF_FACE) { @@ -623,10 +623,10 @@ void bmo_rotate_colors_exec(BMesh *bm, BMOperator *op) *f_lcol = p_col; } else { /* counter loop direction */ - BMLoop *lf; /* current face loops */ - MLoopCol *p_lcol; /* previous loop color */ - MLoopCol *lcol = NULL; - MLoopCol t_col; /* current color */ + BMLoop *lf; /* current face loops */ + MLoopCol *p_lcol; /* previous loop color */ + MLoopCol *lcol; + MLoopCol t_col; /* current color */ int n = 0; BM_ITER_ELEM (lf, &l_iter, fs, BM_LOOPS_OF_FACE) { diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index aafba124c92..874707e23d3 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -381,8 +381,6 @@ static void offset_in_two_planes(EdgeHalf *e1, EdgeHalf *e2, EdgeHalf *emid, int iret; BLI_assert(f1 != NULL && f2 != NULL); - (void)f1; - (void)f2; /* get direction vectors for two offset lines */ sub_v3_v3v3(dir1, v->co, BM_edge_other_vert(e1->e, v)->co); @@ -854,7 +852,6 @@ static void bevel_build_rings(BMesh *bm, BevVert *bv) ns = vm->seg; ns2 = ns / 2; BLI_assert(n > 2 && ns > 1); - (void)n; /* special case: two beveled edges are in line and share a face, making a "pipe" */ epipe = NULL; diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c index 35bf176518c..7c054d84405 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c +++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c @@ -703,7 +703,6 @@ static int bm_edge_collapse(BMesh *bm, BMEdge *e_clear, BMVert *v_clear, int r_e ok = BM_edge_loop_pair(e_clear, &l_a, &l_b); BLI_assert(ok == TRUE); - (void)ok; BLI_assert(l_a->f->len == 3); BLI_assert(l_b->f->len == 3); diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 9a5f32a8772..51efa2b0e40 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2367,8 +2367,8 @@ static void createTransUVs(bContext *C, TransInfo *t) BMFace *efa; BMLoop *l; BMIter iter, liter; - UvElementMap *elementmap = NULL; - char *island_enabled = NULL; + UvElementMap *elementmap; + char *island_enabled; int count = 0, countsel = 0, count_rejected = 0; int propmode = t->flag & T_PROP_EDIT; int propconnected = t->flag & T_PROP_CONNECTED;