Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 8 Aug 2017 14:43:25 +0000 (16:43 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 8 Aug 2017 14:43:25 +0000 (16:43 +0200)
commite8b6bcd65c946f5eb9623638eebcd93ed74d9358
tree2def0bada18cc84e8315dc20681d1928cf219fbb
parentcf8add42b807449e6f96f8ecab637d52e166052f
parentddfd57c0d275e6222f9622379b4c716e868029ce
Merge branch 'master' into blender2.8

Conflicts:
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/editors/object/object_add.c
source/blender/python/intern/bpy_app_handlers.c
intern/cycles/device/device.cpp
intern/cycles/device/device.h
intern/cycles/device/device_cuda.cpp
source/blender/blenkernel/intern/screen.c
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/interface_layout.c
source/blender/editors/object/object_add.c