Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 19 Sep 2018 02:05:08 +0000 (12:05 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 19 Sep 2018 02:05:08 +0000 (12:05 +1000)
commit0ad183bf0289c3b9b1af0cd581bc30435cae3800
treec3289321d26026e72a4e9d5da0d65198cf904e19
parent0322e854dad30f469537f60c7a7ae6d24a62d2cf
parent4c918efd44be11d47afc1efed684a15ad5579722
Merge branch 'master' into blender2.8