Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 4 Jun 2018 10:48:03 +0000 (12:48 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 4 Jun 2018 10:48:03 +0000 (12:48 +0200)
commitf430f14df4eaf6ece3ac6114a882f0fdcfa96e44
tree01b45ac192d6ef260d3771e1b83c1312890e3aae
parentc2ff37455ee9aaab40ed04d5537da8855f4eb7e2
parent7277f8973b08f847685a39b9326fc1e2fb9e268b
Merge branch 'master' into blender2.8
source/blender/editors/space_text/text_ops.c