diff options
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | build_files/buildbot/config/user-config-glibc211-i686.py | 2 | ||||
| -rw-r--r-- | build_files/buildbot/config/user-config-glibc211-x86_64.py | 2 | ||||
| -rw-r--r-- | build_files/cmake/config/blender_full.cmake | 3 | ||||
| -rw-r--r-- | build_files/scons/config/win32-vc-config.py | 2 | ||||
| -rw-r--r-- | build_files/scons/config/win64-vc-config.py | 2 |
6 files changed, 11 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 198f6a3a6fe..c6e3c7a3f9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -158,6 +158,7 @@ option_defaults_init( _init_SDL _init_FFTW3 _init_GAMEENGINE + _init_OPENSUBDIV ) # customize... @@ -174,11 +175,13 @@ if (UNIX AND NOT APPLE) set(_init_OPENCOLORIO OFF) set(_init_SDL OFF) set(_init_FFTW3 OFF) + set(_init_OPENSUBDIV OFF) elseif(WIN32) set(_init_JACK OFF) elseif(APPLE) set(_init_INPUT_NDOF OFF) set(_init_JACK OFF) + set(_init_OPENSUBDIV OFF) endif() @@ -229,7 +232,7 @@ option(WITH_COMPOSITOR "Enable the tile based nodal compositor" ON) option(WITH_COMPOSITOR_WERROR "Treat warnings as errors in compositor code" OFF) mark_as_advanced(WITH_COMPOSITOR_WERROR) -option(WITH_OPENSUBDIV "Enable OpenSubdiv for surface subdivision" OFF) +option(WITH_OPENSUBDIV "Enable OpenSubdiv for surface subdivision" _init_OPENSUBDIV) option(WITH_SUBSURF_WERROR "Treat warnings as errors in subsurf code" OFF) mark_as_advanced(WITH_COMPOSITOR_WERROR) diff --git a/build_files/buildbot/config/user-config-glibc211-i686.py b/build_files/buildbot/config/user-config-glibc211-i686.py index b054abe7005..239625c1bef 100644 --- a/build_files/buildbot/config/user-config-glibc211-i686.py +++ b/build_files/buildbot/config/user-config-glibc211-i686.py @@ -167,7 +167,7 @@ BF_BOOST_LIBPATH = '${BF_BOOST}/lib' WITH_BF_OCEANSIM = True # OpenSubdiv -WITH_BF_OPENSUBDIV = False +WITH_BF_OPENSUBDIV = True WITH_BF_STATICOPENSUBDIV = True BF_OPENSUBDIV = '/opt/lib/opensubdiv' BF_OPENSUBDIV_INC = '${BF_OPENSUBDIV}/include' diff --git a/build_files/buildbot/config/user-config-glibc211-x86_64.py b/build_files/buildbot/config/user-config-glibc211-x86_64.py index eeca622ea31..a3195cd9f06 100644 --- a/build_files/buildbot/config/user-config-glibc211-x86_64.py +++ b/build_files/buildbot/config/user-config-glibc211-x86_64.py @@ -167,7 +167,7 @@ BF_BOOST_LIBPATH = '${BF_BOOST}/lib' WITH_BF_OCEANSIM = True # OpenSubdiv -WITH_BF_OPENSUBDIV = False +WITH_BF_OPENSUBDIV = True WITH_BF_STATICOPENSUBDIV = True BF_OPENSUBDIV = '/opt/lib/opensubdiv' BF_OPENSUBDIV_INC = '${BF_OPENSUBDIV}/include' diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake index 6410aeb397b..881dc515499 100644 --- a/build_files/cmake/config/blender_full.cmake +++ b/build_files/cmake/config/blender_full.cmake @@ -57,10 +57,13 @@ set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE) if(UNIX AND NOT APPLE) set(WITH_JACK ON CACHE BOOL "" FORCE) set(WITH_DOC_MANPAGE ON CACHE BOOL "" FORCE) + set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE) elseif(WIN32) set(WITH_JACK OFF CACHE BOOL "" FORCE) + set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE) elseif (APPLE) set(WITH_JACK ON CACHE BOOL "" FORCE) set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE) + set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE) endif() diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index 94e6cf9c8c4..9bd23a46d66 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -210,7 +210,7 @@ BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE'] #Freestyle WITH_BF_FREESTYLE = True -WITH_BF_OPENSUBDIV = False +WITH_BF_OPENSUBDIV = True BF_OPENSUBDIV = LIBDIR + '/opensubdiv' BF_OPENSUBDIV_INC = '${BF_OPENSUBDIV}/include' BF_OPENSUBDIV_LIB = 'osdCPU osdGPU' diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index c25b62a756a..adacc2946c5 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -214,7 +214,7 @@ BF_RAYOPTIMIZATION_SSE_FLAGS = [''] #Freestyle WITH_BF_FREESTYLE = True -WITH_BF_OPENSUBDIV = False +WITH_BF_OPENSUBDIV = True BF_OPENSUBDIV = LIBDIR + '/opensubdiv' BF_OPENSUBDIV_INC = '${BF_OPENSUBDIV}/include' BF_OPENSUBDIV_LIB = 'osdCPU osdGPU' |