blender
/
blender
131
398
Fork 577
Code Issues 6.3k Pull Requests 738 Projects 19 Wiki Activity

Cleanup: shadow warning, style

This commit is contained in:
Campbell Barton 2019-01-21 10:04:09 +11:00
parent eff4b68a6f
commit 49208a3419
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/gpencil.c
View File

@ -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--;
}

2
source/blender/bmesh/operators/bmo_bevel.c
View File

@ -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);

4
source/blender/bmesh/tools/bmesh_bevel.c
View File

@ -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;