Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 29 Aug 2018 15:05:46 +0000 (01:05 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 29 Aug 2018 15:05:46 +0000 (01:05 +1000)
commitcc5d55fad496b0e76b4b48bc6df955ddfd1fc846
treee1dde818eb73d6b1d493cc3fec19cb22e2154aae
parent927cf918facac211c398720f1ac34eded1237f15
parent76a9752be21a593387900e3885472de988a5a5c0
Merge branch 'master' into blender2.8