Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 18 Dec 2018 19:33:04 +0000 (20:33 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 18 Dec 2018 19:33:04 +0000 (20:33 +0100)
commit6e5b573dc8288826f05fd3a0b0b6de2a9753ba8b
tree8c2272bcef3cc6fac01537996deef15fb0a0c973
parent5638db749529a77ef4bf8421e1a90eeee6994d5c
parent1875f9e7d7bcd157fb1c359be6a41984bd84d4dc
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_conversions.c