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)
commita0453dadf0685782ffb8ac6b3c6470a3d44c8a01
treee93f313f3dfaa12108a0c3e4a7e65d1738a95708
parentd58cf8292c039a943efbecb5c5ac07ea160f3d0f
parent6c892efdbc4d5882da9a2655b21e4f4c2559106b
Merge branch 'master' into blender2.8
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