Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 15 Nov 2017 12:17:25 +0000 (23:17 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 15 Nov 2017 12:17:25 +0000 (23:17 +1100)
commitae8130e28740ec2d985f1e54312eeba6527f81cc
treeda018065a99085281df754ec4b7f534b35e92e05
parent26a72f0852a75535f8e4ea72100e735409b1407f
parent9c7b89241df26fbc224b826318fcb0401e024c46
Merge branch 'master' into blender2.8