Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 18 Jun 2018 16:55:12 +0000 (18:55 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 18 Jun 2018 16:55:12 +0000 (18:55 +0200)
commit176bbe346673edfac3e0aaeeba6ccfa40cd4f377
tree98eb5f8d8a2ac5554f6a2d2e7d40f8674e13f327
parent594bcf934e582e253b612de4e0863f0708c64df4
parentab59f9e65d4fe07be4f542e291a52eb1d71a2d8a
Merge branch 'master' into blender2.8