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

Simple merge