Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 20 Aug 2018 07:53:53 +0000 (17:53 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 20 Aug 2018 07:53:53 +0000 (17:53 +1000)
commitd2e70455cf460df2f73fd8594705b425314371e0
tree4e88bac45f3647bfff57156db7ba829c50ea8b5c
parent3ef1aeb15ec8f8a07118eed2aa477f6c4e6e5efe
parentf52e31a46dc16275a31cb36d85d09fdf1a675a65
Merge branch 'master' into blender2.8