Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 15 Mar 2019 17:31:48 +0000 (18:31 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 15 Mar 2019 17:31:48 +0000 (18:31 +0100)
1  2 
build_files/buildbot/slave_compile.py
build_files/cmake/config/blender_release.cmake
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/version_update.py
intern/cycles/device/device_cuda.cpp

Simple merge
@@@ -50,8 -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_MEM_JEMALLOC        ON  CACHE BOOL "" FORCE)
- set(WITH_CYCLES_CUDA_BINARIES 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(WITH_CYCLES_CUBIN_COMPILER OFF CACHE BOOL "" FORCE)
  set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75 CACHE STRING "" FORCE)
  
  # platform dependent options
Simple merge