Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 17 Jun 2018 13:52:32 +0000 (15:52 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 17 Jun 2018 13:52:32 +0000 (15:52 +0200)
commit6855d537e3112f7ba4d84524d06a524b0ea9f7b1
treec643652a43188e30d8144856b23b78182c8d0277
parentc7ae7ccfb8d735f05083edadc2b49dd2e11b78b6
parent6453814ec033feb4549a9d565efc4ac968b2ac13
Merge branch 'master' into blender2.8