Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 7 Feb 2018 16:17:24 +0000 (17:17 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 7 Feb 2018 16:17:24 +0000 (17:17 +0100)
commitade2aaba0906571ed78312a996eac4ec511831e7
treeed713f869305164decdaa2620ee0368a46e484f9
parent56f6938b5e8bad59fa422341b830555ddec466e9
parent1dafe759edc3bc9a89f99a894d1c1fb3a14f44a9
Merge branch 'master' into blender2.8
intern/cycles/device/device_cuda.cpp