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)
commite99094035c493a4e0bcb47b5cb9b1680b0e853c0
tree400f7af8c9d46edf757d6bbec0bce7199c676d83
parentce0f70fbd62fc812a2508c27a2f392cde0acbdfa
parent38d35603f224e92c7f4dfe1802b0ebfceebec46a
Merge branch 'master' into blender2.8
release/scripts/startup/bl_operators/freestyle.py
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/makesdna/DNA_object_force_types.h