Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jul 2018 09:20:48 +0000 (11:20 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jul 2018 09:20:48 +0000 (11:20 +0200)
commitf4d4047d805d315226214be292f2ece951fc1d76
tree24acb95f5d707b8b97e195166b394be76a563a45
parente387a4e768ea8328e2636eade5ed6a0be747f7a2
parentd75b8e5f01d92a9bd4e92763f3d3b3bc4df75db4
Merge branch 'master' into blender2.8