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)
commiteeb621566af3c6737393d87ef33237fc96d06d87
tree36a4d1bd54142368148fb3a82c932f874c011fc1
parent1bc0cd00713a573bed76ab35b6ae0cc0e9edc307
parent36c1122b96ca550a541f9cea9ed2673319c7467b
Merge branch 'master' into blender2.8
CMakeLists.txt
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_win32.cmake
intern/cycles/device/device_cuda.cpp