From acd1d1a31d1ac7343f8656dbd3b04c5342f306be Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 26 Nov 2018 11:41:38 +0100 Subject: CMake: Remove Cycles specific OpenSubdiv options Just use one flag which enables OpenSubdiv globally for all the areas of Blender. --- CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index eb8df075380..dfeb1d69db0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -157,7 +157,6 @@ option_defaults_init( _init_BUILDINFO _init_CODEC_FFMPEG _init_CYCLES_OSL - _init_CYCLES_OPENSUBDIV _init_IMAGE_OPENEXR _init_INPUT_NDOF _init_JACK @@ -175,7 +174,6 @@ if(UNIX AND NOT APPLE) # disable less important dependencies by default set(_init_CODEC_FFMPEG OFF) set(_init_CYCLES_OSL OFF) - set(_init_CYCLES_OPENSUBDIV OFF) set(_init_IMAGE_OPENEXR OFF) set(_init_JACK OFF) set(_init_OPENCOLLADA OFF) @@ -406,7 +404,6 @@ option(WITH_CYCLES_STANDALONE "Build Cycles standalone application" OFF) option(WITH_CYCLES_STANDALONE_GUI "Build Cycles standalone with GUI" OFF) option(WITH_CYCLES_OSL "Build Cycles with OSL support" ${_init_CYCLES_OSL}) option(WITH_CYCLES_EMBREE "Build Cycles with Embree support" OFF) -option(WITH_CYCLES_OPENSUBDIV "Build Cycles with OpenSubdiv support" ${_init_CYCLES_OPENSUBDIV}) option(WITH_CYCLES_CUDA_BINARIES "Build Cycles CUDA binaries" OFF) option(WITH_CYCLES_CUBIN_COMPILER "Build cubins with nvrtc based compiler instead of nvcc" OFF) option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF) -- cgit v1.2.3 From 9abcf56fa88dd849bf0f83fafe5d4666d3531cd2 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 26 Nov 2018 15:39:08 +0100 Subject: Enable OpenSubdiv modifier by default This commit makes it so that subsurf/multires modifiers will respect the WITH_OPENSUBDIV option. The WITH_OPENSUBDIV_MODIFIER option is now gone. For artists it mean that subsurf modifier will behave same as it is planned for 2.80. Multires will now support sculpting, but it has some known limitations. Those will be worked on before the final release. If OpenSubdiv is disabled, no subsurf/multires functionality will present. For the details see: https://wiki.blender.org/wiki/Reference/Release_Notes/2.80/Modeling#Subsurf.2FMultires --- CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index d38c7d14eb9..b8d044a5866 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -239,9 +239,6 @@ option(WITH_COMPOSITOR "Enable the tile based nodal compositor" ON) option(WITH_OPENSUBDIV "Enable OpenSubdiv for surface subdivision" _init_OPENSUBDIV) -option(WITH_OPENSUBDIV_MODIFIER "Use OpenSubdiv for CPU side of Subsurf/Multires modifiers" OFF) -mark_as_advanced(WITH_OPENSUBDIV_MODIFIER) - option(WITH_OPENVDB "Enable features relying on OpenVDB" OFF) option(WITH_OPENVDB_BLOSC "Enable blosc compression for OpenVDB, only enable if OpenVDB was built with blosc support" OFF) option(WITH_OPENVDB_3_ABI_COMPATIBLE "Assume OpenVDB library has been compiled with version 3 ABI compatibility" OFF) -- cgit v1.2.3 From b71006ceedbe4c7e6fa66c90696bcbd19b389f19 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 27 Nov 2018 14:40:25 +0100 Subject: Fix T58088: OpenSubdiv not enabled by default in macOS builds. --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index b8d044a5866..ccc6d54c9a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -184,7 +184,6 @@ elseif(WIN32) set(_init_JACK OFF) elseif(APPLE) set(_init_JACK OFF) - set(_init_OPENSUBDIV OFF) endif() -- cgit v1.2.3 From 3c767ceccea9c9719fcd885a9ef8b78792cdf2a4 Mon Sep 17 00:00:00 2001 From: Gaia Clary Date: Thu, 29 Nov 2018 16:56:33 +0100 Subject: add: visual studio Compiler warning (order of attribute init in c++ constructors) --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index dfeb1d69db0..83177defe6f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1526,6 +1526,11 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC") "/we4431" # missing type specifier - int assumed ) + if(MSVC_VERSION GREATER_EQUAL 1911) + # see https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/c5038?view=vs-2017 + set(_WARNINGS "${_WARNINGS} /w35038") #order of initialisation in c++ constructors + endif() + string(REPLACE ";" " " _WARNINGS "${_WARNINGS}") set(C_WARNINGS "${_WARNINGS}") set(CXX_WARNINGS "${_WARNINGS}") -- cgit v1.2.3 From 23284e4dde5e759d082e82d6cb666cb10f43e716 Mon Sep 17 00:00:00 2001 From: Gaia Clary Date: Thu, 29 Nov 2018 16:56:33 +0100 Subject: add: visual studio Compiler warning (order of attribute init in c++ constructors) --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index ccc6d54c9a4..5741588b6af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1458,6 +1458,11 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC") "/we4431" # missing type specifier - int assumed ) + if(MSVC_VERSION GREATER_EQUAL 1911) + # see https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/c5038?view=vs-2017 + set(_WARNINGS "${_WARNINGS} /w35038") #order of initialisation in c++ constructors + endif() + string(REPLACE ";" " " _WARNINGS "${_WARNINGS}") set(C_WARNINGS "${_WARNINGS}") set(CXX_WARNINGS "${_WARNINGS}") -- cgit v1.2.3 From 84285c1e344067363f814f4d3861227cc9890d41 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 30 Nov 2018 11:50:23 +0100 Subject: Fix T58275: WITH_OPENSUBDIV not enabled by default with some CMake versions. Solution provided by Ulysse Martin. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 83177defe6f..7359151d9a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -245,7 +245,7 @@ option(WITH_OPENCOLORIO "Enable OpenColorIO color management" ${_init_OPENCOLO # Compositor option(WITH_COMPOSITOR "Enable the tile based nodal compositor" ON) -option(WITH_OPENSUBDIV "Enable OpenSubdiv for surface subdivision" _init_OPENSUBDIV) +option(WITH_OPENSUBDIV "Enable OpenSubdiv for surface subdivision" ${_init_OPENSUBDIV}) option(WITH_OPENVDB "Enable features relying on OpenVDB" OFF) option(WITH_OPENVDB_BLOSC "Enable blosc compression for OpenVDB, only enable if OpenVDB was built with blosc support" OFF) -- cgit v1.2.3 From b14ec1860127eddf9a46132c4877bd4a7ee385a2 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 4 Dec 2018 12:34:59 +0100 Subject: Cycles: add initial CUDA 10.0 support, but only recommend use for Turing cards. There may still be rendering errors when used for older graphics cards. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 7359151d9a3..1912b8f6a34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -408,7 +408,7 @@ option(WITH_CYCLES_CUDA_BINARIES "Build Cycles CUDA binaries" OFF) option(WITH_CYCLES_CUBIN_COMPILER "Build cubins with nvrtc based compiler instead of nvcc" OFF) option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF) mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL) -set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 CACHE STRING "CUDA architectures to build binaries for") +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 "CUDA architectures to build binaries for") mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH) unset(PLATFORM_DEFAULT) option(WITH_CYCLES_LOGGING "Build Cycles with logging support" ON) -- cgit v1.2.3