Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 14 Jan 2018 06:29:38 +0000 (17:29 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 14 Jan 2018 06:29:38 +0000 (17:29 +1100)
commit58be6d282d592fcf33dcdbfb127c4b2b9303ef48
tree5ec7cb6cfc7d936afef93f7d94e7aae388c85a15
parente7bf77df3ac7863a5e9f24338050c3ccce07cde6
parent02a01b35057cad8609d775df1059c68e39e9f48f
Merge branch 'master' into blender2.8