Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 24 Nov 2017 03:30:36 +0000 (14:30 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 24 Nov 2017 03:30:36 +0000 (14:30 +1100)
commitf3b384862df83dfca8b7fbad3dc6c5c07d0cecaf
treeeb10e834c74029c07ea0e5e06531af5cd693d64c
parentf8fc77ec8481fbbe253ec73d701beab278fdeaf3
parentc62e3a05b08b18e2767590a51bd9decc274106a3
Merge branch 'master' into blender2.8