Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 3 Oct 2018 10:56:44 +0000 (12:56 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 3 Oct 2018 10:56:44 +0000 (12:56 +0200)
commita3d9e8edce367eb7b2ec79cf73d06ebf1e222630
tree22cf0b7b14fb9680064be610950268d6c6553050
parent44d47526af771ce3434950441aa449a6d6eeb9d3
parentd05b9e0a2e143ac122cdff8f980428f69d0e14c7
Merge branch 'master' into blender2.8