diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-03-05 01:16:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-03-05 01:16:12 +0300 |
| commit | 4e500101a7dd3ea578ca6d6f101c0d9ece7f5abc (patch) | |
| tree | b84e5af642e8f702c2bc34a26155a49284fbda9b /source/blender/bmesh/operators/bmo_primitive.c | |
| parent | fea07c1a63fdfe3bf25d77d862e83bdf024347b8 (diff) | |
Cleanup: quiet -Wcomma, cast to void where needed
Diffstat (limited to 'source/blender/bmesh/operators/bmo_primitive.c')
| -rw-r--r-- | source/blender/bmesh/operators/bmo_primitive.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/bmesh/operators/bmo_primitive.c b/source/blender/bmesh/operators/bmo_primitive.c index 0935e0acb45..fcf02c4bc3f 100644 --- a/source/blender/bmesh/operators/bmo_primitive.c +++ b/source/blender/bmesh/operators/bmo_primitive.c @@ -635,7 +635,6 @@ void BM_mesh_calc_uvs_sphere(BMesh *bm, const short oflag) void bmo_create_monkey_exec(BMesh *bm, BMOperator *op) { - BMVert *eve; BMVert **tv = MEM_mallocN(sizeof(*tv) * monkeynv * 2, "tv"); float mat[4][4]; int i; @@ -653,9 +652,14 @@ void bmo_create_monkey_exec(BMesh *bm, BMOperator *op) tv[i] = BM_vert_create(bm, v, NULL, BM_CREATE_NOP); BMO_elem_flag_enable(bm, tv[i], VERT_MARK); - tv[monkeynv + i] = (fabsf(v[0] = -v[0]) < 0.001f) ? - tv[i] : - (eve = BM_vert_create(bm, v, NULL, BM_CREATE_NOP), mul_m4_v3(mat, eve->co), eve); + if (fabsf(v[0] = -v[0]) < 0.001f) { + tv[monkeynv + i] = tv[i]; + } + else { + BMVert *eve = BM_vert_create(bm, v, NULL, BM_CREATE_NOP); + mul_m4_v3(mat, eve->co); + tv[monkeynv + i] = eve; + } BMO_elem_flag_enable(bm, tv[monkeynv + i], VERT_MARK); |