Merge branch 'master' into blender2.8
authorAntonio Vazquez <blendergit@gmail.com>
Thu, 22 Mar 2018 18:21:36 +0000 (19:21 +0100)
committerAntonio Vazquez <blendergit@gmail.com>
Thu, 22 Mar 2018 18:21:36 +0000 (19:21 +0100)
commit0080878d670125dffc0018231e974fb3be21602f
tree727b53895e889ff77c9936c9ddbc05af01212924
parent18e2a5df1a1d0a279c39f09f00f2c3275748ce60
parent897a21e6a34513e70af2dc452fa704643f91e796
Merge branch 'master' into blender2.8