[Bf-blender-cvs] [b9b88d59ddd] blender2.8: Merge branch 'master' into blender2.8

[Brecht Van Lommel]

Commit: b9b88d59ddde50bd1de1f7f96b1c91cbdaf7497b
Author: Brecht Van Lommel
Date:   Tue Dec 4 16:35:16 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBb9b88d59ddde50bd1de1f7f96b1c91cbdaf7497b

Merge branch 'master' into blender2.8

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



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

diff --cc build_files/cmake/config/blender_release.cmake
index 224ad05aaf2,a43470f4e1e..ac19ed29997
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@@ -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)