Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 1 Nov 2018 05:20:52 +0000 (16:20 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 1 Nov 2018 05:20:52 +0000 (16:20 +1100)
commit10d7ebc469b2fd7287577af68df7d1c4cbd37148
treef149b3a2a357f3f308be3f41f73b0dfabb952b06
parentae87adc73a29efab1cde5c9df20e99f73ac501c9
parent38f57734ea1e0d6a6473bb13f91f71eac821edcc
Merge branch 'master' into blender2.8