Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 20 Dec 2018 06:53:12 +0000 (17:53 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 20 Dec 2018 06:53:12 +0000 (17:53 +1100)
commitd5f87bdde68f3849b353989d0af296ea0b7e402b
treeb1bd28ef2509cc68531cf35eb70f6dc4f70cab6c
parent320e7f5322a56ffcb3174d200701bb7a8c43ccef
parentf7d216c1b6061260ffba4fc63a2ff45f212d213f
Merge branch 'master' into blender2.8