Merge branch 'master' into blender2.8
authorPhilipp Oeser <info@graphics-engineer.com>
Fri, 15 Jun 2018 08:44:33 +0000 (10:44 +0200)
committerPhilipp Oeser <info@graphics-engineer.com>
Fri, 15 Jun 2018 08:44:33 +0000 (10:44 +0200)
commit76bc8669a0fd469efa1c19cd461bcaf21cf0d5be
treefcf0ccc991676fbe20609ef2ddf13c66da72d475
parent3a2a10e3a69e8d4e3b9960c257860b66e755579e
parent284e0ea756854e3d8388b2cd89666923975cbf10
Merge branch 'master' into blender2.8
source/blender/editors/space_text/text_ops.c