Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 15 May 2018 07:08:48 +0000 (09:08 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 15 May 2018 07:08:48 +0000 (09:08 +0200)
commit52cb62d502b3ad7bb3ad744c5e19ed152179c1a8
tree57972650118b1f7ea7d30971de21ca0c34baea68
parentce27d11595bccff5ba8eafae81625eb5f4ba1019
parentae8225ba6d6d704110296023630e5b86befeb326
Merge branch 'master' into blender2.8