Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 3 May 2018 18:24:44 +0000 (20:24 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 3 May 2018 18:24:44 +0000 (20:24 +0200)
commit5760c6b25cc4e014868ff67f2c357ea38e40eafa
treea5e565785fedff08ef05c0ff7761b3fa2e6d63e3
parent2cdbbfcc5a0f94fb841334edab3e22d7e3b42fab
parent0f217de4033f25d55e73d6aa8ab1020fed3f850c
Merge branch 'master' into blender2.8