Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 7 Jun 2018 13:41:57 +0000 (15:41 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 7 Jun 2018 13:41:57 +0000 (15:41 +0200)
commit1e4722eeabcc9c53616ab42b45e8a93206d46b73
tree226a5ca90902ae95a7b7032b05b4db94b2a3fc8e
parentd9d3e7778c9d0cb495620e1f5b483038f0193d09
parent8a2db3ed21c0eff7ee293c6a24c614283a8ed73f
Merge branch 'master' into blender2.8

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