Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 3 Feb 2018 23:46:34 +0000 (10:46 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 3 Feb 2018 23:46:34 +0000 (10:46 +1100)
1  2 
CMakeLists.txt
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_win32.cmake
intern/cycles/device/device_cuda.cpp

diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge