Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 21 Apr 2018 18:17:41 +0000 (20:17 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 21 Apr 2018 18:17:41 +0000 (20:17 +0200)
commit112540da62cefbf8774a20043cf981664bc2d028
tree9decd91b56986e9f4d4d3bcd3fee694ce58f2472
parent9a35ad752e845129aa756778e7f502a5057b92bf
parent1e9fb355bf7d4b162e924de24bdeadb197416d1b
Merge branch 'master' into blender2.8