Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jul 2018 07:15:06 +0000 (09:15 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jul 2018 07:15:06 +0000 (09:15 +0200)
commit66087fe127b89390233dde4aee3c61d05a29c36b
tree1c3d547a720c08de996374b33cbd3029d3bf979e
parent55354d734e98e8c733401f094b3d90d0b8ae3474
parentb328a59373a231f749bd0d17fb3bc385002a5946
Merge branch 'master' into blender2.8