Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 4 Dec 2018 15:35:16 +0000 (16:35 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 4 Dec 2018 15:35:16 +0000 (16:35 +0100)
1  2 
CMakeLists.txt
build_files/buildbot/slave_compile.py
build_files/cmake/config/blender_release.cmake

diff --cc CMakeLists.txt
Simple merge
Simple merge
@@@ -50,9 -51,10 +50,9 @@@ set(WITH_SDL                 ON  CACHE 
  set(WITH_X11_XINPUT          ON  CACHE BOOL "" FORCE)
  set(WITH_X11_XF86VMODE       ON  CACHE BOOL "" FORCE)
  
 -set(WITH_PLAYER              ON  CACHE BOOL "" FORCE)
  set(WITH_MEM_JEMALLOC        ON  CACHE BOOL "" FORCE)
  set(WITH_CYCLES_CUDA_BINARIES ON  CACHE BOOL "" FORCE)
- set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61 CACHE STRING "" FORCE)
+ set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_72;sm_75 CACHE STRING "" FORCE)
  
  # platform dependent options
  if(UNIX AND NOT APPLE)