Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 29 Nov 2018 22:54:30 +0000 (23:54 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 29 Nov 2018 22:54:30 +0000 (23:54 +0100)
commit63c06531707c14c3c93c9f84d39a77aaf75c3634
tree700445b404cc5ebfa09fea62c53b9a64db049b9e
parent679b156756e070a779e97af7d5a34ddf0b164836
parenta8b8da55672c2177c55709321df3514355b513f4
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
intern/cycles/render/session.cpp