Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 18 Jun 2018 16:22:06 +0000 (18:22 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 18 Jun 2018 16:22:06 +0000 (18:22 +0200)
commitf0245a18d10ca6e51a5383cbba809af18c9b36f1
treee3d6daad18df173b02edca9d91057ec7a7a05f07
parentb2fa20f6c9dbbfa69027a543d143a6ed6371e821
parentb7b7468befbf401615d944df5263198d964fe19e
Merge branch 'master' into blender2.8