Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 2 May 2017 13:29:00 +0000 (15:29 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 2 May 2017 13:29:00 +0000 (15:29 +0200)
1  2 
CMakeLists.txt
intern/cycles/device/device_cuda.cpp

diff --cc CMakeLists.txt
Simple merge
Simple merge