Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 31 Oct 2018 10:49:04 +0000 (11:49 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 31 Oct 2018 10:49:04 +0000 (11:49 +0100)
commitfc12a736bbd10e488b701ad18fb70934ea8de01b
tree13532ffffbd7fac27474c01c00702041c45d273f
parent14e1dfda4e145fb4d6975fd1531fad149b761bbb
parente0cc3e980999ed97e72b430f0d654b30f60f9313
Merge branch 'master' into blender2.8
intern/cycles/device/device.cpp
intern/cycles/device/device.h
intern/cycles/device/device_cuda.cpp
intern/cycles/device/device_multi.cpp