Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 21 Aug 2018 07:05:40 +0000 (17:05 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 21 Aug 2018 07:05:40 +0000 (17:05 +1000)
commit797274d25666d6442648ae3e206364773d72b133
tree6b9c92b368b53c1e0439ad09fad3247a5d2ddc5c
parentf189ad1f4b3602e1764994c78c4d906dc12dcc8f
parent0734541bc43005609a390ab2e32020ae175d328a
Merge branch 'master' into blender2.8