diff options
author | Howard Trickey <howard.trickey@gmail.com> | 2019-01-18 20:54:10 +0300 |
---|---|---|
committer | Howard Trickey <howard.trickey@gmail.com> | 2019-01-18 20:54:10 +0300 |
commit | b640fd829e3a228561e4d9dba9c830ae22d3ebc7 (patch) | |
tree | 431a203d22e26bb816ccc6e3990c54fc41bd3bbd /source/blender/bmesh/operators | |
parent | c9938ebb0064675a17c92e8112fc4d416bba5f7c (diff) |
Add miter pattern options.
Will document the new options in release notes, then in manual.
Still a bit of work to do on the bulging shape that appears
on cube corners if using arc inner miters, but will do that later.
Also need to do something smarter in clamp overlap.
Diffstat (limited to 'source/blender/bmesh/operators')
-rw-r--r-- | source/blender/bmesh/operators/bmo_bevel.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/bmesh/operators/bmo_bevel.c b/source/blender/bmesh/operators/bmo_bevel.c index 3277824b890..853d11aade6 100644 --- a/source/blender/bmesh/operators/bmo_bevel.c +++ b/source/blender/bmesh/operators/bmo_bevel.c @@ -43,10 +43,13 @@ void bmo_bevel_exec(BMesh *bm, BMOperator *op) const bool clamp_overlap = BMO_slot_bool_get(op->slots_in, "clamp_overlap"); const int material = BMO_slot_int_get(op->slots_in, "material"); const bool loop_slide = BMO_slot_bool_get(op->slots_in, "loop_slide"); - const bool mark_seam = BMO_slot_bool_get(op->slots_in, "mark_seam"); - const bool mark_sharp = BMO_slot_bool_get(op->slots_in, "mark_sharp"); + const bool mark_seam = BMO_slot_bool_get(op->slots_in, "mark_seam"); + const bool mark_sharp = BMO_slot_bool_get(op->slots_in, "mark_sharp"); const bool harden_normals = BMO_slot_bool_get(op->slots_in, "harden_normals"); const int face_strength_mode = BMO_slot_int_get(op->slots_in, "face_strength_mode"); + const int miter_outer = BMO_slot_int_get(op->slots_in, "miter_outer"); + const int miter_inner = BMO_slot_int_get(op->slots_in, "miter_inner"); + const float spread = BMO_slot_float_get(op->slots_in, "spread"); const float smoothresh = BMO_slot_float_get(op->slots_in, "smoothresh"); if (offset > 0) { @@ -73,7 +76,8 @@ 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, smoothresh); + loop_slide, mark_seam, mark_sharp, harden_normals, face_strength_mode, + 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); |