Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jun 2018 09:10:09 +0000 (11:10 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jun 2018 09:10:09 +0000 (11:10 +0200)
commitde30c475132a89dc087395a0642f084946f343ef
tree9174088c0f943ae3e461ef35ce4e39d5d0f1971a
parent3f74a5c5fd5239204eb1f5fcdb69af7ff37a9459
parentf22ef1706d440cfdc91af99a8d4ab9952fad882b
Merge branch 'master' into blender2.8