Merge branch 'master' into blender2.8
authorPhilipp Oeser <info@graphics-engineer.com>
Fri, 6 Jul 2018 12:03:51 +0000 (14:03 +0200)
committerPhilipp Oeser <info@graphics-engineer.com>
Fri, 6 Jul 2018 12:03:51 +0000 (14:03 +0200)
commit2aba2de92bf0f55a3a390884566615d6d0562db4
tree80587e87c7fc03687637dcce061e03a9d69517a6
parent843d5d707deec1c58534c879dca23c03bd64f249
parent0987c11c768367f2d236683c6ae0c39c55891bbd
Merge branch 'master' into blender2.8

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