Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 7 Jun 2018 12:58:57 +0000 (14:58 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 7 Jun 2018 12:58:57 +0000 (14:58 +0200)
commita3f520170c9b43b195da085d20ca09866d8b2554
treee3bf30e7886452b59f0477300d83cf33dda6f1d9
parenta16d835f7ba05ce53ba798c7db0c01abb2f12032
parent624294063910ad3c6459702a7e6aac592db3a720
Merge branch 'master' into blender2.8