Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 4 May 2018 06:39:43 +0000 (08:39 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 4 May 2018 06:39:43 +0000 (08:39 +0200)
commit352aea6b0df5a29c68af5dc5859ba4fff1ffbbbd
treefdbb42ba4aec406c79da78ff6ecea807ea88c040
parenteeab3563d7409409a70bfdd4fcdb4ddfee428af3
parent75b310f48942bd972efdf5663988dfc95abdefc9
Merge branch 'master' into blender2.8