Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 8 Dec 2017 01:59:51 +0000 (12:59 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 8 Dec 2017 01:59:51 +0000 (12:59 +1100)
commit82c779462d13bdf39bc74631db510f165e7a8f2d
treece7b82441327655c979e945cb2ac87d0bb117b96
parentdc848e9a8b6486ea83461c67c068a9ae8ac154ae
parent4a734325f754db25138aae990b2abdb5224ba172
Merge branch 'master' into blender2.8