Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 23 Oct 2017 03:38:22 +0000 (14:38 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 23 Oct 2017 03:38:22 +0000 (14:38 +1100)
commitc8edac617f91ef6e31e774d73a21b956b6d987a8
tree7440c5b042066dc5ac1ab61256bfdf18949e2bfc
parent7dcf8bebe6806777c912b7a5f590844b26e0f049
parentaf067f2305ac3b07620c1e504f463344774d2c0b
Merge branch 'master' into blender2.8