Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 14 Dec 2018 00:39:39 +0000 (11:39 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 14 Dec 2018 00:39:39 +0000 (11:39 +1100)
commit9bac172a79d86c0a0c0669272a49809dffa920cd
tree16360cd9059330f918dd6a56357b7bc760ae6ef8
parent0f7c60c57650fb91717667b53df84a3d33e8576e
parentf0a481eebdfea215f4beac0e4b1cbc5118524a43
Merge branch 'master' into blender2.8