Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 22 May 2018 15:24:32 +0000 (17:24 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 22 May 2018 15:24:32 +0000 (17:24 +0200)
commit66d18d93c484e36f7ca0e70220adad19cbe2abc3
tree9c091479483353faa3ec201e5a88fb0852c38d18
parentf5d911f8b0deb28d04737451adf355da80c792c3
parent76ece90d4a441a366614ef3dec6575f9b687384c
Merge branch 'master' into blender2.8