Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 24 Oct 2017 10:19:48 +0000 (12:19 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 24 Oct 2017 10:19:48 +0000 (12:19 +0200)
commit7ea7fd45d0fffed5cc67769a9fe050ae6a574554
tree032b450cf6ee9d9a40c8f307305df1eff350266e
parentf5456df095291c6cb2d0223a179746c8e514cd15
parente03df90bf36f907a99ebd8cba6cf03cf05ca71a3
Merge branch 'master' into blender2.8
intern/cycles/device/device.cpp
intern/cycles/device/device_multi.cpp
intern/cycles/render/buffers.cpp
source/blender/python/bmesh/bmesh_py_types.c