Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 9 Jun 2018 16:48:11 +0000 (18:48 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 9 Jun 2018 16:48:11 +0000 (18:48 +0200)
commit419a813938f7dc39a96145aefae680413c93dfe8
tree0493c61046a320e273e48ad1e12d1c1933970dd8
parent726ed7244e0bc2fc0659a9c164f47c35dd99789e
parent83cb34ccd15a3f43ebff7e62085a360e7a5c383e
Merge branch 'master' into blender2.8