Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 29 Oct 2018 02:04:47 +0000 (13:04 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 29 Oct 2018 02:04:47 +0000 (13:04 +1100)
1  2 
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_mask.c