Merge branch 'master' into blender2.8
authorAntonio Vazquez <blendergit@gmail.com>
Thu, 13 Jul 2017 16:05:20 +0000 (18:05 +0200)
committerAntonio Vazquez <blendergit@gmail.com>
Thu, 13 Jul 2017 16:05:20 +0000 (18:05 +0200)
commitad7f782e17201d5af894ffffdc45b07dadfea229
treeb962519aad9dc6a71d76a50e857115cf108955bf
parent31ad03dbdedf9361739e8b7ff3f8843f9f91db46
parent7daae642d8406854f25b860a5faacdef4d54af1b
Merge branch 'master' into blender2.8