Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 11 Sep 2018 07:45:38 +0000 (17:45 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 11 Sep 2018 07:45:38 +0000 (17:45 +1000)
commit01e6f09001148313bb1658bad0c2d1341a7821cf
tree75a81bb6791a545ca4dd9cb3aa2f0483e6fe7e2a
parenta0581daf753a81ac1e410c6aa0c9cfd233b04793
parentbf8aac0d491ae7ea9c52c5911f61f041cfffdafc
Merge branch 'master' into blender2.8
release/scripts/startup/bl_operators/wm.py
release/scripts/startup/bl_ui/properties_freestyle.py
release/scripts/startup/bl_ui/properties_grease_pencil_common.py
release/scripts/startup/bl_ui/properties_render.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py