Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 24 Apr 2018 06:01:21 +0000 (08:01 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 24 Apr 2018 06:01:21 +0000 (08:01 +0200)
commit4b544e857c94118ff3957d7fa15758507fd94181
tree2ec6346fa3c0b7c5a0d4a2af7d9e5694a1a1ef85
parentc1b310c32bd08e68d6bb568cf33c2731c0f884c0
parent92f36586e30931cf796835fd52d4691dbedfaf9d
Merge branch 'master' into blender2.8