Commit: 7d1be8f6bb134ab7d744b6b979352b6f6cf5752e Author: Brecht Van Lommel Date: Mon Dec 5 22:10:16 2022 +0100 Branches: tmp-vfx-platform-2023 https://developer.blender.org/rB7d1be8f6bb134ab7d744b6b979352b6f6cf5752e
Build: fully disable MaterialX, auto clear OpenColorIO variables also =================================================================== M build_files/cmake/config/blender_full.cmake M build_files/cmake/config/blender_release.cmake M build_files/cmake/platform/platform_old_libs_update.cmake =================================================================== diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake index 4602962d1cd..b44250b011b 100644 --- a/build_files/cmake/config/blender_full.cmake +++ b/build_files/cmake/config/blender_full.cmake @@ -58,7 +58,7 @@ set(WITH_QUADRIFLOW ON CACHE BOOL "" FORCE) set(WITH_SDL ON CACHE BOOL "" FORCE) set(WITH_TBB ON CACHE BOOL "" FORCE) set(WITH_USD ON CACHE BOOL "" FORCE) -set(WITH_MATERIALX ON CACHE BOOL "" FORCE) +set(WITH_MATERIALX OFF CACHE BOOL "" FORCE) set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE) diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake index dc2fad3ad2d..08cb882ebfb 100644 --- a/build_files/cmake/config/blender_release.cmake +++ b/build_files/cmake/config/blender_release.cmake @@ -59,7 +59,7 @@ set(WITH_QUADRIFLOW ON CACHE BOOL "" FORCE) set(WITH_SDL ON CACHE BOOL "" FORCE) set(WITH_TBB ON CACHE BOOL "" FORCE) set(WITH_USD ON CACHE BOOL "" FORCE) -set(WITH_MATERIALX ON CACHE BOOL "" FORCE) +set(WITH_MATERIALX OFF CACHE BOOL "" FORCE) set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE) diff --git a/build_files/cmake/platform/platform_old_libs_update.cmake b/build_files/cmake/platform/platform_old_libs_update.cmake index 77dc61c77b4..1e98ea7a4ff 100644 --- a/build_files/cmake/platform/platform_old_libs_update.cmake +++ b/build_files/cmake/platform/platform_old_libs_update.cmake @@ -53,6 +53,7 @@ if(UNIX AND message(STATUS "Auto updating CMake configuration for Blender 3.4 libraries") unset_cache_variables("^BLOSC") unset_cache_variables("^BOOST") + unset_cache_variables("^OPENCOLORIO") unset_cache_variables("^OPENEXR") unset_cache_variables("^OPENIMAGEIO") unset_cache_variables("^OPENSUBDIV") _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs