Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 14 May 2018 07:01:07 +0000 (09:01 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 14 May 2018 07:01:11 +0000 (09:01 +0200)
commitf78ba4bcfe8b06645de0913116b3b519eceb1c7e
tree35af79eeceda988e17ce84ce64888e87f596494e
parent66f0c10f844d5830b14c7dd2d1469edceb04f2aa
parent43ee4d5d7c6743de6048658354ebaa202f23054d
Merge branch 'master' into blender2.8