Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 14 May 2018 06:41:15 +0000 (08:41 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 14 May 2018 06:41:15 +0000 (08:41 +0200)
commit66f0c10f844d5830b14c7dd2d1469edceb04f2aa
treea2c69bac012a608cd2c532e250d031dfcec576fa
parenta0c564f86aafd17f1614620dbe918898635a1e35
parentc1d737eb95455540e33f090a70645354aa04491f
Merge branch 'master' into blender2.8