Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 19 Sep 2018 16:42:17 +0000 (18:42 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 19 Sep 2018 16:42:17 +0000 (18:42 +0200)
1  2 
intern/cycles/device/device_cuda.cpp

Simple merge