Merge branch 'master' into blender2.8
authorPhilipp Oeser <info@graphics-engineer.com>
Fri, 6 Jul 2018 10:30:48 +0000 (12:30 +0200)
committerPhilipp Oeser <info@graphics-engineer.com>
Fri, 6 Jul 2018 10:30:48 +0000 (12:30 +0200)
commitccef83b2fb7aeb0653bcc13cfc49dac421ac88c8
tree2f35f1f83cef51f76d65482702ce3c2ceeae60e7
parentdd5c25fab205daea5afa7e62d80d56ac17f297fa
parent3cc2a9b934d072fdd817863aa8e93e2416f5c804
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/screen/screen_edit.c
source/blender/editors/scene/scene_edit.c