[Bf-blender-cvs] [bc8bd87dfff] master: Merge branch 'blender2.7'

[Brecht Van Lommel]

Commit: bc8bd87dfffe44cd5b9053800f086704ff880f6a
Author: Brecht Van Lommel
Date:   Fri Mar 15 18:31:48 2019 +0100
Branches: master
https://developer.blender.org/rBbc8bd87dfffe44cd5b9053800f086704ff880f6a

Merge branch 'blender2.7'

===================================================================



===================================================================

diff --cc build_files/cmake/config/blender_release.cmake
index 74417ea3151,adffea0b99d..5c19aaa5ad4
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@@ -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