Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 28 Aug 2017 04:25:10 +0000 (14:25 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 28 Aug 2017 04:25:10 +0000 (14:25 +1000)
commitaf108a2f26805389aac222397111cce11ba280a8
tree791edf56ed52ae8a0990a50e322adadb698e29d9
parentc8627b9067c5b72c35f8799588a87474e91cc464
parent1261a29fc0f8c286d1ca7d435fdfccdcd12fd4ba
Merge branch 'master' into blender2.8