Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 12 Oct 2017 14:40:35 +0000 (16:40 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 12 Oct 2017 14:40:35 +0000 (16:40 +0200)
Conflicts:
source/blender/editors/screen/screen_edit.c

1  2 
intern/cycles/blender/blender_mesh.cpp
source/blender/blenkernel/intern/scene.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_regions.c