Commit: c59370bf643f6e85473c560c8f5edcf73cc36e8e Author: Brecht Van Lommel Date: Fri Jan 18 21:00:24 2019 +0100 Branches: master https://developer.blender.org/rBc59370bf643f6e85473c560c8f5edcf73cc36e8e
Merge branch 'blender2.7' =================================================================== =================================================================== diff --cc build_files/cmake/config/blender_release.cmake index ac19ed29997,4257d3df9b0..74417ea3151 --- 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;sm_70;sm_72;sm_75 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_75 CACHE STRING "" FORCE) # platform dependent options if(UNIX AND NOT APPLE) _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
