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)
commit1ea4fcac44871e0e88c96d78e55f7e2cb76fd079
tree95dbbcdca105b0858fa9b082b863909269bbc8ea
parentc3870b6009adba386be1fe64a62f91bd13079dd6
parentb10921f0ccbd29f7f1fd19b9e9aa103b5a74fd9a
Merge branch 'master' into soc-2019-bevel-profiles
source/blender/bmesh/tools/bmesh_bevel.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c