Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 6 Dec 2017 05:51:37 +0000 (16:51 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 6 Dec 2017 05:51:37 +0000 (16:51 +1100)
commit7ca8af4cc82010c85fa6d7f663977117eb23b6f9
tree8df9cef796af772ee5fc7102276a540a183a8f2c
parent858b38f12c77acda617f07e0bfb954610b8fb56c
parente6404274a1eb0ed5f50445f5c7840720a03713fa
Merge branch 'master' into blender2.8