Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 7 Feb 2018 04:59:16 +0000 (15:59 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 7 Feb 2018 04:59:16 +0000 (15:59 +1100)
1  2 
release/scripts/startup/bl_operators/freestyle.py
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/makesdna/DNA_object_force_types.h