Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 18 Jun 2018 16:12:04 +0000 (18:12 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 18 Jun 2018 16:12:04 +0000 (18:12 +0200)
commitb2fa20f6c9dbbfa69027a543d143a6ed6371e821
treea9f3cabcb77c93708a584ff99b4080e7b705f4d4
parentf828355cd6ccea84ea699ee524ca56f9bdd2f997
parentce7c87fbda96cec7d1fe44c0b9e27e96748bfa8f
Merge branch 'master' into blender2.8