diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-21 02:04:09 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-21 02:05:58 +0300 |
| commit | 49208a3419248087fc8e944f961d60c6dcdae3d4 (patch) | |
| tree | 566a7aec9c5899a01e0bd04e39d6188ba39d91c3 /source | |
| parent | eff4b68a6f10edc6edbc09ec36f66d15c9e0e571 (diff) | |
Cleanup: shadow warning, style
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/gpencil.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_bevel.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index ae386d24309..3d1208b43de 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -1212,7 +1212,7 @@ void BKE_gpencil_vgroup_remove(Object *ob, bDeformGroup *defgroup) else { /* reorganize weights in other strokes */ for (int g = 0; g < gps->dvert->totweight; g++) { - MDeformWeight *dw = &dvert->dw[g]; + dw = &dvert->dw[g]; if ((dw != NULL) && (dw->def_nr > def_nr)) { dw->def_nr--; } diff --git a/source/blender/bmesh/operators/bmo_bevel.c b/source/blender/bmesh/operators/bmo_bevel.c index 853d11aade6..cebb3929f75 100644 --- a/source/blender/bmesh/operators/bmo_bevel.c +++ b/source/blender/bmesh/operators/bmo_bevel.c @@ -77,7 +77,7 @@ void bmo_bevel_exec(BMesh *bm, BMOperator *op) BM_mesh_bevel( bm, offset, offset_type, seg, profile, vonly, false, clamp_overlap, NULL, -1, material, loop_slide, mark_seam, mark_sharp, harden_normals, face_strength_mode, - miter_outer, miter_inner, spread, smoothresh); + miter_outer, miter_inner, spread, smoothresh); BMO_slot_buffer_from_enabled_hflag(bm, op, op->slots_out, "faces.out", BM_FACE, BM_ELEM_TAG); BMO_slot_buffer_from_enabled_hflag(bm, op, op->slots_out, "edges.out", BM_EDGE, BM_ELEM_TAG); diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 043a40a9568..e4de1b1d80e 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -2379,7 +2379,7 @@ static void build_boundary(BevelParams *bp, BevVert *bv, bool construct) } ang_kind = edges_angle_kind(e, e2, bv->v); if ((miter_outer != BEVEL_MITER_SHARP && !emiter && ang_kind == 1) || - (miter_inner != BEVEL_MITER_SHARP && ang_kind == -1)) + (miter_inner != BEVEL_MITER_SHARP && ang_kind == -1)) { if (ang_kind == 1) emiter = e; /* a reflex angle, i.e., the (only) outer miter, if any */ @@ -2431,7 +2431,7 @@ static void build_boundary(BevelParams *bp, BevVert *bv, bool construct) else { ang_kind = edges_angle_kind(e, e2, bv->v); if ((miter_outer != BEVEL_MITER_SHARP && !emiter && ang_kind == 1) || - (miter_inner != BEVEL_MITER_SHARP && ang_kind == -1)) + (miter_inner != BEVEL_MITER_SHARP && ang_kind == -1)) { if (ang_kind == 1) emiter = e; |