Merge branch 'master' into blender2.8
authorGaia Clary <gaia.clary@machinimatrix.org>
Wed, 31 Jan 2018 23:43:01 +0000 (00:43 +0100)
committerGaia Clary <gaia.clary@machinimatrix.org>
Wed, 31 Jan 2018 23:43:01 +0000 (00:43 +0100)
Apply Fix T50198 also in blender2.8


Trivial merge