Merge branch 'master' into soc-2019-bevel-profiles
authorHans Goudey <h.goudey@me.com>
Tue, 18 Jun 2019 18:35:04 +0000 (14:35 -0400)
committerHans Goudey <h.goudey@me.com>
Tue, 18 Jun 2019 18:35:04 +0000 (14:35 -0400)
1  2 
source/blender/bmesh/tools/bmesh_bevel.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c