Merge branch 'master' into blender2.8
authorKévin Dietrich <kevin.dietrich@mailoo.org>
Thu, 1 Mar 2018 10:56:01 +0000 (11:56 +0100)
committerKévin Dietrich <kevin.dietrich@mailoo.org>
Thu, 1 Mar 2018 10:56:01 +0000 (11:56 +0100)
commit1852e702abc1dfd6c600de71d3b16bfe29459ee1
tree6b92e4847482267c998df97d273b518a42ceb31a
parentbcafdc82d83f70312859c9a045c92daa326afbdf
parent7377d411b47d50cd943cd33e3e55c0409bb79f91
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_mesh.cpp