diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-06 16:51:17 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-06 16:51:17 +0400 |
| commit | 3882f7cde740ee0fd74b0da3ef7f6044d894df71 (patch) | |
| tree | c82afd5d7a0cb445152bdab0b01761bdfb9d1bc9 /source/blender/bmesh | |
| parent | 91c2aa7b95a7681ec839c5f8fd91a89980bab99f (diff) | |
quiet some warnings and fix build error with strict casting rules.
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_marking.c | 7 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_mesh_conv.c | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_mirror.c | 5 |
3 files changed, 10 insertions, 6 deletions
diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c index ab1b57a5999..7f221381e93 100644 --- a/source/blender/bmesh/intern/bmesh_marking.c +++ b/source/blender/bmesh/intern/bmesh_marking.c @@ -312,7 +312,9 @@ void BM_edge_select_set(BMesh *bm, BMEdge *e, int select) } } - if (deselect) BM_vert_select_set(bm, verts[i], FALSE); + if (deselect) { + BM_vert_select_set(bm, verts[i], FALSE); + } } } else { @@ -366,8 +368,7 @@ void BM_face_select_set(BMesh *bm, BMFace *f, int select) break; } - if (!f2) - { + if (!f2) { BM_elem_select_set(bm, l->e, FALSE); } } diff --git a/source/blender/bmesh/operators/bmo_mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c index 63d8e3b65c3..ac8f7fc33ec 100644 --- a/source/blender/bmesh/operators/bmo_mesh_conv.c +++ b/source/blender/bmesh/operators/bmo_mesh_conv.c @@ -151,7 +151,9 @@ void bmo_mesh_to_bmesh_exec(BMesh *bm, BMOperator *op) v->head.hflag = BM_vert_flag_from_mflag(mvert->flag); /* this is necessary for selection counts to work properl */ - if (BM_elem_flag_test(v, BM_ELEM_SELECT)) BM_vert_select_set(bm, v, TRUE); + if (BM_elem_flag_test(v, BM_ELEM_SELECT)) { + BM_vert_select_set(bm, v, TRUE); + } normal_short_to_float_v3(v->no, mvert->no); diff --git a/source/blender/bmesh/operators/bmo_mirror.c b/source/blender/bmesh/operators/bmo_mirror.c index 30704e16a92..c21e7a26f4d 100644 --- a/source/blender/bmesh/operators/bmo_mirror.c +++ b/source/blender/bmesh/operators/bmo_mirror.c @@ -47,12 +47,13 @@ void bmo_mirror_exec(BMesh *bm, BMOperator *op) float imtx[4][4]; float scale[3] = {1.0f, 1.0f, 1.0f}; float dist = BMO_slot_float_get(op, "mergedist"); - int i, ototvert, ototedge, axis = BMO_slot_int_get(op, "axis"); + int i, ototvert /*, ototedge */; + int axis = BMO_slot_int_get(op, "axis"); int mirroru = BMO_slot_bool_get(op, "mirror_u"); int mirrorv = BMO_slot_bool_get(op, "mirror_v"); ototvert = bm->totvert; - ototedge = bm->totedge; + /* ototedge = bm->totedge; */ /* UNUSED */ BMO_slot_mat4_get(op, "mat", mtx); invert_m4_m4(imtx, mtx); |