diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-10 11:58:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-10 11:58:05 +0300 |
| commit | 2b56faebe5f2a8e2b37004485206007d22cdac1d (patch) | |
| tree | f96042f4c8f9b9c06b3b9f694d207f1bc62a5a5c /source/blender/bmesh | |
| parent | 5ff33ecdf0ed319db2e589926a614f67738531a6 (diff) | |
| parent | 18f53d8822518928baceab1407eac195ab9bf817 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index d00d0d508c7..a1fb13ecdfb 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -1692,7 +1692,7 @@ static void build_boundary_vertex_only(BevelParams *bp, BevVert *bv, bool constr * Special case of build_boundary when a single edge is beveled. * The 'width adjust' part of build_boundary has been done already, * and \a efirst is the first beveled edge at vertex \a bv. -*/ + */ static void build_boundary_terminal_edge(BevelParams *bp, BevVert *bv, EdgeHalf *efirst, bool construct) { MemArena *mem_arena = bp->mem_arena; @@ -4933,7 +4933,7 @@ static void bevel_limit_offset(BevelParams *bp) * so we can just multiply them all by the reduction factor * of the offset to have the effect of recalculating the specs * with the new limited_offset. - */ + */ offset_factor = limited_offset / bp->offset; GHASH_ITER(giter, bp->vert_hash) { bv = BLI_ghashIterator_getValue(&giter); |