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)
1  2 
intern/cycles/device/device.cpp
intern/cycles/device/device.h
intern/cycles/device/device_cuda.cpp
intern/cycles/device/device_multi.cpp

Simple merge
Simple merge
Simple merge
Simple merge