Merge branch 'master' into temp-image-engine

CMakeLists.txt

@@ -330,9 +330,6 @@ option(WITH_ALEMBIC             "Enable Alembic Support" ON)
 # Universal Scene Description support
 option(WITH_USD                 "Enable Universal Scene Description (USD) Support" ON)
 
-# MaterialX
-option(WITH_MATERIALX           "Enable MaterialX Support" OFF)
-
 # 3D format support
 # Disable opencollada when we don't have precompiled libs
 option(WITH_OPENCOLLADA   "Enable OpenCollada Support (http://www.opencollada.org)" ON)
@@ -1923,7 +1920,6 @@ if(FIRST_RUN)
   info_cfg_option(WITH_QUADRIFLOW)
   info_cfg_option(WITH_TBB)
   info_cfg_option(WITH_USD)
-  info_cfg_option(WITH_MATERIALX)
   info_cfg_option(WITH_XR_OPENXR)
 
   info_cfg_text("Compiler Options:")

build_files/build_environment/CMakeLists.txt

@@ -26,9 +26,7 @@
 
 project("BlenderDependencies")
 cmake_minimum_required(VERSION 3.5)
-if(POLICY CMP0135)
+
-  cmake_policy(SET CMP0135 NEW) # CMake 3.24+ Set the date/time for extracted files to time of extraction
-endif()
 include(ExternalProject)
 include(cmake/check_software.cmake)
 include(cmake/options.cmake)
@@ -44,7 +42,7 @@ if(ENABLE_MINGW64)
 else()
   set(mingw_LIBDIR ${LIBDIR})
 endif()
-include(cmake/ssl.cmake)
+
 include(cmake/zlib.cmake)
 include(cmake/zstd.cmake)
 include(cmake/openal.cmake)
@@ -68,16 +66,18 @@ endif()
 if(UNIX)
   include(cmake/nasm.cmake)
 endif()
+include(cmake/openimageio.cmake)
 include(cmake/tiff.cmake)
 if(WIN32)
   include(cmake/flexbison.cmake)
 elseif(UNIX AND NOT APPLE)
   include(cmake/flex.cmake)
 endif()
+include(cmake/osl.cmake)
 include(cmake/tbb.cmake)
+include(cmake/openvdb.cmake)
 include(cmake/python.cmake)
 include(cmake/llvm.cmake)
-include(cmake/osl.cmake)
 option(USE_PIP_NUMPY "Install NumPy using pip wheel instead of building from source" OFF)
 if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64"))
   set(USE_PIP_NUMPY ON)
@@ -86,10 +86,7 @@ else()
 endif()
 include(cmake/python_site_packages.cmake)
 include(cmake/package_python.cmake)
-include(cmake/openimageio.cmake)
 include(cmake/usd.cmake)
-include(cmake/materialx.cmake)
-include(cmake/openvdb.cmake)
 include(cmake/potrace.cmake)
 include(cmake/haru.cmake)
 # Boost needs to be included after `python.cmake` due to the PYTHON_BINARY variable being needed.
@@ -103,8 +100,6 @@ include(cmake/fmt.cmake)
 include(cmake/robinmap.cmake)
 include(cmake/xml2.cmake)
 
-include(cmake/fribidi.cmake)
-include(cmake/harfbuzz.cmake)
 if(NOT APPLE)
   include(cmake/xr_openxr.cmake)
   if(NOT WIN32 OR BUILD_MODE STREQUAL Release)
@@ -122,7 +117,6 @@ endif()
 include(cmake/expat.cmake)
 include(cmake/pystring.cmake)
 include(cmake/yamlcpp.cmake)
-include(cmake/minizipng.cmake)
 include(cmake/opencolorio.cmake)
 
 if(BLENDER_PLATFORM_ARM)
@@ -170,6 +164,7 @@ if(UNIX)
   include(cmake/bzip2.cmake)
   include(cmake/ffi.cmake)
   include(cmake/lzma.cmake)
+  include(cmake/ssl.cmake)
   include(cmake/sqlite.cmake)
 endif()
 
@@ -181,9 +176,6 @@ if(UNIX AND NOT APPLE)
   include(cmake/wayland.cmake)
   include(cmake/wayland_libdecor.cmake)
 endif()
-include(cmake/shaderc_deps.cmake)
+
-include(cmake/shaderc.cmake)
-include(cmake/vulkan.cmake)
-include(cmake/pybind11.cmake)
 include(cmake/harvest.cmake)
 include(cmake/cve_check.cmake)

build_files/build_environment/cmake/alembic.cmake

@@ -17,7 +17,6 @@ ExternalProject_Add(external_alembic
   URL file://${PACKAGE_DIR}/${ALEMBIC_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${ALEMBIC_HASH_TYPE}=${ALEMBIC_HASH}
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/alembic
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/alembic -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${ALEMBIC_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/alembic
@@ -42,5 +41,6 @@ endif()
 
 add_dependencies(
   external_alembic
+  external_openexr
   external_imath
 )

build_files/build_environment/cmake/blosc.cmake

@@ -38,3 +38,19 @@ if(WIN32)
     external_pthreads
   )
 endif()
+
+if(WIN32)
+  if(BUILD_MODE STREQUAL Release)
+    ExternalProject_Add_Step(external_blosc after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc.lib ${HARVEST_TARGET}/blosc/lib/libblosc.lib
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/blosc/include/ ${HARVEST_TARGET}/blosc/include/
+      DEPENDEES install
+    )
+  endif()
+  if(BUILD_MODE STREQUAL Debug)
+    ExternalProject_Add_Step(external_blosc after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc_d.lib ${HARVEST_TARGET}/blosc/lib/libblosc_d.lib
+      DEPENDEES install
+    )
+  endif()
+endif()

build_files/build_environment/cmake/boost.cmake

@@ -3,18 +3,8 @@
 if(WIN32)
   set(BOOST_CONFIGURE_COMMAND bootstrap.bat)
   set(BOOST_BUILD_COMMAND b2)
-  set(BOOST_BUILD_OPTIONS runtime-link=shared)
+  set(BOOST_BUILD_OPTIONS runtime-link=shared )
-  if(BUILD_MODE STREQUAL Debug)
+  set(BOOST_HARVEST_CMD   ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ )
-    list(APPEND BOOST_BUILD_OPTIONS python-debugging=on variant=debug)
-    if(WITH_OPTIMIZED_DEBUG)
-      list(APPEND BOOST_BUILD_OPTIONS debug-symbols=off)
-    else()
-      list(APPEND BOOST_BUILD_OPTIONS debug-symbols=on)
-    endif()
-  else()
-    list(APPEND BOOST_BUILD_OPTIONS variant=release)
-  endif()
-  set(BOOST_HARVEST_CMD ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/)
   if(BUILD_MODE STREQUAL Release)
     set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-${BOOST_VERSION_NODOTS_SHORT}/ ${HARVEST_TARGET}/boost/include/)
   endif()
@@ -23,24 +13,28 @@ elseif(APPLE)
   set(BOOST_BUILD_COMMAND ./b2)
   set(BOOST_BUILD_OPTIONS toolset=clang-darwin cxxflags=${PLATFORM_CXXFLAGS} linkflags=${PLATFORM_LDFLAGS} visibility=global --disable-icu boost.locale.icu=off)
   set(BOOST_HARVEST_CMD echo .)
+  set(BOOST_PATCH_COMMAND echo .)
 else()
   set(BOOST_HARVEST_CMD echo .)
   set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
   set(BOOST_BUILD_COMMAND ./b2)
   set(BOOST_BUILD_OPTIONS cxxflags=${PLATFORM_CXXFLAGS} --disable-icu boost.locale.icu=off)
+  set(BOOST_PATCH_COMMAND echo .)
 endif()
 
-set(JAM_FILE ${BUILD_DIR}/boost.user-config.jam)
+if(WITH_BOOST_PYTHON)
-configure_file(${PATCH_DIR}/boost.user.jam.in ${JAM_FILE})
+  set(JAM_FILE ${BUILD_DIR}/boost.user-config.jam)
-set(BOOST_PYTHON_OPTIONS
+  configure_file(${PATCH_DIR}/boost.user.jam.in ${JAM_FILE})
-  --with-python
-  --user-config=${JAM_FILE}
-)
-if(WIN32 AND BUILD_MODE STREQUAL Debug)
   set(BOOST_PYTHON_OPTIONS
-    ${BOOST_PYTHON_OPTIONS}
+    --with-python
-    define=BOOST_DEBUG_PYTHON
+    --user-config=${JAM_FILE}
   )
+  if(WIN32 AND BUILD_MODE STREQUAL Debug)
+    set(BOOST_PYTHON_OPTIONS
+      ${BOOST_PYTHON_OPTIONS}
+      define=BOOST_DEBUG_PYTHON
+    )
+  endif()
 endif()
 
 set(BOOST_OPTIONS
@@ -70,15 +64,17 @@ ExternalProject_Add(external_boost
   URL_HASH ${BOOST_HASH_TYPE}=${BOOST_HASH}
   PREFIX ${BUILD_DIR}/boost
   UPDATE_COMMAND  ""
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/boost/src/external_boost < ${PATCH_DIR}/boost.diff
+  PATCH_COMMAND ${BOOST_PATCH_COMMAND}
   CONFIGURE_COMMAND ${BOOST_CONFIGURE_COMMAND}
-  BUILD_COMMAND ${BOOST_BUILD_COMMAND} ${BOOST_BUILD_OPTIONS} -j${MAKE_THREADS} architecture=${BOOST_ARCHITECTURE} address-model=${BOOST_ADDRESS_MODEL} link=shared threading=multi ${BOOST_OPTIONS}    --prefix=${LIBDIR}/boost install
+  BUILD_COMMAND ${BOOST_BUILD_COMMAND} ${BOOST_BUILD_OPTIONS} -j${MAKE_THREADS} architecture=${BOOST_ARCHITECTURE} address-model=${BOOST_ADDRESS_MODEL} link=static threading=multi ${BOOST_OPTIONS}    --prefix=${LIBDIR}/boost install
   BUILD_IN_SOURCE 1
   INSTALL_COMMAND "${BOOST_HARVEST_CMD}"
 )
 
-add_dependencies(
+if(WITH_BOOST_PYTHON)
-  external_boost
+  add_dependencies(
-  external_python
+    external_boost
-  external_numpy
+    external_python
-)
+    external_numpy
+  )
+endif()

build_files/build_environment/cmake/boost_build_options.cmake

@@ -20,12 +20,11 @@ endif()
 set(DEFAULT_BOOST_FLAGS
   -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
   -DBoost_USE_MULTITHREADED=ON
-  -DBoost_USE_STATIC_LIBS=OFF
+  -DBoost_USE_STATIC_LIBS=ON
   -DBoost_USE_STATIC_RUNTIME=OFF
   -DBOOST_ROOT=${LIBDIR}/boost
   -DBoost_NO_SYSTEM_PATHS=ON
   -DBoost_NO_BOOST_CMAKE=ON
   -DBoost_ADDITIONAL_VERSIONS=${BOOST_VERSION_SHORT}
   -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
-  -DBoost_USE_DEBUG_PYTHON=On
 )

build_files/build_environment/cmake/check_software.cmake

@@ -19,12 +19,6 @@ if(UNIX)
     yasm
   )
 
-  if(APPLE)
-    list(APPEND _required_software dos2unix)
-  else()
-    list(APPEND _required_software patchelf)
-  endif()
-
   foreach(_software ${_required_software})
     find_program(_software_find NAMES ${_software})
     if(NOT _software_find)
@@ -52,10 +46,10 @@ if(UNIX)
       "  ${_software_missing}\n"
       "\n"
       "On Debian and Ubuntu:\n"
-      "  apt install autoconf automake bison libtool yasm tcl ninja-build meson python3-mako patchelf\n"
+      "  apt install autoconf automake bison libtool yasm tcl ninja-build meson python3-mako\n"
       "\n"
       "On macOS (with homebrew):\n"
-      "  brew install autoconf automake bison dos2unix flex libtool meson ninja pkg-config yasm\n"
+      "  brew install autoconf automake bison flex libtool meson ninja pkg-config yasm\n"
       "\n"
       "Other platforms:\n"
       "  Install equivalent packages.\n")

build_files/build_environment/cmake/download.cmake

@@ -87,7 +87,6 @@ download_source(OPENSUBDIV)
 download_source(SDL)
 download_source(OPENCOLLADA)
 download_source(OPENCOLORIO)
-download_source(MINIZIPNG)
 download_source(LLVM)
 download_source(OPENMP)
 download_source(OPENIMAGEIO)
@@ -126,7 +125,6 @@ download_source(SSL)
 download_source(SQLITE)
 download_source(EMBREE)
 download_source(USD)
-download_source(MATERIALX)
 download_source(OIDN)
 download_source(LIBGLU)
 download_source(MESA)
@@ -165,12 +163,3 @@ download_source(IGC_SPIRV_TRANSLATOR)
 download_source(GMMLIB)
 download_source(OCLOC)
 download_source(AOM)
-download_source(FRIBIDI)
-download_source(HARFBUZZ)
-download_source(SHADERC)
-download_source(SHADERC_SPIRV_TOOLS)
-download_source(SHADERC_SPIRV_HEADERS)
-download_source(SHADERC_GLSLANG)
-download_source(VULKAN_HEADERS)
-download_source(VULKAN_LOADER)
-download_source(PYBIND11)

build_files/build_environment/cmake/dpcpp.cmake

@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-# LLVM does not switch over to cpp17 until llvm 16 and building ealier versions with
-# MSVC is leading to some crashes in ISPC. Switch back to their default on all platforms
-# for now. 
-string(REPLACE "-DCMAKE_CXX_STANDARD=17" " " DPCPP_CMAKE_FLAGS "${DEFAULT_CMAKE_FLAGS}")
 
 if(WIN32)
   set(LLVM_GENERATOR "Ninja")
@@ -83,7 +79,7 @@ ExternalProject_Add(external_dpcpp
   CMAKE_GENERATOR ${LLVM_GENERATOR}
   SOURCE_SUBDIR llvm
   LIST_SEPARATOR ^^
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/dpcpp ${DPCPP_CMAKE_FLAGS} ${DPCPP_EXTRA_ARGS}
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/dpcpp ${DEFAULT_CMAKE_FLAGS} ${DPCPP_EXTRA_ARGS}
   # CONFIGURE_COMMAND
   #   ${PYTHON_BINARY}
   #   ${BUILD_DIR}/dpcpp/src/external_dpcpp/buildbot/configure.py ${DPCPP_CONFIGURE_ARGS}

build_files/build_environment/cmake/epoxy.cmake

@@ -10,7 +10,7 @@ ExternalProject_Add(external_epoxy
   URL_HASH ${EPOXY_HASH_TYPE}=${EPOXY_HASH}
   PREFIX ${BUILD_DIR}/epoxy
   PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/epoxy/src/external_epoxy/ < ${PATCH_DIR}/epoxy.diff
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && ${MESON} setup --prefix ${LIBDIR}/epoxy --default-library ${EPOXY_LIB_TYPE} --libdir lib ${BUILD_DIR}/epoxy/src/external_epoxy-build ${BUILD_DIR}/epoxy/src/external_epoxy -Dtests=false
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && meson setup --prefix ${LIBDIR}/epoxy --default-library ${EPOXY_LIB_TYPE} --libdir lib ${BUILD_DIR}/epoxy/src/external_epoxy-build ${BUILD_DIR}/epoxy/src/external_epoxy -Dtests=false
   BUILD_COMMAND ninja
   INSTALL_COMMAND ninja install
 )
@@ -23,8 +23,3 @@ if(BUILD_MODE STREQUAL Release AND WIN32)
     DEPENDEES install
   )
 endif()
-
-add_dependencies(
-  external_epoxy
-  external_python_site_packages
-)

build_files/build_environment/cmake/fmt.cmake

@@ -1,8 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 set(FMT_EXTRA_ARGS
-  -DFMT_TEST=OFF
+  -DFMT_TEST=Off
-  -DFMT_DOC=OFF
 )
 
 ExternalProject_Add(external_fmt

build_files/build_environment/cmake/freetype.cmake

@@ -32,9 +32,6 @@ add_dependencies(
 if(BUILD_MODE STREQUAL Release AND WIN32)
   ExternalProject_Add_Step(external_freetype after_install
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype ${HARVEST_TARGET}/freetype
-	# harfbuzz *NEEDS* to find freetype.lib and will not be conviced to take alternative names so just give it
-	# what it wants. 
-	COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/freetype/lib/freetype2st.lib ${LIBDIR}/freetype/lib/freetype.lib
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/fribidi.cmake

@@ -1,30 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-if(WIN32)
-  set(CONFIGURE_ENV ${CONFIGURE_ENV_MSVC})
-endif()
-
-ExternalProject_Add(external_fribidi
-  URL file://${PACKAGE_DIR}/${FRIBIDI_FILE}
-  URL_HASH ${FRIBIDI_HASH_TYPE}=${FRIBIDI_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/fribidi
-  CONFIGURE_COMMAND ${MESON} setup --prefix ${LIBDIR}/fribidi -Ddocs=false --default-library static --libdir lib ${BUILD_DIR}/fribidi/src/external_fribidi-build ${BUILD_DIR}/fribidi/src/external_fribidi
-  BUILD_COMMAND ninja
-  INSTALL_COMMAND ninja install
-  INSTALL_DIR ${LIBDIR}/fribidi
-)
-
-add_dependencies(
-  external_fribidi
-  external_python
-  external_python_site_packages
-)
-
-if(BUILD_MODE STREQUAL Release AND WIN32)
-  ExternalProject_Add_Step(external_fribidi after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/fribidi/include ${HARVEST_TARGET}/fribidi/include
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fribidi/lib/libfribidi.a ${HARVEST_TARGET}/fribidi/lib/libfribidi.lib
-    DEPENDEES install
-  )
-endif()

build_files/build_environment/cmake/harfbuzz.cmake

@@ -1,44 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-if(WIN32)
-  set(HARFBUZZ_CONFIGURE_ENV ${CONFIGURE_ENV_MSVC})
-  set(HARFBUZZ_PKG_ENV FREETYPE_DIR=${LIBDIR}/freetype)
-else()
-  set(HARFBUZZ_CONFIGURE_ENV ${CONFIGURE_ENV})
-  set(HARFBUZZ_PKG_ENV PKG_CONFIG_PATH=${LIBDIR}/freetype/lib/pkgconfig:${LIBDIR}/brotli/lib/pkgconfig:$PKG_CONFIG_PATH)
-endif()
-
-set(HARFBUZZ_EXTRA_OPTIONS
-  -Dtests=disabled
-  -Dfreetype=enabled
-  -Dglib=disabled
-  -Dgobject=disabled
-)
-
-ExternalProject_Add(external_harfbuzz
-  URL file://${PACKAGE_DIR}/${HARFBUZZ_FILE}
-  URL_HASH ${HARFBUZZ_HASH_TYPE}=${HARFBUZZ_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/harfbuzz
-  CONFIGURE_COMMAND ${HARFBUZZ_CONFIGURE_ENV} &&
-    ${CMAKE_COMMAND} -E env ${HARFBUZZ_PKG_ENV} ${MESON} setup --prefix ${LIBDIR}/harfbuzz ${HARFBUZZ_EXTRA_OPTIONS} --default-library static --libdir lib ${BUILD_DIR}/harfbuzz/src/external_harfbuzz-build ${BUILD_DIR}/harfbuzz/src/external_harfbuzz
-  BUILD_COMMAND ninja
-  INSTALL_COMMAND ninja install
-  INSTALL_DIR ${LIBDIR}/harfbuzz
-)
-
-add_dependencies(
-  external_harfbuzz
-  external_python
-  external_python_site_packages
-)
-
-if(BUILD_MODE STREQUAL Release AND WIN32)
-  ExternalProject_Add_Step(external_harfbuzz after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/harfbuzz/include ${HARVEST_TARGET}/harfbuzz/include
-    # We do not use the subset API currently, so copying only the main library will suffice for now
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/harfbuzz/lib/libharfbuzz.a ${HARVEST_TARGET}/harfbuzz/lib/libharfbuzz.lib
-    DEPENDEES install
-  )
-endif()
-

build_files/build_environment/cmake/harvest.cmake

@@ -11,270 +11,194 @@ message("HARVEST_TARGET = ${HARVEST_TARGET}")
 
 if(WIN32)
 
-if(BUILD_MODE STREQUAL Release)
+  if(BUILD_MODE STREQUAL Release)
-  add_custom_target(Harvest_Release_Results
+    add_custom_target(Harvest_Release_Results
-    COMMAND # jpeg rename libfile + copy include
+      COMMAND # jpeg rename libfile + copy include
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpeg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
+      ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpeg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpeg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpeg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
-        # png
+      # png
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib ${HARVEST_TARGET}/png/lib/libpng.lib &&
+      ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib ${HARVEST_TARGET}/png/lib/libpng.lib &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/ &&
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/ &&
-        # freeglut-> opengl
+      # freeglut-> opengl
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/freeglut/lib/freeglut_static.lib ${HARVEST_TARGET}/opengl/lib/freeglut_static.lib &&
+      ${CMAKE_COMMAND} -E copy ${LIBDIR}/freeglut/lib/freeglut_static.lib ${HARVEST_TARGET}/opengl/lib/freeglut_static.lib &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freeglut/include/ ${HARVEST_TARGET}/opengl/include/ &&
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freeglut/include/ ${HARVEST_TARGET}/opengl/include/ &&
-    DEPENDS
+      DEPENDS
-  )
-endif()
-
-else(WIN32)
-
-function(harvest from to)
-  set(pattern "")
-  foreach(f ${ARGN})
-    set(pattern ${f})
-  endforeach()
-
-  if(pattern STREQUAL "")
-    get_filename_component(dirpath ${to} DIRECTORY)
-    get_filename_component(filename ${to} NAME)
-    install(
-      FILES ${LIBDIR}/${from}
-      DESTINATION ${HARVEST_TARGET}/${dirpath}
-      RENAME ${filename}
-    )
-  else()
-    install(
-      DIRECTORY ${LIBDIR}/${from}/
-      DESTINATION ${HARVEST_TARGET}/${to}
-      USE_SOURCE_PERMISSIONS
-      FILES_MATCHING PATTERN ${pattern}
-      PATTERN "pkgconfig" EXCLUDE
-      PATTERN "cmake" EXCLUDE
-      PATTERN "__pycache__" EXCLUDE
-      PATTERN "tests" EXCLUDE
-      PATTERN "meson*" EXCLUDE
     )
   endif()
-endfunction()
 
-# Set rpath on shared libraries to $ORIGIN since all will be installed in the same
-# lib folder, and remove any absolute paths.
-#
-# Ideally this would be done as part of the Blender build since it makes assumptions
-# about where the files will be installed. However it would add patchelf as a new
-# dependency for building.
-#
-# Also removes versioned symlinks, which give errors with macOS notarization.
-if(APPLE)
-  set(set_rpath_cmd python3 ${CMAKE_CURRENT_SOURCE_DIR}/darwin/set_rpath.py @loader_path)
 else()
-  set(set_rpath_cmd patchelf --set-rpath $ORIGIN)
-endif()
 
-function(harvest_rpath_lib from to pattern)
+  function(harvest from to)
-  harvest(${from} ${to} ${pattern})
+    set(pattern "")
+    foreach(f ${ARGN})
+      set(pattern ${f})
+    endforeach()
 
-  install(CODE "\
+    if(pattern STREQUAL "")
-    cmake_policy(SET CMP0009 NEW)\n
+      get_filename_component(dirpath ${to} DIRECTORY)
-    file(GLOB_RECURSE shared_libs ${HARVEST_TARGET}/${to}/${pattern}) \n
+      get_filename_component(filename ${to} NAME)
-    foreach(f \${shared_libs}) \n
+      install(
-      if(IS_SYMLINK \${f})\n
+        FILES ${LIBDIR}/${from}
-        if(APPLE)\n
+        DESTINATION ${HARVEST_TARGET}/${dirpath}
-          file(REMOVE_RECURSE \${f})
+        RENAME ${filename}
-        endif()\n
+      )
-      else()\n
+    else()
-        execute_process(COMMAND ${set_rpath_cmd} \${f}) \n
+      install(
-      endif()\n
+        DIRECTORY ${LIBDIR}/${from}/
-    endforeach()")
+        DESTINATION ${HARVEST_TARGET}/${to}
-endfunction()
+        USE_SOURCE_PERMISSIONS
+        FILES_MATCHING PATTERN ${pattern}
+        PATTERN "pkgconfig" EXCLUDE
+        PATTERN "cmake" EXCLUDE
+        PATTERN "__pycache__" EXCLUDE
+        PATTERN "tests" EXCLUDE
+      )
+    endif()
+  endfunction()
 
-# Set rpath on utility binaries assuming they are run from their install location.
+  harvest(alembic/include alembic/include "*.h")
-function(harvest_rpath_bin from to pattern)
+  harvest(alembic/lib/libAlembic.a alembic/lib/libAlembic.a)
-  harvest(${from} ${to} ${pattern})
+  harvest(alembic/bin alembic/bin "*")
+  harvest(brotli/include brotli/include "*.h")
+  harvest(brotli/lib brotli/lib "*.a")
+  harvest(boost/include boost/include "*")
+  harvest(boost/lib boost/lib "*.a")
+  harvest(imath/include imath/include "*.h")
+  harvest(imath/lib imath/lib "*.a")
+  harvest(ffmpeg/include ffmpeg/include "*.h")
+  harvest(ffmpeg/lib ffmpeg/lib "*.a")
+  harvest(fftw3/include fftw3/include "*.h")
+  harvest(fftw3/lib fftw3/lib "*.a")
+  harvest(flac/lib sndfile/lib "libFLAC.a")
+  harvest(freetype/include freetype/include "*.h")
+  harvest(freetype/lib/libfreetype2ST.a freetype/lib/libfreetype.a)
+  harvest(epoxy/include epoxy/include "*.h")
+  harvest(epoxy/lib epoxy/lib "*.a")
+  harvest(gmp/include gmp/include "*.h")
+  harvest(gmp/lib gmp/lib "*.a")
+  harvest(jemalloc/include jemalloc/include "*.h")
+  harvest(jemalloc/lib jemalloc/lib "*.a")
+  harvest(jpeg/include jpeg/include "*.h")
+  harvest(jpeg/lib jpeg/lib "libjpeg.a")
+  harvest(lame/lib ffmpeg/lib "*.a")
+  if(NOT APPLE)
+    harvest(level-zero/include/level_zero level-zero/include/level_zero "*.h")
+    harvest(level-zero/lib level-zero/lib "*.so*")
+  endif()
+  harvest(llvm/bin llvm/bin "clang-format")
+  if(BUILD_CLANG_TOOLS)
+    harvest(llvm/bin llvm/bin "clang-tidy")
+    harvest(llvm/share/clang llvm/share "run-clang-tidy.py")
+  endif()
+  harvest(llvm/include llvm/include "*")
+  harvest(llvm/bin llvm/bin "llvm-config")
+  harvest(llvm/lib llvm/lib "libLLVM*.a")
+  harvest(llvm/lib llvm/lib "libclang*.a")
+  harvest(llvm/lib/clang llvm/lib/clang "*.h")
+  if(APPLE)
+    harvest(openmp/lib openmp/lib "*")
+    harvest(openmp/include openmp/include "*.h")
+  endif()
+  if(BLENDER_PLATFORM_ARM)
+    harvest(sse2neon sse2neon "*.h")
+  endif()
+  harvest(ogg/lib ffmpeg/lib "*.a")
+  harvest(openal/include openal/include "*.h")
+  if(UNIX AND NOT APPLE)
+    harvest(openal/lib openal/lib "*.a")
 
-  install(CODE "\
+    harvest(blosc/include blosc/include "*.h")
-    file(GLOB_RECURSE shared_libs ${HARVEST_TARGET}/${to}/${pattern}) \n
+    harvest(blosc/lib blosc/lib "*.a")
-    foreach(f \${shared_libs}) \n
-      execute_process(COMMAND ${set_rpath_cmd}/../lib; \${f}) \n
-    endforeach()")
-endfunction()
 
-# Set rpath on Python module to point to the shared libraries folder in the Blender
+    harvest(zlib/include zlib/include "*.h")
-# installation.
+    harvest(zlib/lib zlib/lib "*.a")
-function(harvest_rpath_python from to pattern)
-  harvest(${from} ${to} ${pattern})
 
-  install(CODE "\
+    harvest(xml2/include xml2/include "*.h")
-    file(GLOB_RECURSE shared_libs ${HARVEST_TARGET}/${to}/${pattern}\.so*) \n
+    harvest(xml2/lib xml2/lib "*.a")
-    foreach(f \${shared_libs}) \n
-      if(IS_SYMLINK \${f})\n
-        if(APPLE)\n
-          file(REMOVE_RECURSE \${f})
-        endif()\n
-      else()\n
-        get_filename_component(f_dir \${f} DIRECTORY) \n
-        file(RELATIVE_PATH relative_dir \${f_dir} ${HARVEST_TARGET}) \n
-        execute_process(COMMAND ${set_rpath_cmd}/\${relative_dir}../lib \${f}) \n
-      endif()\n
-    endforeach()")
-endfunction()
 
-harvest(alembic/include alembic/include "*.h")
+    harvest(wayland-protocols/share/wayland-protocols wayland-protocols/share/wayland-protocols/ "*.xml")
-harvest(alembic/lib/libAlembic.a alembic/lib/libAlembic.a)
-harvest_rpath_bin(alembic/bin alembic/bin "*")
-harvest(brotli/include brotli/include "*.h")
-harvest(brotli/lib brotli/lib "*.a")
-harvest(boost/include boost/include "*")
-harvest_rpath_lib(boost/lib boost/lib "*${SHAREDLIBEXT}*")
-harvest(imath/include imath/include "*.h")
-harvest_rpath_lib(imath/lib imath/lib "*${SHAREDLIBEXT}*")
-harvest(ffmpeg/include ffmpeg/include "*.h")
-harvest(ffmpeg/lib ffmpeg/lib "*.a")
-harvest(fftw3/include fftw3/include "*.h")
-harvest(fftw3/lib fftw3/lib "*.a")
-harvest(flac/lib sndfile/lib "libFLAC.a")
-harvest(freetype/include freetype/include "*.h")
-harvest(freetype/lib/libfreetype2ST.a freetype/lib/libfreetype.a)
-harvest(fribidi/include fribidi/include "*.h")
-harvest(fribidi/lib fribidi/lib "*.a")
-harvest(epoxy/include epoxy/include "*.h")
-harvest(epoxy/lib epoxy/lib "*.a")
-harvest(gmp/include gmp/include "*.h")
-harvest(gmp/lib gmp/lib "*.a")
-harvest(harfbuzz/include harfbuzz/include "*.h")
-harvest(harfbuzz/lib harfbuzz/lib "*.a")
-harvest(jemalloc/include jemalloc/include "*.h")
-harvest(jemalloc/lib jemalloc/lib "*.a")
-harvest(jpeg/include jpeg/include "*.h")
-harvest(jpeg/lib jpeg/lib "libjpeg.a")
-harvest(lame/lib ffmpeg/lib "*.a")
-if(NOT APPLE)
-  harvest(level-zero/include/level_zero level-zero/include/level_zero "*.h")
-  harvest(level-zero/lib level-zero/lib "*${SHAREDLIBEXT}*")
-endif()
-harvest(llvm/bin llvm/bin "clang-format")
-if(BUILD_CLANG_TOOLS)
-  harvest(llvm/bin llvm/bin "clang-tidy")
-  harvest(llvm/share/clang llvm/share "run-clang-tidy.py")
-endif()
-harvest(llvm/include llvm/include "*")
-harvest(llvm/bin llvm/bin "llvm-config")
-harvest(llvm/lib llvm/lib "libLLVM*.a")
-harvest(llvm/lib llvm/lib "libclang*.a")
-harvest(llvm/lib/clang llvm/lib/clang "*.h")
-if(APPLE)
-  harvest(openmp/lib openmp/lib "libomp.dylib")
-  harvest(openmp/include openmp/include "*.h")
-endif()
-if(BLENDER_PLATFORM_ARM)
-  harvest(sse2neon sse2neon "*.h")
-endif()
-harvest(ogg/lib ffmpeg/lib "*.a")
-harvest(openal/include openal/include "*.h")
-if(UNIX AND NOT APPLE)
-  harvest(openal/lib openal/lib "*.a")
-
-  harvest(zlib/include zlib/include "*.h")
-  harvest(zlib/lib zlib/lib "*.a")
-
-  harvest(xml2/include xml2/include "*.h")
-  harvest(xml2/lib xml2/lib "*.a")
-
-  harvest(wayland-protocols/share/wayland-protocols wayland-protocols/share/wayland-protocols/ "*.xml")
     harvest(wayland/bin wayland/bin "wayland-scanner")
     harvest(wayland/include wayland/include "*.h")
     harvest(wayland_libdecor/include wayland_libdecor/include "*.h")
   else()
     harvest(blosc/lib openvdb/lib "*.a")
-  harvest(xml2/lib opencollada/lib "*.a")
+    harvest(xml2/lib opencollada/lib "*.a")
-endif()
+  endif()
-harvest(opencollada/include/opencollada opencollada/include "*.h")
+  harvest(opencollada/include/opencollada opencollada/include "*.h")
-harvest(opencollada/lib/opencollada opencollada/lib "*.a")
+  harvest(opencollada/lib/opencollada opencollada/lib "*.a")
-harvest(opencolorio/include opencolorio/include "*.h")
+  harvest(opencolorio/include opencolorio/include "*.h")
-harvest_rpath_lib(opencolorio/lib opencolorio/lib "*${SHAREDLIBEXT}*")
+  harvest(opencolorio/lib opencolorio/lib "*.a")
-harvest_rpath_python(opencolorio/lib/python${PYTHON_SHORT_VERSION} python/lib/python${PYTHON_SHORT_VERSION} "*")
+  harvest(opencolorio/lib/static opencolorio/lib "*.a")
-harvest(openexr/include openexr/include "*.h")
+  harvest(openexr/include openexr/include "*.h")
-harvest_rpath_lib(openexr/lib openexr/lib "*${SHAREDLIBEXT}*")
+  harvest(openexr/lib openexr/lib "*.a")
-harvest_rpath_bin(openimageio/bin openimageio/bin "idiff")
+  harvest(openimageio/bin openimageio/bin "idiff")
-harvest_rpath_bin(openimageio/bin openimageio/bin "maketx")
+  harvest(openimageio/bin openimageio/bin "maketx")
-harvest_rpath_bin(openimageio/bin openimageio/bin "oiiotool")
+  harvest(openimageio/bin openimageio/bin "oiiotool")
-harvest(openimageio/include openimageio/include "*")
+  harvest(openimageio/include openimageio/include "*")
-harvest_rpath_lib(openimageio/lib openimageio/lib "*${SHAREDLIBEXT}*")
+  harvest(openimageio/lib openimageio/lib "*.a")
-harvest_rpath_python(openimageio/lib/python${PYTHON_SHORT_VERSION} python/lib/python${PYTHON_SHORT_VERSION} "*")
+  harvest(openimagedenoise/include openimagedenoise/include "*")
-harvest(openimagedenoise/include openimagedenoise/include "*")
+  harvest(openimagedenoise/lib openimagedenoise/lib "*.a")
-harvest(openimagedenoise/lib openimagedenoise/lib "*.a")
+  harvest(embree/include embree/include "*.h")
-harvest(embree/include embree/include "*.h")
+  harvest(embree/lib embree/lib "*.a")
-harvest(embree/lib embree/lib "*.a")
+  harvest(openpgl/include openpgl/include "*.h")
-harvest(openpgl/include openpgl/include "*.h")
+  harvest(openpgl/lib openpgl/lib "*.a")
-harvest(openpgl/lib openpgl/lib "*.a")
+  harvest(openpgl/lib/cmake/openpgl-${OPENPGL_SHORT_VERSION} openpgl/lib/cmake/openpgl "*.cmake")
-harvest(openpgl/lib/cmake/openpgl-${OPENPGL_SHORT_VERSION} openpgl/lib/cmake/openpgl "*.cmake")
+  harvest(openjpeg/include/openjpeg-${OPENJPEG_SHORT_VERSION} openjpeg/include "*.h")
-harvest(openjpeg/include/openjpeg-${OPENJPEG_SHORT_VERSION} openjpeg/include "*.h")
+  harvest(openjpeg/lib openjpeg/lib "*.a")
-harvest(openjpeg/lib openjpeg/lib "*.a")
+  harvest(opensubdiv/include opensubdiv/include "*.h")
-harvest(opensubdiv/include opensubdiv/include "*.h")
+  harvest(opensubdiv/lib opensubdiv/lib "*.a")
-harvest_rpath_lib(opensubdiv/lib opensubdiv/lib "*${SHAREDLIBEXT}*")
+  harvest(openvdb/include/openvdb openvdb/include/openvdb "*.h")
-harvest(openvdb/include/openvdb openvdb/include/openvdb "*.h")
+  harvest(openvdb/include/nanovdb openvdb/include/nanovdb "*.h")
-harvest(openvdb/include/nanovdb openvdb/include/nanovdb "*.h")
+  harvest(openvdb/lib openvdb/lib "*.a")
-harvest_rpath_lib(openvdb/lib openvdb/lib "*${SHAREDLIBEXT}*")
+  harvest(xr_openxr_sdk/include/openxr xr_openxr_sdk/include/openxr "*.h")
-harvest_rpath_python(openvdb/lib/python${PYTHON_SHORT_VERSION} python/lib/python${PYTHON_SHORT_VERSION} "*pyopenvdb*")
+  harvest(xr_openxr_sdk/lib xr_openxr_sdk/lib "*.a")
-harvest(xr_openxr_sdk/include/openxr xr_openxr_sdk/include/openxr "*.h")
+  harvest(osl/bin osl/bin "oslc")
-harvest(xr_openxr_sdk/lib xr_openxr_sdk/lib "*.a")
+  harvest(osl/include osl/include "*.h")
-harvest_rpath_bin(osl/bin osl/bin "oslc")
+  harvest(osl/lib osl/lib "*.a")
-harvest(osl/include osl/include "*.h")
+  harvest(osl/share/OSL/shaders osl/share/OSL/shaders "*.h")
-harvest(osl/lib osl/lib "*.a")
+  harvest(png/include png/include "*.h")
-harvest(osl/share/OSL/shaders osl/share/OSL/shaders "*.h")
+  harvest(png/lib png/lib "*.a")
-harvest(png/include png/include "*.h")
+  harvest(pugixml/include pugixml/include "*.hpp")
-harvest(png/lib png/lib "*.a")
+  harvest(pugixml/lib pugixml/lib "*.a")
-harvest(pugixml/include pugixml/include "*.hpp")
+  harvest(python/bin python/bin "python${PYTHON_SHORT_VERSION}")
-harvest(pugixml/lib pugixml/lib "*.a")
+  harvest(python/include python/include "*h")
-harvest(python/bin python/bin "python${PYTHON_SHORT_VERSION}")
+  harvest(python/lib python/lib "*")
-harvest(python/include python/include "*h")
+  harvest(sdl/include/SDL2 sdl/include "*.h")
-harvest(python/lib python/lib "*")
+  harvest(sdl/lib sdl/lib "libSDL2.a")
-harvest(sdl/include/SDL2 sdl/include "*.h")
+  harvest(sndfile/include sndfile/include "*.h")
-harvest(sdl/lib sdl/lib "libSDL2.a")
+  harvest(sndfile/lib sndfile/lib "*.a")
-harvest(sndfile/include sndfile/include "*.h")
+  harvest(spnav/include spnav/include "*.h")
-harvest(sndfile/lib sndfile/lib "*.a")
+  harvest(spnav/lib spnav/lib "*.a")
-harvest(spnav/include spnav/include "*.h")
+  harvest(tbb/include tbb/include "*.h")
-harvest(spnav/lib spnav/lib "*.a")
+  harvest(tbb/lib/libtbb_static.a tbb/lib/libtbb.a)
-harvest(tbb/include tbb/include "*.h")
+  harvest(theora/lib ffmpeg/lib "*.a")
-harvest_rpath_lib(tbb/lib tbb/lib "libtbb${SHAREDLIBEXT}")
+  harvest(tiff/include tiff/include "*.h")
-harvest(theora/lib ffmpeg/lib "*.a")
+  harvest(tiff/lib tiff/lib "*.a")
-harvest(tiff/include tiff/include "*.h")
+  harvest(vorbis/lib ffmpeg/lib "*.a")
-harvest(tiff/lib tiff/lib "*.a")
+  harvest(opus/lib ffmpeg/lib "*.a")
-harvest(vorbis/lib ffmpeg/lib "*.a")
+  harvest(vpx/lib ffmpeg/lib "*.a")
-harvest(opus/lib ffmpeg/lib "*.a")
+  harvest(x264/lib ffmpeg/lib "*.a")
-harvest(vpx/lib ffmpeg/lib "*.a")
+  harvest(xvidcore/lib ffmpeg/lib "*.a")
-harvest(x264/lib ffmpeg/lib "*.a")
+  harvest(aom/lib ffmpeg/lib "*.a")
-harvest(xvidcore/lib ffmpeg/lib "*.a")
+  harvest(webp/lib webp/lib "*.a")
-harvest(aom/lib ffmpeg/lib "*.a")
+  harvest(webp/include webp/include "*.h")
-harvest(webp/lib webp/lib "*.a")
+  harvest(usd/include usd/include "*.h")
-harvest(webp/include webp/include "*.h")
+  harvest(usd/lib/usd usd/lib/usd "*")
-harvest(usd/include usd/include "*.h")
+  harvest(usd/plugin usd/plugin "*")
-harvest_rpath_lib(usd/lib usd/lib "libusd_ms${SHAREDLIBEXT}")
+  harvest(potrace/include potrace/include "*.h")
-harvest(usd/lib/usd usd/lib/usd "*")
+  harvest(potrace/lib potrace/lib "*.a")
-harvest_rpath_python(usd/lib/python/pxr python/lib/python${PYTHON_SHORT_VERSION}/site-packages/pxr "*")
+  harvest(haru/include haru/include "*.h")
-harvest(usd/plugin usd/plugin "*")
+  harvest(haru/lib haru/lib "*.a")
-harvest(materialx/include materialx/include "*.h")
+  harvest(zstd/include zstd/include "*.h")
-harvest_rpath_lib(materialx/lib materialx/lib "*${SHAREDLIBEXT}*")
+  harvest(zstd/lib zstd/lib "*.a")
-harvest(materialx/libraries materialx/libraries "*")
-harvest(materialx/lib/cmake/MaterialX materialx/lib/cmake/MaterialX "*.cmake")
-harvest_rpath_python(materialx/python/MaterialX python/lib/python${PYTHON_SHORT_VERSION}/site-packages/MaterialX "*")
-# We do not need anything from the resources folder, but the MaterialX config
-# file will complain if the folder does not exist, so just copy the readme.md
-# files to ensure the folder will exist.
-harvest(materialx/resources materialx/resources "README.md")
-harvest(potrace/include potrace/include "*.h")
-harvest(potrace/lib potrace/lib "*.a")
-harvest(haru/include haru/include "*.h")
-harvest(haru/lib haru/lib "*.a")
-harvest(zstd/include zstd/include "*.h")
-harvest(zstd/lib zstd/lib "*.a")
 
-if(UNIX AND NOT APPLE)
+  if(UNIX AND NOT APPLE)
-  harvest(libglu/lib mesa/lib "*${SHAREDLIBEXT}*")
+    harvest(libglu/lib mesa/lib "*.so*")
-  harvest(mesa/lib64 mesa/lib "*${SHAREDLIBEXT}*")
+    harvest(mesa/lib64 mesa/lib "*.so*")
+
+    harvest(dpcpp dpcpp "*")
+    harvest(igc dpcpp/lib/igc "*")
+    harvest(ocloc dpcpp/lib/ocloc "*")
+  endif()
 
-  harvest(dpcpp dpcpp "*")
-  harvest(igc dpcpp/lib/igc "*")
-  harvest(ocloc dpcpp/lib/ocloc "*")
-endif()
 endif()

build_files/build_environment/cmake/imath.cmake

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 set(IMATH_EXTRA_ARGS
-  -DBUILD_SHARED_LIBS=ON
+  -DBUILD_SHARED_LIBS=OFF
   -DBUILD_TESTING=OFF
   -DIMATH_LIB_SUFFIX=${OPENEXR_VERSION_BUILD_POSTFIX}
 )
@@ -11,7 +11,6 @@ ExternalProject_Add(external_imath
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${IMATH_HASH_TYPE}=${IMATH_HASH}
   PREFIX ${BUILD_DIR}/imath
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/imath ${DEFAULT_CMAKE_FLAGS} ${IMATH_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/imath
 )
@@ -20,7 +19,6 @@ if(WIN32)
   ExternalProject_Add_Step(external_imath after_install
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/imath/lib ${HARVEST_TARGET}/imath/lib
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/imath/include ${HARVEST_TARGET}/imath/include
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/imath/bin/imath${OPENEXR_VERSION_POSTFIX}.dll ${HARVEST_TARGET}/imath/bin/imath${OPENEXR_VERSION_POSTFIX}.dll
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/llvm.cmake

@@ -13,11 +13,9 @@ if(APPLE)
   )
   set(LLVM_BUILD_CLANG_TOOLS_EXTRA ^^clang-tools-extra)
   set(BUILD_CLANG_TOOLS ON)
-else()
-  # NVIDIA PTX for OSL on Windows and Linux.
-  set(LLVM_TARGETS ${LLVM_TARGETS}$<SEMICOLON>NVPTX)
 endif()
 
+
 set(LLVM_EXTRA_ARGS
   -DLLVM_USE_CRT_RELEASE=MD
   -DLLVM_USE_CRT_DEBUG=MDd
@@ -40,11 +38,6 @@ else()
   set(LLVM_GENERATOR "Unix Makefiles")
 endif()
 
-# LLVM does not switch over to cpp17 until llvm 16 and building ealier versions with
-# MSVC is leading to some crashes in ISPC. Switch back to their default on all platforms
-# for now. 
-string(REPLACE "-DCMAKE_CXX_STANDARD=17" " " LLVM_CMAKE_FLAGS "${DEFAULT_CMAKE_FLAGS}")
-
 # short project name due to long filename issues on windows
 ExternalProject_Add(ll
   URL file://${PACKAGE_DIR}/${LLVM_FILE}
@@ -55,7 +48,7 @@ ExternalProject_Add(ll
   PREFIX ${BUILD_DIR}/ll
   SOURCE_SUBDIR llvm
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/ll/src/ll < ${PATCH_DIR}/llvm.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/llvm ${LLVM_CMAKE_FLAGS} ${LLVM_EXTRA_ARGS}
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/llvm ${DEFAULT_CMAKE_FLAGS} ${LLVM_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/llvm
 )
 

build_files/build_environment/cmake/materialx.cmake

@@ -1,57 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(MATERIALX_EXTRA_ARGS
-  -DMATERIALX_BUILD_PYTHON=ON
-  -DMATERIALX_BUILD_RENDER=OFF
-  -DMATERIALX_INSTALL_PYTHON=OFF
-  -DMATERIALX_PYTHON_EXECUTABLE=${PYTHON_BINARY}
-  -DMATERIALX_PYTHON_VERSION=${PYTHON_SHORT_VERSION}
-  -DMATERIALX_BUILD_SHARED_LIBS=ON
-  -DCMAKE_DEBUG_POSTFIX=_d
-  -Dpybind11_ROOT=${LIBDIR}/pybind11
-  -DPython_EXECUTABLE=${PYTHON_BINARY}
-)
-
-ExternalProject_Add(external_materialx
-  URL file://${PACKAGE_DIR}/${MATERIALX_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${MATERIALX_HASH_TYPE}=${MATERIALX_HASH}
-  PREFIX ${BUILD_DIR}/materialx
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/materialx/src/external_materialx < ${PATCH_DIR}/materialx.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/materialx ${DEFAULT_CMAKE_FLAGS} ${MATERIALX_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/materialx
-)
-
-if(WIN32)
-  set(MATERIALX_PYTHON_TARGET ${HARVEST_TARGET}/materialx/python/${BUILD_MODE})
-  string(REPLACE "/" "\\" MATERIALX_PYTHON_TARGET_DOS "${MATERIALX_PYTHON_TARGET}")
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_materialx after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/include ${HARVEST_TARGET}/materialx/include
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/libraries ${HARVEST_TARGET}/materialx/libraries
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/lib/ ${HARVEST_TARGET}/materialx/lib/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/bin/ ${HARVEST_TARGET}/materialx/bin/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/python/ ${MATERIALX_PYTHON_TARGET}
-      COMMAND del ${MATERIALX_PYTHON_TARGET_DOS}\\MaterialX\\*.lib
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_materialx after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/lib/ ${HARVEST_TARGET}/materialx/lib/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/bin/ ${HARVEST_TARGET}/materialx/bin/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/python/ ${MATERIALX_PYTHON_TARGET}
-      COMMAND del ${MATERIALX_PYTHON_TARGET_DOS}\\MaterialX\\*.lib
-      DEPENDEES install
-    )
-  endif()
-  unset(MATERIALX_PYTHON_TARGET)
-  unset(MATERIALX_PYTHON_TARGET_DOS)
-endif()
-
-add_dependencies(
-  external_materialx
-  external_python
-  external_pybind11
-)

build_files/build_environment/cmake/mesa.cmake

@@ -43,7 +43,7 @@ ExternalProject_Add(external_mesa
   PREFIX ${BUILD_DIR}/mesa
   CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
     cd ${BUILD_DIR}/mesa/src/external_mesa/ &&
-    ${MESON} ${BUILD_DIR}/mesa/src/external_mesa-build --prefix=${LIBDIR}/mesa ${MESA_EXTRA_FLAGS}
+    meson ${BUILD_DIR}/mesa/src/external_mesa-build --prefix=${LIBDIR}/mesa ${MESA_EXTRA_FLAGS}
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/mesa/src/external_mesa-build && ninja -j${MAKE_THREADS}
   INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/mesa/src/external_mesa-build && ninja install
   INSTALL_DIR ${LIBDIR}/mesa
@@ -52,5 +52,4 @@ ExternalProject_Add(external_mesa
 add_dependencies(
   external_mesa
   ll
-  external_zlib
 )

build_files/build_environment/cmake/minizipng.cmake

@@ -1,33 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(MINIZIPNG_EXTRA_ARGS
-  -DMZ_FETCH_LIBS=OFF
-  -DMZ_LIBCOMP=OFF
-  -DMZ_PKCRYPT=OFF
-  -DMZ_WZAES=OFF
-  -DMZ_OPENSSL=OFF
-  -DMZ_SIGNING=OFF
-  -DMZ_LZMA=OFF
-  -DMZ_ZSTD=OFF
-  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-  -DBZIP2_LIBRARY=${LIBDIR}/bzip2/lib/${LIBPREFIX}bz2${LIBEXT}
-  -DBZIP2_INCLUDE_DIR=${LIBDIR}/bzip2/include/
-  # Because OCIO hardcodes a non standard include path
-  -DCMAKE_INSTALL_INCLUDEDIR=${LIBDIR}/minizipng/include/minizip-ng
-)
-
-ExternalProject_Add(external_minizipng
-  URL file://${PACKAGE_DIR}/${MINIZIPNG_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${MINIZIPNG_HASH_TYPE}=${MINIZIPNG_HASH}
-  PREFIX ${BUILD_DIR}/minizipng
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/minizipng ${DEFAULT_CMAKE_FLAGS} ${MINIZIPNG_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/minizipng
-)
-
-add_dependencies(
-  external_minizipng
-  external_zlib
-)

build_files/build_environment/cmake/opencollada.cmake

@@ -9,17 +9,13 @@ if(UNIX)
   # as does the OPENCOLLADA package, if this can be corrected upstream that would be better.
   # For now use `sed` to force UNIX line endings so the patch applies.
   # Needed as neither ignoring white-space or applying as a binary resolve this problem.
-  if(APPLE)
-    set(_dos2unix dos2unix)
-  else()
-    set(_dos2unix sed -i "s/\\r//")
-  endif()
   set(PATCH_MAYBE_DOS2UNIX_CMD
-    ${_dos2unix}
+    sed -i "s/\\r//"
     ${PATCH_DIR}/opencollada.diff
     ${BUILD_DIR}/opencollada/src/external_opencollada/CMakeLists.txt
     ${BUILD_DIR}/opencollada/src/external_opencollada/Externals/LibXML/CMakeLists.txt &&
   )
+
 else()
   set(OPENCOLLADA_EXTRA_ARGS
     -DCMAKE_DEBUG_POSTFIX=_d

build_files/build_environment/cmake/opencolorio.cmake

@@ -2,10 +2,10 @@
 
 set(OPENCOLORIO_EXTRA_ARGS
   -DOCIO_BUILD_APPS=OFF
-  -DOCIO_BUILD_PYTHON=ON
+  -DOCIO_BUILD_PYTHON=OFF
   -DOCIO_BUILD_NUKE=OFF
   -DOCIO_BUILD_JAVA=OFF
-  -DBUILD_SHARED_LIBS=ON
+  -DBUILD_SHARED_LIBS=OFF
   -DOCIO_BUILD_DOCS=OFF
   -DOCIO_BUILD_TESTS=OFF
   -DOCIO_BUILD_GPU_TESTS=OFF
@@ -15,30 +15,10 @@ set(OPENCOLORIO_EXTRA_ARGS
 
   -Dexpat_ROOT=${LIBDIR}/expat
   -Dyaml-cpp_ROOT=${LIBDIR}/yamlcpp
-  -Dyaml-cpp_VERSION=${YAMLCPP_VERSION}
   -Dpystring_ROOT=${LIBDIR}/pystring
   -DImath_ROOT=${LIBDIR}/imath
-  -Dminizip-ng_ROOT=${LIBDIR}/minizipng
-  -Dminizip-ng_INCLUDE_DIR=${LIBDIR}/minizipng/include
-  -Dminizip-ng_LIBRARY=${LIBDIR}/minizipng/lib/libminizip${LIBEXT}
-  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-  -DPython_EXECUTABLE=${PYTHON_BINARY}
-  -Dpybind11_ROOT=${LIBDIR}/pybind11
 )
 
-if(APPLE)
-  set(OPENCOLORIO_EXTRA_ARGS
-    ${OPENCOLORIO_EXTRA_ARGS}
-    "-DCMAKE_SHARED_LINKER_FLAGS=-liconv ${LIBDIR}/bzip2/lib/${LIBPREFIX}bz2${LIBEXT}"
-  )
-elseif(UNIX)
-  set(OPENCOLORIO_EXTRA_ARGS
-    ${OPENCOLORIO_EXTRA_ARGS}
-    "-DCMAKE_SHARED_LINKER_FLAGS=${LIBDIR}/bzip2/lib/${LIBPREFIX}bz2${LIBEXT}"
-  )
-endif()
-
 if(BLENDER_PLATFORM_ARM)
   set(OPENCOLORIO_EXTRA_ARGS
     ${OPENCOLORIO_EXTRA_ARGS}
@@ -47,16 +27,11 @@ if(BLENDER_PLATFORM_ARM)
 endif()
 
 if(WIN32)
-  set(OPENCOLORIO_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIMATH_DLL")
-  if(BUILD_MODE STREQUAL Debug)
-    set(OPENCOLORIO_CXX_FLAGS "${OPENCOLORIO_CXX_FLAGS} -DPy_DEBUG")
-  endif()
   set(OPENCOLORIO_EXTRA_ARGS
     ${OPENCOLORIO_EXTRA_ARGS}
-    -DCMAKE_DEBUG_POSTFIX=_d
+    -Dexpat_LIBRARY=${LIBDIR}/expat/lib/libexpatMD
-    -Dexpat_LIBRARY=${LIBDIR}/expat/lib/libexpat$<$<STREQUAL:${BUILD_MODE},Debug>:d>MD${LIBEXT}
+    -Dyaml-cpp_LIBRARY=${LIBDIR}/expat/lib/libyaml-cppmd.lib
-    -DImath_LIBRARY=${LIBDIR}/imath/lib/imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+    -DImath_LIBRARY=${LIBDIR}/imath/lib/imath${OPENEXR_VERSION_POSTFIX}
-    -DCMAKE_CXX_FLAGS=${OPENCOLORIO_CXX_FLAGS}
   )
 else()
   set(OPENCOLORIO_EXTRA_ARGS
@@ -68,7 +43,6 @@ ExternalProject_Add(external_opencolorio
   URL file://${PACKAGE_DIR}/${OPENCOLORIO_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OPENCOLORIO_HASH_TYPE}=${OPENCOLORIO_HASH}
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/opencolorio
   PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencolorio/src/external_opencolorio < ${PATCH_DIR}/opencolorio.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencolorio ${DEFAULT_CMAKE_FLAGS} ${OPENCOLORIO_EXTRA_ARGS}
@@ -81,26 +55,25 @@ add_dependencies(
   external_expat
   external_imath
   external_pystring
-  external_zlib
-  external_minizipng
-  external_python
-  external_pybind11
 )
 
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_opencolorio after_install
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/include ${HARVEST_TARGET}/opencolorio/include
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/bin/OpenColorIO_2_2.dll ${HARVEST_TARGET}/opencolorio/bin/OpenColorIO_2_2.dll
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/lib ${HARVEST_TARGET}/opencolorio/lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/libyaml-cppmd.lib ${HARVEST_TARGET}/opencolorio/lib/libyaml-cpp.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/expat/lib/libexpatMD.lib ${HARVEST_TARGET}/opencolorio/lib/libexpatMD.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pystring/lib/pystring.lib ${HARVEST_TARGET}/opencolorio/lib/pystring.lib
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_opencolorio after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/bin/OpenColorIO_d_2_2.dll ${HARVEST_TARGET}/opencolorio/bin/OpenColorIO_d_2_2.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/lib/Opencolorio.lib ${HARVEST_TARGET}/opencolorio/lib/OpencolorIO_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/lib/Opencolorio_d.lib ${HARVEST_TARGET}/opencolorio/lib/OpenColorIO_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/libyaml-cppmdd.lib ${HARVEST_TARGET}/opencolorio/lib/libyaml-cpp_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/lib/site-packages ${HARVEST_TARGET}/opencolorio/lib/site-packages-debug
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/expat/lib/libexpatdMD.lib ${HARVEST_TARGET}/opencolorio/lib/libexpatdMD.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pystring/lib/pystring.lib ${HARVEST_TARGET}/opencolorio/lib/pystring_d.lib
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/openexr.cmake

@@ -16,7 +16,7 @@ set(OPENEXR_EXTRA_ARGS
   -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
   -DBUILD_TESTING=OFF
   -DOPENEXR_BUILD_BOTH_STATIC_SHARED=OFF
-  -DBUILD_SHARED_LIBS=ON
+  -DBUILD_SHARED_LIBS=OFF
   -DOPENEXR_INSTALL_TOOLS=OFF
   -DOPENEXR_INSTALL_EXAMPLES=OFF
   -DImath_DIR=${LIBDIR}/imath/lib/cmake/Imath
@@ -27,7 +27,6 @@ ExternalProject_Add(external_openexr
   URL file://${PACKAGE_DIR}/${OPENEXR_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OPENEXR_HASH_TYPE}=${OPENEXR_HASH}
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/openexr
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr ${DEFAULT_CMAKE_FLAGS} ${OPENEXR_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/openexr
@@ -37,11 +36,6 @@ if(WIN32)
   ExternalProject_Add_Step(external_openexr after_install
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${HARVEST_TARGET}/openexr/lib
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/include ${HARVEST_TARGET}/openexr/include
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/bin/Iex${OPENEXR_VERSION_POSTFIX}.dll ${HARVEST_TARGET}/openexr/bin/Iex${OPENEXR_VERSION_POSTFIX}.dll
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/bin/IlmThread${OPENEXR_VERSION_POSTFIX}.dll ${HARVEST_TARGET}/openexr/bin/IlmThread${OPENEXR_VERSION_POSTFIX}.dll
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/bin/OpenEXRCore${OPENEXR_VERSION_POSTFIX}.dll ${HARVEST_TARGET}/openexr/bin/OpenEXRCore${OPENEXR_VERSION_POSTFIX}.dll
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/bin/OpenEXRUtil${OPENEXR_VERSION_POSTFIX}.dll ${HARVEST_TARGET}/openexr/bin/OpenEXRUtil${OPENEXR_VERSION_POSTFIX}.dll
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/bin/OpenEXR${OPENEXR_VERSION_POSTFIX}.dll ${HARVEST_TARGET}/openexr/bin/OpenEXR${OPENEXR_VERSION_POSTFIX}.dll
     DEPENDEES install
   )
 endif()
@@ -49,5 +43,4 @@ endif()
 add_dependencies(
   external_openexr
   external_zlib
-  external_imath
 )

build_files/build_environment/cmake/openimageio.cmake

@@ -15,16 +15,14 @@ else()
 endif()
 
 if(WIN32)
+  set(PNG_LIBNAME libpng16_static${LIBEXT})
   set(OIIO_SIMD_FLAGS -DUSE_SIMD=sse2)
   set(OPENJPEG_POSTFIX _msvc)
   if(BUILD_MODE STREQUAL Debug)
     set(TIFF_POSTFIX d)
-    set(PNG_POSTFIX d)
   else()
     set(TIFF_POSTFIX)
-    set(PNG_POSTFIX)
   endif()
-  set(PNG_LIBNAME libpng16_static${PNG_POSTFIX}${LIBEXT})
 else()
   set(PNG_LIBNAME libpng${LIBEXT})
   set(OIIO_SIMD_FLAGS)
@@ -42,7 +40,7 @@ else()
 endif()
 
 set(OPENIMAGEIO_EXTRA_ARGS
-  -DBUILD_SHARED_LIBS=ON
+  -DBUILD_SHARED_LIBS=OFF
   ${OPENIMAGEIO_LINKSTATIC}
   ${DEFAULT_BOOST_FLAGS}
   -DUSE_LIBSQUISH=OFF
@@ -56,7 +54,7 @@ set(OPENIMAGEIO_EXTRA_ARGS
   -DUSE_OPENGL=OFF
   -DUSE_TBB=OFF
   -DUSE_QT=OFF
-  -DUSE_PYTHON=ON
+  -DUSE_PYTHON=OFF
   -DUSE_GIF=OFF
   -DUSE_OPENCV=OFF
   -DUSE_OPENJPEG=ON
@@ -78,14 +76,13 @@ set(OPENIMAGEIO_EXTRA_ARGS
   -DJPEG_LIBRARY=${LIBDIR}/jpeg/lib/${JPEG_LIBRARY}
   -DJPEG_INCLUDE_DIR=${LIBDIR}/jpeg/include
   ${OPENJPEG_FLAGS}
-  -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${OPENEXR_VERSION_POSTFIX}${SHAREDLIBEXT}
+  -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-  -DOPENEXR_IEX_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${SHAREDLIBEXT}
+  -DOPENEXR_IEX_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-  -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${SHAREDLIBEXT}
+  -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
   -DSTOP_ON_WARNING=OFF
   -DUSE_EXTERNAL_PUGIXML=ON
   -DPUGIXML_LIBRARY=${LIBDIR}/pugixml/lib/${LIBPREFIX}pugixml${LIBEXT}
   -DPUGIXML_INCLUDE_DIR=${LIBDIR}/pugixml/include/
-  -Dpugixml_DIR=${LIBDIR}/pugixml/lib/cmake/pugixml
   -DBUILD_MISSING_ROBINMAP=OFF
   -DBUILD_MISSING_FMT=OFF
   -DFMT_INCLUDE_DIR=${LIBDIR}/fmt/include/
@@ -94,15 +91,12 @@ set(OPENIMAGEIO_EXTRA_ARGS
   ${OIIO_SIMD_FLAGS}
   -DOpenEXR_ROOT=${LIBDIR}/openexr
   -DImath_ROOT=${LIBDIR}/imath
-  -Dpybind11_ROOT=${LIBDIR}/pybind11
-  -DPython_EXECUTABLE=${PYTHON_BINARY}
 )
 
 ExternalProject_Add(external_openimageio
   URL file://${PACKAGE_DIR}/${OPENIMAGEIO_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OPENIMAGEIO_HASH_TYPE}=${OPENIMAGEIO_HASH}
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/openimageio
   PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimageio ${DEFAULT_CMAKE_FLAGS} ${OPENIMAGEIO_EXTRA_ARGS}
@@ -123,8 +117,6 @@ add_dependencies(
   external_robinmap
   external_openjpeg${OPENJPEG_POSTFIX}
   external_webp
-  external_python
-  external_pybind11
 )
 
 if(WIN32)
@@ -133,8 +125,7 @@ if(WIN32)
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/idiff.exe ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/OpenImageIO.dll ${HARVEST_TARGET}/OpenImageIO/bin/OpenImageIO.dll
+
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/OpenImageIO_Util.dll ${HARVEST_TARGET}/OpenImageIO/bin/OpenImageIO_Util.dll
       DEPENDEES install
     )
   endif()
@@ -142,9 +133,6 @@ if(WIN32)
     ExternalProject_Add_Step(external_openimageio after_install
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_d.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_Util_d.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/OpenImageIO_d.dll ${HARVEST_TARGET}/OpenImageIO/bin/OpenImageIO_d.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/OpenImageIO_Util_d.dll ${HARVEST_TARGET}/OpenImageIO/bin/OpenImageIO_Util_d.dll
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib/python${PYTHON_SHORT_VERSION}/ ${HARVEST_TARGET}/OpenImageIO/lib/python${PYTHON_SHORT_VERSION}_debug/
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/opensubdiv.cmake

@@ -32,7 +32,7 @@ else()
   set(OPENSUBDIV_EXTRA_ARGS
     ${OPENSUBDIV_EXTRA_ARGS}
     -DTBB_INCLUDE_DIR=${LIBDIR}/tbb/include
-    -DTBB_tbb_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb${SHAREDLIBEXT}
+    -DTBB_tbb_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
   )
 endif()
 

build_files/build_environment/cmake/openvdb.cmake

@@ -4,14 +4,23 @@ if(BUILD_MODE STREQUAL Debug)
   set(BLOSC_POST _d)
 endif()
 
+if(WIN32)
+  set(OPENVDB_SHARED ON)
+  set(OPENVDB_STATIC OFF)
+else()
+  set(OPENVDB_SHARED OFF)
+  set(OPENVDB_STATIC ON)
+endif()
+
 set(OPENVDB_EXTRA_ARGS
   ${DEFAULT_BOOST_FLAGS}
-  -DUSE_STATIC_DEPENDENCIES=OFF   # This is the global toggle for static libs
+  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-  # Once the above switch is off, you can set it
+  -DBoost_USE_MULTITHREADED=ON
-  # for each individual library below.
+  -DBoost_USE_STATIC_LIBS=ON
-  -DBLOSC_USE_STATIC_LIBS=ON
+  -DBoost_USE_STATIC_RUNTIME=OFF
-  -DTBB_USE_STATIC_LIBS=OFF
+  -DBOOST_ROOT=${LIBDIR}/boost
-  -DBoost_USE_STATIC_LIBS=OFF
+  -DBoost_NO_SYSTEM_PATHS=ON
+  -DBoost_NO_BOOST_CMAKE=ON
   -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
   -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
   -DBlosc_INCLUDE_DIR=${LIBDIR}/blosc/include/
@@ -19,36 +28,32 @@ set(OPENVDB_EXTRA_ARGS
   -DBlosc_LIBRARY_RELEASE=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
   -DBlosc_LIBRARY_DEBUG=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
   -DOPENVDB_BUILD_UNITTESTS=OFF
+  -DOPENVDB_BUILD_PYTHON_MODULE=OFF
   -DOPENVDB_BUILD_NANOVDB=ON
   -DNANOVDB_BUILD_TOOLS=OFF
   -DBlosc_ROOT=${LIBDIR}/blosc/
   -DTBB_ROOT=${LIBDIR}/tbb/
-  -DTbb_INCLUDE_DIR=${LIBDIR}/tbb/include
+  -DOPENVDB_CORE_SHARED=${OPENVDB_SHARED}
-  -DTbb_LEGACY_INCLUDE_DIR=${LIBDIR}/tbb/include
+  -DOPENVDB_CORE_STATIC=${OPENVDB_STATIC}
-  -DOPENVDB_CORE_SHARED=ON
-  -DOPENVDB_CORE_STATIC=OFF
   -DOPENVDB_BUILD_BINARIES=OFF
   -DCMAKE_DEBUG_POSTFIX=_d
   -DBLOSC_USE_STATIC_LIBS=ON
   -DUSE_NANOVDB=ON
-  -DOPENVDB_BUILD_PYTHON_MODULE=ON
-  -DOPENVDB_PYTHON_WRAP_ALL_GRID_TYPES=ON
-  -DUSE_NUMPY=ON
-  -DPython_EXECUTABLE=${PYTHON_BINARY}
-
-  # OPENVDB_AX Disabled for now as it adds ~25MB distribution wise
-  # with no blender code depending on it, seems wasteful.
-  # -DOPENVDB_BUILD_AX=ON
-  # -DOPENVDB_AX_SHARED=ON
-  # -DOPENVDB_AX_STATIC=OFF
-  # -DLLVM_DIR=${LIBDIR}/llvm/lib/cmake/llvm
 )
 
+if(WIN32)
+  # Namespaces seem to be buggy and cause linker errors due to things not
+  # being in the correct namespace
+  # needs to link pthreads due to it being a blosc dependency
+  set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
+    -DCMAKE_CXX_STANDARD_LIBRARIES="${LIBDIR}/pthreads/lib/pthreadVC3.lib"
+  )
+endif()
+
 ExternalProject_Add(openvdb
   URL file://${PACKAGE_DIR}/${OPENVDB_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OPENVDB_HASH_TYPE}=${OPENVDB_HASH}
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/openvdb
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openvdb ${DEFAULT_CMAKE_FLAGS} ${OPENVDB_EXTRA_ARGS}
@@ -61,8 +66,6 @@ add_dependencies(
   external_boost
   external_zlib
   external_blosc
-  external_python
-  external_numpy
 )
 
 if(WIN32)
@@ -71,7 +74,6 @@ if(WIN32)
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openvdb/include ${HARVEST_TARGET}/openvdb/include
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/openvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb.lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/bin/openvdb.dll ${HARVEST_TARGET}/openvdb/bin/openvdb.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/python${PYTHON_SHORT_VERSION}/site-packages/pyopenvdb.pyd ${HARVEST_TARGET}openvdb/python/pyopenvdb.pyd
       DEPENDEES install
     )
   endif()
@@ -79,7 +81,6 @@ if(WIN32)
     ExternalProject_Add_Step(openvdb after_install
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/openvdb_d.lib ${HARVEST_TARGET}/openvdb/lib/openvdb_d.lib
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/bin/openvdb_d.dll ${HARVEST_TARGET}/openvdb/bin/openvdb_d.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/python${PYTHON_SHORT_VERSION}/site-packages/pyopenvdb_d.pyd ${HARVEST_TARGET}openvdb/python/pyopenvdb_d.pyd
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/options.cmake

@@ -4,7 +4,7 @@ if(WIN32)
   option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/fftw3 by installing mingw64" ON)
 endif()
 option(FORCE_CHECK_HASH "Force a check of all hashses during CMake the configure phase" OFF)
-
+option(WITH_BOOST_PYTHON "Enable building of boost with python support" OFF)
 cmake_host_system_information(RESULT NUM_CORES QUERY NUMBER_OF_LOGICAL_CORES)
 set(MAKE_THREADS ${NUM_CORES} CACHE STRING "Number of threads to run make with")
 
@@ -41,36 +41,31 @@ if(WIN32)
   set(LIBEXT ".lib")
   set(SHAREDLIBEXT ".lib")
   set(LIBPREFIX "")
-  set(MESON ${LIBDIR}/python/Scripts/meson)
+
   # For OIIO and OSL
-  set(COMMON_DEFINES /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS)
+  set(COMMON_DEFINES /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS)
 
   if(MSVC_VERSION GREATER 1909)
     set(COMMON_MSVC_FLAGS "/Wv:18") #some deps with warnings as error aren't quite ready for dealing with the new 2017 warnings.
   endif()
   string(APPEND COMMON_MSVC_FLAGS " /bigobj")
-  # To keep MSVC from oversubscribing the CPU, force it to single threaded mode
+  if(WITH_OPTIMIZED_DEBUG)
-  # msbuild/ninja will queue as many compile units as there are cores, no need for
+    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  # msvc to be internally threading as well.
+  else()
-  string(APPEND COMMON_MSVC_FLAGS " /cgthreads1 ")
+    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /D_DEBUG /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  endif()
+  set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "/MD ${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_C_FLAGS_RELEASE "/MD ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "/MD ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
 
   if(WITH_OPTIMIZED_DEBUG)
-    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D_DEBUG /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
   else()
-    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /D_DEBUG /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /D PLATFORM_WINDOWS /MTd  ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
   endif()
-  set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "/MD ${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "/MD /${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG  /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_C_FLAGS_RELEASE "/MD ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "/MD ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "/MD ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-
-  if(WITH_OPTIMIZED_DEBUG)
-    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS /O2 /Ob2 /D_DEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS /DBOOST_DEBUG_PYTHON /DBOOST_ALL_NO_LIB")
-  else()
-    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /D PLATFORM_WINDOWS /D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS /MTd  ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS /DBOOST_DEBUG_PYTHON /DBOOST_ALL_NO_LIB")
-  endif()
-  set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "/MD /${COMMON_MSVC_FLAGS} /D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS /O1 /Ob1 /D NDEBUG  /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "/MD ${COMMON_MSVC_FLAGS} /D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD ${COMMON_MSVC_FLAGS} /D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS /Zi /O2 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
 
   set(PLATFORM_FLAGS)
   set(PLATFORM_CXX_FLAGS)
@@ -81,18 +76,6 @@ if(WIN32)
   set(PERL_SHELL ${DOWNLOAD_DIR}/perl/portableshell.bat)
   set(MINGW_HOST x86_64-w64-mingw32)
 
-  # some build systems like meson will respect the *nix like environment vars
-  # like CFLAGS and LDFlags but will still build with the MSVC compiler, so for
-  # those we need to empty out the gcc style flags that are normally in there.
-  set(CONFIGURE_ENV_MSVC
-    cd ${MINGW_PATH} &&
-    call ${PERL_SHELL} &&
-    call ${MINGW_SHELL} &&
-    set path &&
-    set CFLAGS= &&
-    set LDFLAGS=
-  )
-
   set(CONFIGURE_ENV
     cd ${MINGW_PATH} &&
     call ${PERL_SHELL} &&
@@ -115,11 +98,10 @@ if(WIN32)
 else()
   set(PATCH_CMD patch)
   set(LIBEXT ".a")
+  set(SHAREDLIBEXT ".so")
   set(LIBPREFIX "lib")
-  set(MESON ${LIBDIR}/python/bin/meson)
-if(APPLE)
-    set(SHAREDLIBEXT ".dylib")
 
+  if(APPLE)
     # Use same Xcode detection as Blender itself.
     include(../cmake/platform/platform_apple_xcode.cmake)
 
@@ -128,7 +110,7 @@ if(APPLE)
     endif()
 
     set(PLATFORM_CFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
-    set(PLATFORM_CXXFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -std=c++17 -stdlib=libc++ -arch ${CMAKE_OSX_ARCHITECTURES}")
+    set(PLATFORM_CXXFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++ -arch ${CMAKE_OSX_ARCHITECTURES}")
     set(PLATFORM_LDFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
     if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
       set(PLATFORM_BUILD_TARGET --build=x86_64-apple-darwin17.0.0) # OS X 10.13
@@ -141,14 +123,12 @@ if(APPLE)
       -DCMAKE_OSX_SYSROOT:PATH=${CMAKE_OSX_SYSROOT}
     )
   else()
-    set(SHAREDLIBEXT ".so")
-
     if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
       set(BLENDER_PLATFORM_ARM ON)
     endif()
 
     set(PLATFORM_CFLAGS "-fPIC")
-    set(PLATFORM_CXXFLAGS "-std=c++17 -fPIC")
+    set(PLATFORM_CXXFLAGS "-std=c++11 -fPIC")
     set(PLATFORM_LDFLAGS)
     set(PLATFORM_BUILD_TARGET)
     set(PLATFORM_CMAKE_FLAGS -DCMAKE_INSTALL_LIBDIR=lib)
@@ -195,7 +175,6 @@ set(DEFAULT_CMAKE_FLAGS
   -DCMAKE_CXX_FLAGS_MINSIZEREL=${BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL}
   -DCMAKE_CXX_FLAGS_RELEASE=${BLENDER_CMAKE_CXX_FLAGS_RELEASE}
   -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
-  -DCMAKE_CXX_STANDARD=17
   ${PLATFORM_CMAKE_FLAGS}
 )
 
@@ -214,11 +193,3 @@ if(MSVC)
 endif()
 
 set(CMAKE_INSTALL_MESSAGE LAZY)
-
-# On windows we sometimes want to build with ninja, but not all projects quite
-# yet, so for select project we pass PLATFORM_ALT_GENERATOR as the generator
-if(WIN32)
-  set(PLATFORM_ALT_GENERATOR "Ninja")
-else()
-  set(PLATFORM_ALT_GENERATOR "Unix Makefiles")
-endif()

build_files/build_environment/cmake/opus.cmake

@@ -9,7 +9,6 @@ ExternalProject_Add(external_opus
     --disable-shared
     --enable-static
     --with-pic
-    --disable-maintainer-mode
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/opus/src/external_opus/ && make -j${MAKE_THREADS}
   INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/opus/src/external_opus/ && make install
   INSTALL_DIR ${LIBDIR}/opus

build_files/build_environment/cmake/osl.cmake

@@ -6,7 +6,7 @@ if(WIN32)
 else()
   set(OSL_CMAKE_CXX_STANDARD_LIBRARIES)
   set(OSL_FLEX_BISON)
-  set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/OpenImageIO${SHAREDLIBEXT};${LIBDIR}/png/lib/${LIBPREFIX}png16${LIBEXT};${LIBDIR}/jpeg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/IlmImf${OPENEXR_VERSION_POSTFIX}${SHAREDLIBEXT}")
+  set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/${LIBPREFIX}png16${LIBEXT};${LIBDIR}/jpeg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
 endif()
 
 set(OSL_EXTRA_ARGS
@@ -21,7 +21,7 @@ set(OSL_EXTRA_ARGS
   ${OSL_FLEX_BISON}
   -DCMAKE_CXX_STANDARD_LIBRARIES=${OSL_CMAKE_CXX_STANDARD_LIBRARIES}
   -DBUILD_SHARED_LIBS=OFF
-  -DLINKSTATIC=OFF
+  -DLINKSTATIC=ON
   -DOSL_BUILD_PLUGINS=OFF
   -DSTOP_ON_WARNING=OFF
   -DUSE_LLVM_BITCODE=OFF
@@ -35,14 +35,13 @@ set(OSL_EXTRA_ARGS
   -DTIFF_ROOT=${LIBDIR}/tiff
   -DJPEG_ROOT=${LIBDIR}/jpeg
   -DUSE_PYTHON=OFF
+  -DCMAKE_CXX_STANDARD=14
   -DImath_ROOT=${LIBDIR}/imath
-  -DUSE_OIIO_STATIC=OFF
 )
 
 ExternalProject_Add(external_osl
   URL file://${PACKAGE_DIR}/${OSL_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   LIST_SEPARATOR ^^
   URL_HASH ${OSL_HASH_TYPE}=${OSL_HASH}
   PREFIX ${BUILD_DIR}/osl

build_files/build_environment/cmake/pybind11.cmake

@@ -1,21 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(PYBIND11_EXTRA_ARGS
-  -DPYBIND11_TEST=OFF
-  -DPYTHON_EXECUTABLE=${PYTHON_BINARY}
-)
-
-ExternalProject_Add(external_pybind11
-  URL file://${PACKAGE_DIR}/${PYBIND11_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${PYBIND11_HASH_TYPE}=${PYBIND11_HASH}
-  PREFIX ${BUILD_DIR}/pybind11
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/pybind11 ${DEFAULT_CMAKE_FLAGS} ${PYBIND11_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/pybind11
-)
-
-add_dependencies(
-  external_pybind11
-  external_python
-)

build_files/build_environment/cmake/python.cmake

@@ -16,12 +16,10 @@ if(WIN32)
 
   set(PYTHON_EXTERNALS_FOLDER ${BUILD_DIR}/python/src/external_python/externals)
   set(ZLIB_SOURCE_FOLDER ${BUILD_DIR}/zlib/src/external_zlib)
-  set(SSL_SOURCE_FOLDER ${BUILD_DIR}/ssl/src/external_ssl)
   set(DOWNLOADS_EXTERNALS_FOLDER ${DOWNLOAD_DIR}/externals)
 
   cmake_to_dos_path(${PYTHON_EXTERNALS_FOLDER} PYTHON_EXTERNALS_FOLDER_DOS)
   cmake_to_dos_path(${ZLIB_SOURCE_FOLDER} ZLIB_SOURCE_FOLDER_DOS)
-  cmake_to_dos_path(${SSL_SOURCE_FOLDER} SSL_SOURCE_FOLDER_DOS)
   cmake_to_dos_path(${DOWNLOADS_EXTERNALS_FOLDER} DOWNLOADS_EXTERNALS_FOLDER_DOS)
 
   ExternalProject_Add(external_python
@@ -32,14 +30,12 @@ if(WIN32)
     # Python will download its own deps and there's very little we can do about
     # that beyond placing some code in their externals dir before it tries.
     # the foldernames *HAVE* to match the ones inside pythons get_externals.cmd.
-    # regardless of the version actually in there.
+    # python 3.10.8 still ships zlib 1.2.12, replace it with our 1.2.13
-    PATCH_COMMAND mkdir ${PYTHON_EXTERNALS_FOLDER_DOS} &&
+    # copy until they update.
-      mklink /J ${PYTHON_EXTERNALS_FOLDER_DOS}\\zlib-1.2.13 ${ZLIB_SOURCE_FOLDER_DOS} &&
+    CONFIGURE_COMMAND mkdir ${PYTHON_EXTERNALS_FOLDER_DOS} &&
-      mklink /J ${PYTHON_EXTERNALS_FOLDER_DOS}\\openssl-1.1.1q ${SSL_SOURCE_FOLDER_DOS} &&
+      mklink /J ${PYTHON_EXTERNALS_FOLDER_DOS}\\zlib-1.2.12 ${ZLIB_SOURCE_FOLDER_DOS} &&
-      ${CMAKE_COMMAND} -E copy ${ZLIB_SOURCE_FOLDER}/../external_zlib-build/zconf.h ${PYTHON_EXTERNALS_FOLDER}/zlib-1.2.13/zconf.h &&
+      ${CMAKE_COMMAND} -E copy ${ZLIB_SOURCE_FOLDER}/../external_zlib-build/zconf.h ${PYTHON_EXTERNALS_FOLDER}/zlib-1.2.12/zconf.h
-      ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_windows.diff
+    BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p x64 -c ${BUILD_MODE}
-    CONFIGURE_COMMAND echo "."
-    BUILD_COMMAND ${CONFIGURE_ENV_MSVC} && cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && set LDFLAGS=/DEBUG && call prepare_ssl.bat && call build.bat -e -p x64 -c ${BUILD_MODE}
     INSTALL_COMMAND ${PYTHON_BINARY_INTERNAL} ${PYTHON_SRC}/PC/layout/main.py -b ${PYTHON_SRC}/PCbuild/amd64 -s ${PYTHON_SRC} -t ${PYTHON_SRC}/tmp/ --include-stable --include-pip --include-dev --include-launchers  --include-venv --include-symbols ${PYTHON_EXTRA_INSTLAL_FLAGS} --copy ${LIBDIR}/python
   )
   add_dependencies(
@@ -73,10 +69,11 @@ else()
       set(PYTHON_FUNC_CONFIGS ${PYTHON_FUNC_CONFIGS} && export PYTHON_DECIMAL_WITH_MACHINE=ansi64)
     endif()
     set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV} && ${PYTHON_FUNC_CONFIGS})
+    set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python.exe)
   else()
     set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV})
+    set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python)
   endif()
-  set(PYTHON_BINARY ${LIBDIR}/python/bin/python${PYTHON_SHORT_VERSION})
   # Link against zlib statically (Unix). Avoid rpath issues (macOS).
   set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_unix.diff)
   set(PYTHON_CONFIGURE_EXTRA_ARGS "--with-openssl=${LIBDIR}/ssl")
@@ -100,31 +97,14 @@ else()
     INSTALL_DIR ${LIBDIR}/python)
 endif()
 
-add_dependencies(
-  external_python
-  external_ssl
-  external_zlib
-)
 if(UNIX)
   add_dependencies(
     external_python
     external_bzip2
     external_ffi
     external_lzma
+    external_ssl
     external_sqlite
+    external_zlib
   )
 endif()
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_python after_install
-      # Boost can't keep it self from linking release python
-      # in a debug configuration even if all options are set
-      # correctly to instruct it to use the debug version
-      # of python. So just copy the debug imports file over
-      # and call it a day...
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/python/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib ${LIBDIR}/python/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib
-      DEPENDEES install
-    )
-  endif()
-endif()

build_files/build_environment/cmake/python_site_packages.cmake

@@ -15,9 +15,7 @@ ExternalProject_Add(external_python_site_packages
   CONFIGURE_COMMAND ${PIP_CONFIGURE_COMMAND}
   BUILD_COMMAND ""
   PREFIX ${BUILD_DIR}/site_packages
-  # setuptools is downgraded to 63.2.0 (same as python 3.10.8) since numpy 1.23.x seemingly has 
+  INSTALL_COMMAND ${PYTHON_BINARY} -m pip install --no-cache-dir ${SITE_PACKAGES_EXTRA} cython==${CYTHON_VERSION} idna==${IDNA_VERSION} charset-normalizer==${CHARSET_NORMALIZER_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} zstandard==${ZSTANDARD_VERSION} autopep8==${AUTOPEP8_VERSION} pycodestyle==${PYCODESTYLE_VERSION} toml==${TOML_VERSION} --no-binary :all:
-  # issues building on windows with the newer versions that ships with python 3.10.9+
-  INSTALL_COMMAND ${PYTHON_BINARY} -m pip install --no-cache-dir ${SITE_PACKAGES_EXTRA} setuptools==63.2.0 cython==${CYTHON_VERSION} idna==${IDNA_VERSION} charset-normalizer==${CHARSET_NORMALIZER_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} zstandard==${ZSTANDARD_VERSION} autopep8==${AUTOPEP8_VERSION} pycodestyle==${PYCODESTYLE_VERSION} toml==${TOML_VERSION} meson==${MESON_VERSION} --no-binary :all:
 )
 
 if(USE_PIP_NUMPY)

build_files/build_environment/cmake/shaderc.cmake

@@ -1,64 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-set(SHADERC_EXTRA_ARGS
-  -DSHADERC_SKIP_TESTS=On
-  -DSHADERC_SPIRV_TOOLS_DIR=${BUILD_DIR}/shaderc_spirv_tools/src/external_shaderc_spirv_tools
-  -DSHADERC_SPIRV_HEADERS_DIR=${BUILD_DIR}/shaderc_spirv_headers/src/external_shaderc_spirv_headers
-  -DSHADERC_GLSLANG_DIR=${BUILD_DIR}/shaderc_glslang/src/external_shaderc_glslang
-  -DCMAKE_DEBUG_POSTFIX=_d
-  -DPYTHON_EXECUTABLE=${PYTHON_BINARY}
-)
-
-ExternalProject_Add(external_shaderc
-  URL file://${PACKAGE_DIR}/${SHADERC_FILE}
-  URL_HASH ${SHADERC_HASH_TYPE}=${SHADERC_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/shaderc
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/shaderc ${DEFAULT_CMAKE_FLAGS} ${SHADERC_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/shaderc
-)
-
-add_dependencies(
-  external_shaderc
-  external_shaderc_spirv_tools
-  external_shaderc_spirv_headers
-  external_shaderc_glslang
-  external_python
-)
-
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_shaderc after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/shaderc/include ${HARVEST_TARGET}/shaderc/include
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/shaderc/bin/shaderc_shared.dll ${HARVEST_TARGET}/shaderc/bin/shaderc_shared.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/shaderc/lib/shaderc_shared.lib ${HARVEST_TARGET}/shaderc/lib/shaderc_shared.lib
-
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_shaderc after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/shaderc/bin/shaderc_shared_d.dll ${HARVEST_TARGET}/shaderc/bin/shaderc_shared_d.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/shaderc/lib/shaderc_shared_d.lib ${HARVEST_TARGET}/shaderc/lib/shaderc_shared_d.lib
-      DEPENDEES install
-    )
-  endif()
-endif()
-
-

build_files/build_environment/cmake/shaderc_deps.cmake

@@ -1,51 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# These are build time requirements for shaderc. We only have to unpack these
-# shaderc will build them.
-
-ExternalProject_Add(external_shaderc_glslang
-  URL file://${PACKAGE_DIR}/${SHADERC_GLSLANG_FILE}
-  URL_HASH ${SHADERC_GLSLANG_HASH_TYPE}=${SHADERC_GLSLANG_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/shaderc_glslang
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-)
-
-ExternalProject_Add(external_shaderc_spirv_headers
-  URL file://${PACKAGE_DIR}/${SHADERC_SPIRV_HEADERS_FILE}
-  URL_HASH ${SHADERC_SPIRV_HEADERS_HASH_TYPE}=${SHADERC_SPIRV_HEADERS_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/shaderc_spirv_headers
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-)
-
-ExternalProject_Add(external_shaderc_spirv_tools
-  URL file://${PACKAGE_DIR}/${SHADERC_SPIRV_TOOLS_FILE}
-  URL_HASH ${SHADERC_SPIRV_TOOLS_HASH_TYPE}=${SHADERC_SPIRV_TOOLS_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/shaderc_spirv_tools
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-)
-

build_files/build_environment/cmake/sndfile.cmake

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 set(SNDFILE_EXTRA_ARGS)
-set(SNDFILE_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/flac/lib/pkgconfig:${mingw_LIBDIR}/opus/lib/pkgconfig:${mingw_LIBDIR})
+set(SNDFILE_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/flac/lib/pkgconfig:${mingw_LIBDIR})
 
 if(WIN32)
   set(SNDFILE_ENV set ${SNDFILE_ENV} &&)
@@ -30,7 +30,6 @@ add_dependencies(
   external_sndfile
   external_ogg
   external_vorbis
-  external_opus
 )
 if(UNIX)
   add_dependencies(

build_files/build_environment/cmake/ssl.cmake

@@ -3,47 +3,33 @@
 set(SSL_CONFIGURE_COMMAND ./Configure)
 set(SSL_PATCH_CMD echo .)
 
-if(WIN32)
+if(APPLE)
-  # Python will build this with its preferred build options and patches. We only need to unpack openssl
+  set(SSL_OS_COMPILER "blender-darwin-${CMAKE_OSX_ARCHITECTURES}")
-  ExternalProject_Add(external_ssl
+  set(SSL_PATCH_CMD ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/ssl/src/external_ssl < ${PATCH_DIR}/ssl.diff)
-    URL file://${PACKAGE_DIR}/${SSL_FILE}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${SSL_HASH_TYPE}=${SSL_HASH}
-    PREFIX ${BUILD_DIR}/ssl
-    CONFIGURE_COMMAND echo "." 
-    BUILD_COMMAND echo "." 
-    INSTALL_COMMAND echo "." 
-    INSTALL_DIR ${LIBDIR}/ssl
-  )
 else()
-  if(APPLE)
+  if(BLENDER_PLATFORM_ARM)
-    set(SSL_OS_COMPILER "blender-darwin-${CMAKE_OSX_ARCHITECTURES}")
+    set(SSL_OS_COMPILER "blender-linux-aarch64")
-    set(SSL_PATCH_CMD ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/ssl/src/external_ssl < ${PATCH_DIR}/ssl.diff)
+  elseif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
+    set(SSL_OS_COMPILER "blender-linux-x86_64")
   else()
-    if(BLENDER_PLATFORM_ARM)
+    set(SSL_OS_COMPILER "blender-linux-x86")
-      set(SSL_OS_COMPILER "blender-linux-aarch64")
-    elseif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-      set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
-      set(SSL_OS_COMPILER "blender-linux-x86_64")
-    else()
-      set(SSL_OS_COMPILER "blender-linux-x86")
-    endif()
   endif()
+endif()
 
-  ExternalProject_Add(external_ssl
+ExternalProject_Add(external_ssl
-    URL file://${PACKAGE_DIR}/${SSL_FILE}
+  URL file://${PACKAGE_DIR}/${SSL_FILE}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${SSL_HASH_TYPE}=${SSL_HASH}
+  URL_HASH ${SSL_HASH_TYPE}=${SSL_HASH}
-    PREFIX ${BUILD_DIR}/ssl
+  PREFIX ${BUILD_DIR}/ssl
-    PATCH_COMMAND ${SSL_PATCH_CMD}
+  PATCH_COMMAND ${SSL_PATCH_CMD}
-    CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && ${SSL_CONFIGURE_COMMAND} --prefix=${LIBDIR}/ssl
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && ${SSL_CONFIGURE_COMMAND} --prefix=${LIBDIR}/ssl
-      --openssldir=${LIBDIR}/ssl
+    --openssldir=${LIBDIR}/ssl
-      no-shared
+    no-shared
-      no-idea no-mdc2 no-rc5 no-zlib no-ssl3 enable-unit-test no-ssl3-method enable-rfc3779 enable-cms
+    no-idea no-mdc2 no-rc5 no-zlib no-ssl3 enable-unit-test no-ssl3-method enable-rfc3779 enable-cms
-      --config=${CMAKE_CURRENT_SOURCE_DIR}/cmake/ssl.conf
+    --config=${CMAKE_CURRENT_SOURCE_DIR}/cmake/ssl.conf
-      ${SSL_OS_COMPILER}
+    ${SSL_OS_COMPILER}
-    BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make -j${MAKE_THREADS}
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make -j${MAKE_THREADS}
-    INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make install
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make install
-    INSTALL_DIR ${LIBDIR}/ssl
+  INSTALL_DIR ${LIBDIR}/ssl
-  )
+)
-endif()

build_files/build_environment/cmake/tbb.cmake

@@ -1,14 +1,26 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-set(TBB_EXTRA_ARGS
+if(WIN32)
-  -DTBB_BUILD_SHARED=On
+  set(TBB_EXTRA_ARGS
-  -DTBB_BUILD_TBBMALLOC=On
+    -DTBB_BUILD_SHARED=On
-  -DTBB_BUILD_TBBMALLOC_PROXY=On
+    -DTBB_BUILD_TBBMALLOC=On
-  -DTBB_BUILD_STATIC=Off
+    -DTBB_BUILD_TBBMALLOC_PROXY=On
-  -DTBB_BUILD_TESTS=Off
+    -DTBB_BUILD_STATIC=Off
-  -DCMAKE_DEBUG_POSTFIX=_debug
+    -DTBB_BUILD_TESTS=Off
-)
+    -DCMAKE_DEBUG_POSTFIX=_debug
-set(TBB_LIBRARY tbb)
+  )
-set(TBB_STATIC_LIBRARY Off)
+  set(TBB_LIBRARY tbb)
+  set(TBB_STATIC_LIBRARY Off)
+else()
+  set(TBB_EXTRA_ARGS
+    -DTBB_BUILD_SHARED=Off
+    -DTBB_BUILD_TBBMALLOC=On
+    -DTBB_BUILD_TBBMALLOC_PROXY=Off
+    -DTBB_BUILD_STATIC=On
+    -DTBB_BUILD_TESTS=Off
+  )
+  set(TBB_LIBRARY tbb_static)
+  set(TBB_STATIC_LIBRARY On)
+endif()
 
 # CMake script for TBB from https://github.com/wjakob/tbb/blob/master/CMakeLists.txt
 ExternalProject_Add(external_tbb

build_files/build_environment/cmake/usd.cmake

@@ -7,56 +7,32 @@ if(WIN32)
     # USD does not look for debug libs, nor does it link them
     # when building static, so this is just to keep find_package happy
     # if we ever link dynamically on windows util will need to be linked as well.
-    set(USD_OIIO_CMAKE_DEFINES "-DOIIO_LIBRARIES=${LIBDIR}/openimageio/lib/OpenImageIO_d${LIBEXT}^^${LIBDIR}/openimageio/lib/OpenImageIO_util_d${LIBEXT}")
+    set(USD_OIIO_CMAKE_DEFINES "-DOIIO_LIBRARIES=${LIBDIR}/openimageio/lib/OpenImageIO_d${LIBEXT}")
   endif()
   set(USD_PLATFORM_FLAGS
     ${USD_OIIO_CMAKE_DEFINES}
     -DCMAKE_CXX_FLAGS=${USD_CXX_FLAGS}
-    -D_PXR_CXX_DEFINITIONS=/DBOOST_ALL_NO_LIB
-    -DCMAKE_SHARED_LINKER_FLAGS_INIT=/LIBPATH:${LIBDIR}/tbb/lib
-    -DPython_FIND_REGISTRY=NEVER
-    -DPYTHON_INCLUDE_DIRS=${LIBDIR}/python/include
-    -DPYTHON_LIBRARY=${LIBDIR}/python/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}${LIBEXT}
   )
-  if(BUILD_MODE STREQUAL Debug)
-    list(APPEND USD_PLATFORM_FLAGS -DPXR_USE_DEBUG_PYTHON=ON)
-    list(APPEND USD_PLATFORM_FLAGS -DOPENVDB_LIBRARY=${LIBDIR}/openvdb/lib/openvdb_d.lib)
-  endif()
-elseif(UNIX)
-  # Workaround USD not linking correctly with static Python library, where it would embed
-  # part of the interpret in the USD library. Allow undefined Python symbols and replace
-  # Python library with TBB so it doesn't complain about missing library.
-  set(USD_PLATFORM_FLAGS
-    -DPYTHON_INCLUDE_DIR=${LIBDIR}/python/include/python${PYTHON_SHORT_VERSION}/
-    -DPYTHON_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${SHAREDLIBEXT}
-   )
-
-  if(APPLE)
-    set(USD_SHARED_LINKER_FLAGS "-Xlinker -undefined -Xlinker dynamic_lookup")
-    list(APPEND USD_PLATFORM_FLAGS
-      -DCMAKE_SHARED_LINKER_FLAGS=${USD_SHARED_LINKER_FLAGS})
-  endif()
 endif()
 
 set(USD_EXTRA_ARGS
   ${DEFAULT_BOOST_FLAGS}
   ${USD_PLATFORM_FLAGS}
+  # This is a preventative measure that avoids possible conflicts when add-ons
+  # try to load another USD library into the same process space.
+  -DPXR_SET_INTERNAL_NAMESPACE=usdBlender
   -DOPENSUBDIV_ROOT_DIR=${LIBDIR}/opensubdiv
   -DOpenImageIO_ROOT=${LIBDIR}/openimageio
-  -DOPENEXR_LIBRARIES=${LIBDIR}/imath/lib/${LIBPREFIX}Imath${OPENEXR_VERSION_POSTFIX}${SHAREDLIBEXT}
+  -DOPENEXR_LIBRARIES=${LIBDIR}/imath/lib/imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
   -DOPENEXR_INCLUDE_DIR=${LIBDIR}/imath/include
-  -DImath_DIR=${LIBDIR}/imath
+  -DPXR_ENABLE_PYTHON_SUPPORT=OFF
-  -DOPENVDB_LOCATION=${LIBDIR}/openvdb
-  -DPXR_ENABLE_PYTHON_SUPPORT=ON
-  -DPXR_USE_PYTHON_3=ON
   -DPXR_BUILD_IMAGING=ON
   -DPXR_BUILD_TESTS=OFF
   -DPXR_BUILD_EXAMPLES=OFF
   -DPXR_BUILD_TUTORIALS=OFF
-  -DPXR_BUILD_USDVIEW=OFF
   -DPXR_ENABLE_HDF5_SUPPORT=OFF
   -DPXR_ENABLE_MATERIALX_SUPPORT=OFF
-  -DPXR_ENABLE_OPENVDB_SUPPORT=ON
+  -DPXR_ENABLE_OPENVDB_SUPPORT=OFF
   -DPYTHON_EXECUTABLE=${PYTHON_BINARY}
   -DPXR_BUILD_MONOLITHIC=ON
   # OSL is an optional dependency of the Imaging module. However, since that
@@ -64,36 +40,41 @@ set(USD_EXTRA_ARGS
   # cube, etc.) to geometry, it's not necessary. Disabling it will make it
   # simpler to build Blender; currently only Cycles uses OSL.
   -DPXR_ENABLE_OSL_SUPPORT=OFF
-  # Enable OpenGL for Hydra support. Note that this indirectly also adds an X11
+  # GL support on Linux also links to X11 libraries. Enabling it would break
-  # dependency on Linux. This would be good to eliminate for headless and Wayland
+  # headless or Wayland-only builds. OpenGL support would be useful if someone
-  # only builds, however is not worse than what Blender already links to for
+  # wants to work on a Hydra viewport in Blender; when that's actually being
-  # official releases currently.
+  # worked on, we could patch in a new PXR_ENABLE_X11_SUPPORT option (to
-  -DPXR_ENABLE_GL_SUPPORT=ON
+  # separate OpenGL from X11) and contribute it upstream.
-  # OIIO is used for loading image textures in Hydra Storm / Embree renderers.
+  -DPXR_ENABLE_GL_SUPPORT=OFF
-  -DPXR_BUILD_OPENIMAGEIO_PLUGIN=ON
+  # Disable Metal since USD fails to build this when OpenGL is disabled.
+  -DPXR_ENABLE_METAL_SUPPORT=OFF
+  # OIIO is used for loading image textures in Hydra Storm / Embree renderers,
+  # which we don't use.
+  -DPXR_BUILD_OPENIMAGEIO_PLUGIN=OFF
   # USD 22.03 does not support OCIO 2.x
   # Tracking ticket https://github.com/PixarAnimationStudios/USD/issues/1386
   -DPXR_BUILD_OPENCOLORIO_PLUGIN=OFF
   -DPXR_ENABLE_PTEX_SUPPORT=OFF
   -DPXR_BUILD_USD_TOOLS=OFF
   -DCMAKE_DEBUG_POSTFIX=_d
-  -DBUILD_SHARED_LIBS=ON
+  -DBUILD_SHARED_LIBS=Off
+  # USD is hellbound on making a shared library,
+  # unless you point this variable to a valid CMAKE file doesn't have to make sense,
+  # but as long as it points somewhere valid it will skip the shared library.
+  -DPXR_MONOLITHIC_IMPORT=${BUILD_DIR}/usd/src/external_usd/cmake/defaults/Version.cmake
   -DTBB_INCLUDE_DIRS=${LIBDIR}/tbb/include
-  -DTBB_LIBRARIES=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${SHAREDLIBEXT}
+  -DTBB_LIBRARIES=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT}
-  -DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${SHAREDLIBEXT}
+  -DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT}
-  -DTBB_tbb_LIBRARY_RELEASE=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${SHAREDLIBEXT}
   # USD wants the tbb debug lib set even when you are doing a release build
   # Otherwise it will error out during the cmake configure phase.
-  -DTBB_LIBRARIES_DEBUG=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${SHAREDLIBEXT}
+  -DTBB_LIBRARIES_DEBUG=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT}
 )
 
 ExternalProject_Add(external_usd
   URL file://${PACKAGE_DIR}/${USD_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${USD_HASH_TYPE}=${USD_HASH}
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/usd
-  LIST_SEPARATOR ^^
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/usd/src/external_usd < ${PATCH_DIR}/usd.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/usd -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${USD_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/usd
@@ -104,12 +85,10 @@ add_dependencies(
   external_tbb
   external_boost
   external_opensubdiv
-  external_python
-  external_openimageio
-  openvdb
 )
 
-# Since USD 21.11 the libraries are prefixed with "usd_", i.e. "libusd_m.a" became "libusd_usd_m.a".
+# Since USD 21.11 the libraries are prefixed with "usd_", i.e.
+# "libusd_m.a" became "libusd_usd_m.a".
 # See https://github.com/PixarAnimationStudios/USD/blob/release/CHANGELOG.md#2111---2021-11-01
 if(NOT WIN32)
   if (USD_VERSION VERSION_LESS 21.11)
@@ -122,16 +101,27 @@ endif()
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_usd after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd ${HARVEST_TARGET}/usd
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/ ${HARVEST_TARGET}/usd
+      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Release/usd_usd_m.lib ${HARVEST_TARGET}/usd/lib/usd_usd_m.lib
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_usd after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/lib/python ${HARVEST_TARGET}/usd/lib/debug/python
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/lib ${HARVEST_TARGET}/usd/lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/usd/lib/usd_ms_d.dll ${HARVEST_TARGET}/usd/lib/usd_ms_d.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Debug/usd_usd_m_d.lib ${HARVEST_TARGET}/usd/lib/usd_usd_m_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/usd/lib/usd_ms_d.lib ${HARVEST_TARGET}/usd/lib/usd_ms_d.lib
       DEPENDEES install
     )
   endif()
+else()
+  # USD has two build options. The default build creates lots of small libraries,
+  # whereas the 'monolithic' build produces only a single library. The latter
+  # makes linking simpler, so that's what we use in Blender. However, running
+  # 'make install' in the USD sources doesn't install the static library in that
+  # case (only the shared library). As a result, we need to grab the `libusd_m.a`
+  # file from the build directory instead of from the install directory.
+  ExternalProject_Add_Step(external_usd after_install
+    COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/lib${PXR_LIB_PREFIX}usd_m.a ${HARVEST_TARGET}/usd/lib/lib${PXR_LIB_PREFIX}usd_m.a
+    DEPENDEES install
+  )
 endif()

build_files/build_environment/cmake/versions.cmake

@@ -35,12 +35,12 @@ set(JPEG_HASH_TYPE MD5)
 set(JPEG_FILE libjpeg-turbo-${JPEG_VERSION}.tar.gz)
 set(JPEG_CPE "cpe:2.3:a:d.r.commander:libjpeg-turbo:${JPEG_VERSION}:*:*:*:*:*:*:*")
 
-set(BOOST_VERSION 1.80.0)
+set(BOOST_VERSION 1.78.0)
-set(BOOST_VERSION_SHORT 1.80)
+set(BOOST_VERSION_SHORT 1.78)
-set(BOOST_VERSION_NODOTS 1_80_0)
+set(BOOST_VERSION_NODOTS 1_78_0)
-set(BOOST_VERSION_NODOTS_SHORT 1_80)
+set(BOOST_VERSION_NODOTS_SHORT 1_78)
 set(BOOST_URI https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_NODOTS}.tar.gz)
-set(BOOST_HASH 077f074743ea7b0cb49c6ed43953ae95)
+set(BOOST_HASH c2f6428ac52b0e5a3c9b2e1d8cc832b5)
 set(BOOST_HASH_TYPE MD5)
 set(BOOST_FILE boost_${BOOST_VERSION_NODOTS}.tar.gz)
 set(BOOST_CPE "cpe:2.3:a:boost:boost:${BOOST_VERSION}:*:*:*:*:*:*:*")
@@ -77,11 +77,11 @@ if(WIN32)
   # we need to tell the build the postfix is _s while
   # telling all other deps the postfix is _s_d
   if(BUILD_MODE STREQUAL Release)
-    set(OPENEXR_VERSION_POSTFIX )
+    set(OPENEXR_VERSION_POSTFIX _s)
-    set(OPENEXR_VERSION_BUILD_POSTFIX )
+    set(OPENEXR_VERSION_BUILD_POSTFIX _s)
   else()
-    set(OPENEXR_VERSION_POSTFIX _d)
+    set(OPENEXR_VERSION_POSTFIX _s_d)
-    set(OPENEXR_VERSION_BUILD_POSTFIX )
+    set(OPENEXR_VERSION_BUILD_POSTFIX _s)
   endif()
 else()
   set(OPENEXR_VERSION_BUILD_POSTFIX)
@@ -114,9 +114,9 @@ set(ALEMBIC_HASH_TYPE MD5)
 set(ALEMBIC_FILE alembic-${ALEMBIC_VERSION}.tar.gz)
 SET(FREETYPE_CPE "cpe:2.3:a:freetype:freetype:${FREETYPE_VERSION}:*:*:*:*:*:*:*")
 
-set(OPENSUBDIV_VERSION v3_5_0)
+set(OPENSUBDIV_VERSION v3_4_4)
 set(OPENSUBDIV_URI https://github.com/PixarAnimationStudios/OpenSubdiv/archive/${OPENSUBDIV_VERSION}.tar.gz)
-set(OPENSUBDIV_HASH 230f5cd2911d6240e58a3773b9c6e5e4)
+set(OPENSUBDIV_HASH 39ecc5caf0abebc943d1ce131855e76e)
 set(OPENSUBDIV_HASH_TYPE MD5)
 set(OPENSUBDIV_FILE opensubdiv-${OPENSUBDIV_VERSION}.tar.gz)
 
@@ -133,18 +133,12 @@ set(OPENCOLLADA_HASH ee7dae874019fea7be11613d07567493)
 set(OPENCOLLADA_HASH_TYPE MD5)
 set(OPENCOLLADA_FILE opencollada-${OPENCOLLADA_VERSION}.tar.gz)
 
-set(OPENCOLORIO_VERSION 2.2.0)
+set(OPENCOLORIO_VERSION 2.1.1)
 set(OPENCOLORIO_URI https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v${OPENCOLORIO_VERSION}.tar.gz)
-set(OPENCOLORIO_HASH d58a5980adba2d89a363100a09daa5f3)
+set(OPENCOLORIO_HASH 604f562e073f23d88ce89ed4f7f709ba)
 set(OPENCOLORIO_HASH_TYPE MD5)
 set(OPENCOLORIO_FILE OpenColorIO-${OPENCOLORIO_VERSION}.tar.gz)
 
-set(MINIZIPNG_VERSION 3.0.7)
-set(MINIZIPNG_URI https://github.com/zlib-ng/minizip-ng/archive/${MINIZIPNG_VERSION}.tar.gz)
-set(MINIZIPNG_HASH 09dcc8a9def348e1be9659e384c2cd55)
-set(MINIZIPNG_HASH_TYPE MD5)
-set(MINIZIPNG_FILE minizip-ng-${MINIZIPNG_VERSION}.tar.gz)
-
 set(LLVM_VERSION 12.0.0)
 set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz)
 set(LLVM_HASH 5a4fab4d7fc84aefffb118ac2c8a4fc0)
@@ -165,9 +159,9 @@ set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${
 set(OPENMP_HASH_TYPE MD5)
 set(OPENMP_FILE openmp-${OPENMP_VERSION}.src.tar.xz)
 
-set(OPENIMAGEIO_VERSION v2.4.6.0)
+set(OPENIMAGEIO_VERSION v2.3.20.0)
 set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/refs/tags/${OPENIMAGEIO_VERSION}.tar.gz)
-set(OPENIMAGEIO_HASH c7acc1b9a8fda04ef48f7de1feda4dae)
+set(OPENIMAGEIO_HASH defb1fe7c8e64bac60eb3cacaf5c3736)
 set(OPENIMAGEIO_HASH_TYPE MD5)
 set(OPENIMAGEIO_FILE OpenImageIO-${OPENIMAGEIO_VERSION}.tar.gz)
 
@@ -195,22 +189,17 @@ set(TIFF_HASH_TYPE MD5)
 set(TIFF_FILE tiff-${TIFF_VERSION}.tar.gz)
 set(TIFF_CPE "cpe:2.3:a:libtiff:libtiff:${TIFF_VERSION}:*:*:*:*:*:*:*")
 
-set(OSL_VERSION 1.12.7.1)
+set(OSL_VERSION 1.12.6.2)
-set(OSL_URI https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${OSL_VERSION}.tar.gz)
+set(OSL_URI https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/refs/tags/v${OSL_VERSION}.tar.gz)
-set(OSL_HASH 53211da86c34ba6e0344998c1a6d219c)
+set(OSL_HASH 6fef11548adfdd3e5b25c49d2dae96ee)
 set(OSL_HASH_TYPE MD5)
 set(OSL_FILE OpenShadingLanguage-${OSL_VERSION}.tar.gz)
 
-# NOTE: When updating the python version, it's required to check the versions of
+set(PYTHON_VERSION 3.10.8)
-# it wants to use in PCbuild/get_externals.bat for the following dependencies:
-# BZIP2, FFI, SQLITE and change the versions in this file as well. For compliance 
-# reasons there can be no exceptions to this.
-
-set(PYTHON_VERSION 3.10.9)
 set(PYTHON_SHORT_VERSION 3.10)
 set(PYTHON_SHORT_VERSION_NO_DOTS 310)
 set(PYTHON_URI https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz)
-set(PYTHON_HASH dc8c0f274b28ee9e95923d20cfc364c9)
+set(PYTHON_HASH e92356b012ed4d0e09675131d39b1bde)
 set(PYTHON_HASH_TYPE MD5)
 set(PYTHON_FILE Python-${PYTHON_VERSION}.tar.xz)
 set(PYTHON_CPE "cpe:2.3:a:python:python:${PYTHON_VERSION}:-:*:*:*:*:*:*")
@@ -223,9 +212,9 @@ set(TBB_HASH_TYPE MD5)
 set(TBB_FILE oneTBB-${TBB_VERSION}.tar.gz)
 set(TBB_CPE "cpe:2.3:a:intel:threading_building_blocks:${TBB_YEAR}:*:*:*:*:*:*:*")
 
-set(OPENVDB_VERSION 10.0.0)
+set(OPENVDB_VERSION 9.0.0)
 set(OPENVDB_URI https://github.com/AcademySoftwareFoundation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz)
-set(OPENVDB_HASH 64301c737e16b26c8f3085a31e6397e9)
+set(OPENVDB_HASH 684ce40c2f74f3a0c9cac530e1c7b07e)
 set(OPENVDB_HASH_TYPE MD5)
 set(OPENVDB_FILE openvdb-${OPENVDB_VERSION}.tar.gz)
 
@@ -235,7 +224,7 @@ set(URLLIB3_VERSION 1.26.8)
 set(URLLIB3_CPE "cpe:2.3:a:urllib3:urllib3:${URLLIB3_VERSION}:*:*:*:*:*:*:*")
 set(CERTIFI_VERSION 2021.10.8)
 set(REQUESTS_VERSION 2.27.1)
-set(CYTHON_VERSION 0.29.30)
+set(CYTHON_VERSION 0.29.26)
 # The version of the zstd library used to build the Python package should match ZSTD_VERSION
 # defined below. At this time of writing, 0.17.0 was already released,
 # but built against zstd 1.5.1, while we use 1.5.0.
@@ -243,14 +232,13 @@ set(ZSTANDARD_VERSION 0.16.0)
 set(AUTOPEP8_VERSION 1.6.0)
 set(PYCODESTYLE_VERSION 2.8.0)
 set(TOML_VERSION 0.10.2)
-set(MESON_VERSION 0.63.0)
 
-set(NUMPY_VERSION 1.23.5)
+set(NUMPY_VERSION 1.22.0)
-set(NUMPY_SHORT_VERSION 1.23)
+set(NUMPY_SHORT_VERSION 1.22)
-set(NUMPY_URI https://github.com/numpy/numpy/releases/download/v${NUMPY_VERSION}/numpy-${NUMPY_VERSION}.tar.gz)
+set(NUMPY_URI https://github.com/numpy/numpy/releases/download/v${NUMPY_VERSION}/numpy-${NUMPY_VERSION}.zip)
-set(NUMPY_HASH 8b2692a511a3795f3af8af2cd7566a15)
+set(NUMPY_HASH 252de134862a27bd66705d29622edbfe)
 set(NUMPY_HASH_TYPE MD5)
-set(NUMPY_FILE numpy-${NUMPY_VERSION}.tar.gz)
+set(NUMPY_FILE numpy-${NUMPY_VERSION}.zip)
 set(NUMPY_CPE "cpe:2.3:a:numpy:numpy:${NUMPY_VERSION}:*:*:*:*:*:*:*")
 
 set(LAME_VERSION 3.100)
@@ -371,9 +359,9 @@ set(XML2_HASH_TYPE MD5)
 set(XML2_FILE libxml2-${XML2_VERSION}.tar.xz)
 set(XML2_CPE "cpe:2.3:a:xmlsoft:libxml2:${XML2_VERSION}:*:*:*:*:*:*:*")
 
-set(YAMLCPP_VERSION 0.7.0)
+set(YAMLCPP_VERSION 0.6.3)
 set(YAMLCPP_URI https://codeload.github.com/jbeder/yaml-cpp/tar.gz/yaml-cpp-${YAMLCPP_VERSION})
-set(YAMLCPP_HASH 74d646a3cc1b5d519829441db96744f0)
+set(YAMLCPP_HASH b45bf1089a382e81f6b661062c10d0c2)
 set(YAMLCPP_HASH_TYPE MD5)
 set(YAMLCPP_FILE yaml-cpp-${YAMLCPP_VERSION}.tar.gz)
 set(YAMLCPP "cpe:2.3:a:yaml-cpp_project:yaml-cpp:${YAMLCPP_VERSION}:*:*:*:*:*:*:*")
@@ -442,7 +430,9 @@ set(LZMA_HASH 5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df)
 set(LZMA_HASH_TYPE SHA256)
 set(LZMA_FILE xz-${LZMA_VERSION}.tar.bz2)
 
-# NOTE: Python's build has been modified to use our ssl version.
+# NOTE: This will *HAVE* to match the version python ships on windows which
+# is hardcoded in pythons PCbuild/get_externals.bat. For compliance reasons there
+# can be no exceptions to this.
 set(SSL_VERSION 1.1.1q)
 set(SSL_URI https://www.openssl.org/source/openssl-${SSL_VERSION}.tar.gz)
 set(SSL_HASH d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca)
@@ -453,10 +443,10 @@ set(SSL_CPE "cpe:2.3:a:openssl:openssl:${SSL_VERSION}:*:*:*:*:*:*:*")
 # Note: This will *HAVE* to match the version python ships on windows which
 # is hardcoded in pythons PCbuild/get_externals.bat for compliance reasons there
 # can be no exceptions to this.
-set(SQLITE_VERSION 3.39.4)
+set(SQLITE_VERSION 3.37.2)
-set(SQLLITE_LONG_VERSION 3390400)
+set(SQLLITE_LONG_VERSION 3370200)
 set(SQLITE_URI https://www.sqlite.org/2022/sqlite-autoconf-${SQLLITE_LONG_VERSION}.tar.gz)
-set(SQLITE_HASH c4c5c39269d1b9bb1487cff580c1f583608229b2)
+set(SQLITE_HASH e56faacadfb4154f8fbd0f2a3f827d13706b70a1)
 set(SQLITE_HASH_TYPE SHA1)
 set(SQLITE_FILE sqlite-autoconf-${SQLLITE_LONG_VERSION}.tar.gz)
 set(SQLITE_CPE "cpe:2.3:a:sqlite:sqlite:${SQLITE_VERSION}:*:*:*:*:*:*:*")
@@ -467,18 +457,12 @@ set(EMBREE_HASH 52d0be294d6c88ba7a6c9e046796e7be)
 set(EMBREE_HASH_TYPE MD5)
 set(EMBREE_FILE embree-v${EMBREE_VERSION}.zip)
 
-set(USD_VERSION 22.11)
+set(USD_VERSION 22.03)
 set(USD_URI https://github.com/PixarAnimationStudios/USD/archive/v${USD_VERSION}.tar.gz)
-set(USD_HASH 8c89459e48a2ef0e7ae9e7e490377507)
+set(USD_HASH e0e441a05057692a83124a1195b09eed)
 set(USD_HASH_TYPE MD5)
 set(USD_FILE usd-v${USD_VERSION}.tar.gz)
 
-set(MATERIALX_VERSION 1.38.6)
-set(MATERIALX_URI https://github.com/AcademySoftwareFoundation/MaterialX/archive/refs/tags/v${MATERIALX_VERSION}.tar.gz)
-set(MATERIALX_HASH d49c9fdef34b5702fc60058d3e1864f2)
-set(MATERIALX_HASH_TYPE MD5)
-set(MATERIALX_FILE materialx-v${MATERIALX_VERSION}.tar.gz)
-
 set(OIDN_VERSION 1.4.3)
 set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.tar.gz)
 set(OIDN_HASH 027093eaf5e8b4e45835b991137b38e6)
@@ -724,60 +708,3 @@ set(AOM_URI https://storage.googleapis.com/aom-releases/libaom-${AOM_VERSION}.ta
 set(AOM_HASH bd754b58c3fa69f3ffd29da77de591bd9c26970e3b18537951336d6c0252e354)
 set(AOM_HASH_TYPE SHA256)
 set(AOM_FILE libaom-${AOM_VERSION}.tar.gz)
-
-set(FRIBIDI_VERSION v1.0.12)
-set(FRIBIDI_URI https://github.com/fribidi/fribidi/archive/refs/tags/${FRIBIDI_VERSION}.tar.gz)
-set(FRIBIDI_HASH 2e9e859876571f03567ac91e5ed3b5308791f31cda083408c2b60fa1fe00a39d)
-set(FRIBIDI_HASH_TYPE SHA256)
-set(FRIBIDI_FILE fribidi-${FRIBIDI_VERSION}.tar.gz)
-
-set(HARFBUZZ_VERSION 5.1.0)
-set(HARFBUZZ_URI https://github.com/harfbuzz/harfbuzz/archive/refs/tags/${HARFBUZZ_VERSION}.tar.gz)
-set(HARFBUZZ_HASH 5352ff2eec538ea9a63a485cf01ad8332a3f63aa79921c5a2e301cef185caea1)
-set(HARFBUZZ_HASH_TYPE SHA256)
-set(HARFBUZZ_FILE harfbuzz-${HARFBUZZ_VERSION}.tar.gz)
-
-set(SHADERC_VERSION v2022.3)
-set(SHADERC_URI https://github.com/google/shaderc/archive/${SHADERC_VERSION}.tar.gz)
-set(SHADERC_HASH 5cb762af57637caf997d5f46baa4e8a4)
-set(SHADERC_HASH_TYPE MD5)
-set(SHADERC_FILE shaderc-${SHADERC_VERSION}.tar.gz)
-
-# The versions of shaderc's dependencies can be found in the root of shaderc's
-# source in a file called DEPS.
-
-set(SHADERC_SPIRV_TOOLS_VERSION eb0a36633d2acf4de82588504f951ad0f2cecacb)
-set(SHADERC_SPIRV_TOOLS_URI https://github.com/KhronosGroup/SPIRV-Tools/archive/${SHADERC_SPIRV_TOOLS_VERSION}.tar.gz)
-set(SHADERC_SPIRV_TOOLS_HASH a4bdb8161f0e959c75d0d82d367c24f2)
-set(SHADERC_SPIRV_TOOLS_HASH_TYPE MD5)
-set(SHADERC_SPIRV_TOOLS_FILE SPIRV-Tools-${SHADERC_SPIRV_TOOLS_VERSION}.tar.gz)
-
-set(SHADERC_SPIRV_HEADERS_VERSION 85a1ed200d50660786c1a88d9166e871123cce39)
-set(SHADERC_SPIRV_HEADERS_URI https://github.com/KhronosGroup/SPIRV-Headers/archive/${SHADERC_SPIRV_HEADERS_VERSION}.tar.gz)
-set(SHADERC_SPIRV_HEADERS_HASH 10d5e8160f39344a641523810b075568)
-set(SHADERC_SPIRV_HEADERS_HASH_TYPE MD5)
-set(SHADERC_SPIRV_HEADERS_FILE SPIRV-Headers-${SHADERC_SPIRV_HEADERS_VERSION}.tar.gz)
-
-set(SHADERC_GLSLANG_VERSION 89db4e1caa273a057ea46deba709c6e50001b314)
-set(SHADERC_GLSLANG_URI https://github.com/KhronosGroup/glslang/archive/${SHADERC_GLSLANG_VERSION}.tar.gz)
-set(SHADERC_GLSLANG_HASH 3b3c79ad8e9132ffcb8b63cc29c532e2)
-set(SHADERC_GLSLANG_HASH_TYPE MD5)
-set(SHADERC_GLSLANG_FILE glslang-${SHADERC_GLSLANG_VERSION}.tar.gz)
-
-set(VULKAN_VERSION v1.2.198)
-
-set(VULKAN_HEADERS_URI https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/${VULKAN_VERSION}.tar.gz)
-set(VULKAN_HEADERS_HASH 64fe73e887c963ad546bfc7f9505fa1d)
-set(VULKAN_HEADERS_HASH_TYPE MD5)
-set(VULKAN_HEADERS_FILE Vulkan-Headers-${VULKAN_VERSION}.tar.gz)
-
-set(VULKAN_LOADER_URI https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/${VULKAN_VERSION}.tar.gz)
-set(VULKAN_LOADER_HASH 015170a74f648fd2b41e209b6bf1ebc4)
-set(VULKAN_LOADER_HASH_TYPE MD5)
-set(VULKAN_LOADER_FILE Vulkan-Loader-${VULKAN_VERSION}.tar.gz)
-
-set(PYBIND11_VERSION 2.10.1)
-set(PYBIND11_URI https://github.com/pybind/pybind11/archive/refs/tags/v${PYBIND11_VERSION}.tar.gz)
-set(PYBIND11_HASH ce07bfd5089245da7807b3faf6cbc878)
-set(PYBIND11_HASH_TYPE MD5)
-set(PYBIND11_FILE pybind-v${PYBIND11_VERSION}.tar.gz)

build_files/build_environment/cmake/vulkan.cmake

@@ -1,55 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(VULKAN_HEADERS_EXTRA_ARGS)
-
-ExternalProject_Add(external_vulkan_headers
-  URL file://${PACKAGE_DIR}/${VULKAN_HEADERS_FILE}
-  URL_HASH ${VULKAN_HEADERS_HASH_TYPE}=${VULKAN_HEADERS_HASH}
-  PREFIX ${BUILD_DIR}/vulkan_headers
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/vulkan_headers -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${VULKAN_HEADERS_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/vulkan_headers
-)
-
-set(VULKAN_LOADER_EXTRA_ARGS
-  -DVULKAN_HEADERS_INSTALL_DIR=${LIBDIR}/vulkan_headers
-)
-
-ExternalProject_Add(external_vulkan_loader
-  URL file://${PACKAGE_DIR}/${VULKAN_LOADER_FILE}
-  URL_HASH ${VULKAN_LOADER_HASH_TYPE}=${VULKAN_LOADER_HASH}
-  PREFIX ${BUILD_DIR}/vulkan_loader
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/vulkan_loader -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${VULKAN_LOADER_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/vulkan_loader
-)
-
-add_dependencies(
-  external_vulkan_loader
-  external_vulkan_headers
-)
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_vulkan_loader after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/vulkan_loader/ ${HARVEST_TARGET}/vulkan
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/vulkan_headers/ ${HARVEST_TARGET}/vulkan
-      DEPENDEES install
-    )
-  endif()
-endif()
-

build_files/build_environment/cmake/wayland.cmake

@@ -14,7 +14,7 @@ ExternalProject_Add(external_wayland
   # NOTE: `-lm` is needed for `libxml2` which is a static library that uses `libm.so`,
   # without this, math symbols such as `floor` aren't found.
   CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env PKG_CONFIG_PATH=${LIBDIR}/expat/lib/pkgconfig:${LIBDIR}/xml2/lib/pkgconfig:${LIBDIR}/ffi/lib/pkgconfig:$PKG_CONFIG_PATH
-                    ${MESON} --prefix ${LIBDIR}/wayland -Ddocumentation=false -Dtests=false -D "c_link_args=-L${LIBDIR}/ffi/lib -lm" . ../external_wayland
+                    meson --prefix ${LIBDIR}/wayland -Ddocumentation=false -Dtests=false -D "c_link_args=-L${LIBDIR}/ffi/lib -lm" . ../external_wayland
   BUILD_COMMAND ninja
   INSTALL_COMMAND ninja install
 )

build_files/build_environment/cmake/wayland_protocols.cmake

@@ -7,7 +7,7 @@ ExternalProject_Add(external_wayland_protocols
   PREFIX ${BUILD_DIR}/wayland-protocols
   # Use `-E` so the `PKG_CONFIG_PATH` can be defined to link against our own WAYLAND.
   CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env PKG_CONFIG_PATH=${LIBDIR}/wayland/lib64/pkgconfig:$PKG_CONFIG_PATH
-                    ${MESON} --prefix ${LIBDIR}/wayland-protocols . ../external_wayland_protocols -Dtests=false
+                    meson --prefix ${LIBDIR}/wayland-protocols . ../external_wayland_protocols -Dtests=false
   BUILD_COMMAND ninja
   INSTALL_COMMAND ninja install
 )

build_files/build_environment/cmake/yamlcpp.cmake

@@ -18,7 +18,6 @@ ExternalProject_Add(external_yamlcpp
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${YAMLCPP_HASH_TYPE}=${YAMLCPP_HASH}
   PREFIX ${BUILD_DIR}/yamlcpp
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/yamlcpp ${DEFAULT_CMAKE_FLAGS} ${YAMLCPP_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/yamlcpp
 )

build_files/build_environment/darwin/set_rpath.py

@@ -1,44 +0,0 @@
-#!/usr/bin/env python3
-# macOS utility to remove all rpaths and add a new one.
-
-import os
-import re
-import subprocess
-import sys
-
-# Strip version numbers from dependenciesm macOS notarizatiom fails
-# with version symlinks.
-def strip_lib_version(name):
-    name = re.sub(r'(\.[0-9]+)+.dylib', '.dylib', name)
-    name = re.sub(r'(\.[0-9]+)+.so', '.so', name)
-    name = re.sub(r'(\.[0-9]+)+.cpython', '.cpython', name)
-    return name
-
-rpath = sys.argv[1]
-file = sys.argv[2]
-
-# Find existing rpaths and delete them one by one.
-p = subprocess.run(['otool', '-l', file], capture_output=True)
-tokens = p.stdout.split()
-
-for i, token in enumerate(tokens):
-    if token == b'LC_RPATH':
-        old_rpath = tokens[i + 4]
-        subprocess.run(['install_name_tool', '-delete_rpath', old_rpath, file])
-
-subprocess.run(['install_name_tool', '-add_rpath', rpath, file])
-
-# Strip version from dependencies.
-p = subprocess.run(['otool', '-L', file], capture_output=True)
-tokens = p.stdout.split()
-for i, token in enumerate(tokens):
-    token = token.decode("utf-8")
-    if token.startswith("@rpath"):
-        new_token = strip_lib_version(token)
-        subprocess.run(['install_name_tool', '-change', token, new_token, file])
-
-# Strip version from library itself.
-new_file = strip_lib_version(file)
-new_id = '@rpath/' + os.path.basename(new_file)
-os.rename(file, new_file)
-subprocess.run(['install_name_tool', '-id', new_id, new_file])

build_files/build_environment/install_deps.sh

@@ -3187,6 +3187,7 @@ compile_USD() {
     if [ -d $INST/tbb ]; then
       cmake_d="$cmake_d $cmake_d -D TBB_ROOT_DIR=$INST/tbb"
     fi
+    cmake_d="$cmake_d -DPXR_SET_INTERNAL_NAMESPACE=usdBlender"
     cmake_d="$cmake_d -DPXR_ENABLE_PYTHON_SUPPORT=OFF"
     cmake_d="$cmake_d -DPXR_BUILD_IMAGING=OFF"
     cmake_d="$cmake_d -DPXR_BUILD_TESTS=OFF"

build_files/build_environment/patches/boost.diff

@@ -1,12 +0,0 @@
---- a/boost/python//detail/wrap_python.hpp	2022-12-09 19:16:17
-+++ b/boost/python//detail/wrap_python.hpp	2022-12-09 19:18:08
-@@ -206,7 +206,8 @@
- 
- #ifdef DEBUG_UNDEFINED_FROM_WRAP_PYTHON_H
- # undef DEBUG_UNDEFINED_FROM_WRAP_PYTHON_H
--# define _DEBUG
-+// BLENDER: TBB excepts this to have a value.
-+# define _DEBUG 1
- # ifdef _CRT_NOFORCE_MANIFEST_DEFINED_FROM_WRAP_PYTHON_H
- #  undef _CRT_NOFORCE_MANIFEST_DEFINED_FROM_WRAP_PYTHON_H
- #  undef _CRT_NOFORCE_MANIFEST

build_files/build_environment/patches/boost.user.jam.in

@@ -1,4 +1,4 @@
 using python : @PYTHON_SHORT_VERSION@ : @PYTHON_BINARY@
- : @LIBDIR@/python/include @LIBDIR@/python/include/python@PYTHON_SHORT_VERSION@/ 
+ : @LIBDIR@/python/include @LIBDIR@/python/include/python@PYTHON_SHORT_VERSION@m/ 
  : @LIBDIR@/python/libs  
 ;

build_files/build_environment/patches/materialx.diff

@@ -1,13 +0,0 @@
-diff -Naur orig/source/PyMaterialX/PyBind11/tools/FindPythonLibsNew.cmake external_materialx/source/PyMaterialX/PyBind11/tools/FindPythonLibsNew.cmake
---- orig/source/PyMaterialX/PyBind11/tools/FindPythonLibsNew.cmake      2022-11-04 14:23:29 -0600
-+++ external_materialx/source/PyMaterialX/PyBind11/tools/FindPythonLibsNew.cmake        2022-11-08 11:58:45 -0700
-@@ -181,6 +181,9 @@
- string(REGEX REPLACE "\\\\" "/" PYTHON_SITE_PACKAGES "${PYTHON_SITE_PACKAGES}")
-
- if(CMAKE_HOST_WIN32)
-+  if(PYTHON_EXECUTABLE MATCHES "_d.exe$")
-+    set(PYTHON_LIBRARY_SUFFIX ${PYTHON_LIBRARY_SUFFIX}_d)
-+  endif()
-   set(PYTHON_LIBRARY "${PYTHON_PREFIX}/libs/python${PYTHON_LIBRARY_SUFFIX}.lib")
-
-   # when run in a venv, PYTHON_PREFIX points to it. But the libraries remain in the

build_files/build_environment/patches/opencollada.diff

@@ -3,19 +3,19 @@ index 95abbe2..4f14f30 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -254,11 +254,11 @@ if(USE_STATIC_MSVC_RUNTIME)
- endif()
+ endif()
- 
+ 
- #adding PCRE
+ #adding PCRE
--find_package(PCRE)
+-find_package(PCRE)
-+#find_package(PCRE)
++#find_package(PCRE)
- if (PCRE_FOUND)
+ if (PCRE_FOUND)
- 	message(STATUS "SUCCESSFUL: PCRE found")
+ 	message(STATUS "SUCCESSFUL: PCRE found")
- else ()  # if pcre not found building its local copy from ./Externals
+ else ()  # if pcre not found building its local copy from ./Externals
--	if (WIN32 OR APPLE)
+-	if (WIN32 OR APPLE)
-+	if (1)
++	if (1)
- 		message("WARNING: Native PCRE not found, taking PCRE from ./Externals")
+ 		message("WARNING: Native PCRE not found, taking PCRE from ./Externals")
- 		add_definitions(-DPCRE_STATIC)
+ 		add_definitions(-DPCRE_STATIC)
- 		add_subdirectory(${EXTERNAL_LIBRARIES}/pcre)
+ 		add_subdirectory(${EXTERNAL_LIBRARIES}/pcre)
 diff --git a/DAEValidator/CMakeLists.txt b/DAEValidator/CMakeLists.txt
 index 03ad540..f7d05cf 100644
 --- a/DAEValidator/CMakeLists.txt
@@ -66,13 +66,13 @@ index 40081e7..e1d1bfa 100644
 --- a/Externals/LibXML/CMakeLists.txt
 +++ b/Externals/LibXML/CMakeLists.txt
 @@ -9,6 +9,7 @@ add_definitions(
- 		-DLIBXML_SCHEMAS_ENABLED
+ 		-DLIBXML_SCHEMAS_ENABLED
- 		-DLIBXML_XPATH_ENABLED
+ 		-DLIBXML_XPATH_ENABLED
- 		-DLIBXML_TREE_ENABLED
+ 		-DLIBXML_TREE_ENABLED
-+		-DLIBXML_STATIC
++		-DLIBXML_STATIC
- 	)
+ 	)
- 	
+ 	
- if(USE_STATIC_MSVC_RUNTIME)
+ if(USE_STATIC_MSVC_RUNTIME)
 diff --git a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp b/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
 index 1f9a3ee..d151e9a 100644
 --- a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
@@ -155,15 +155,3 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt
  
  # Library export
  install(EXPORT LibraryExport DESTINATION ${OPENCOLLADA_INST_CMAKECONFIG} FILE OpenCOLLADATargets.cmake)
-diff -Naur OpenCOLLADA-1.6.68/common/libBuffer/include/CommonFWriteBufferFlusher.h external_opencollada/common/libBuffer/include/CommonFWriteBufferFlusher.h
---- OpenCOLLADA-1.6.68/common/libBuffer/include/CommonFWriteBufferFlusher.h	2018-11-26 14:43:10 -0700
-+++ external_opencollada/common/libBuffer/include/CommonFWriteBufferFlusher.h	2022-08-19 11:36:04 -0600
-@@ -23,7 +23,7 @@
- #	include <tr1/unordered_map>
- #endif
- 
--#ifdef _LIBCPP_VERSION
-+#if defined(_LIBCPP_VERSION) || defined(WIN32)
- // If we're compiling with libc++, create a namespace alias for tr1 that points to std.
- // Not particularly elegant, and largely should be filed under "hack", but it works for OS X with clang for now.
- namespace std {

build_files/build_environment/patches/openimageio.diff

@@ -21,3 +21,16 @@ diff -Naur orig/src/cmake/compiler.cmake external_openimageio/src/cmake/compiler
  endif (MSVC)
  
  if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD"
+diff -Naur orig/src/include/OpenImageIO/platform.h external_openimageio/src/include/OpenImageIO/platform.h
+--- orig/src/include/OpenImageIO/platform.h	2020-05-10 21:43:52 -0600
++++ external_openimageio/src/include/OpenImageIO/platform.h	2020-05-13 17:04:36 -0600
+@@ -41,6 +41,9 @@
+ #    ifndef NOMINMAX
+ #        define NOMINMAX
+ #    endif
++#    ifndef NOGDI
++#        define NOGDI
++#    endif
+ #    include <windows.h>
+ #endif
+ 

build_files/build_environment/patches/openvdb.diff

@@ -1,6 +1,30 @@
+diff -ur openvdb-9.0.0/cmake/FindTBB.cmake openvdb/cmake/FindTBB.cmake
+--- openvdb-9.0.0/cmake/FindTBB.cmake	2021-10-30 03:55:40.000000000 +0100
++++ openvdb/cmake/FindTBB.cmake	2022-03-31 11:33:15.592329750 +0100
+@@ -252,7 +252,8 @@
+       set(_TBB_LIB_NAME "${_TBB_LIB_NAME}${TBB_DEBUG_SUFFIX}")
+     endif()
+ 
+-    find_library(Tbb_${COMPONENT}_LIBRARY_${BUILD_TYPE} ${_TBB_LIB_NAME}
++    find_library(Tbb_${COMPONENT}_LIBRARY_${BUILD_TYPE}
++      NAMES ${_TBB_LIB_NAME} ${_TBB_LIB_NAME}_static
+       ${_FIND_TBB_ADDITIONAL_OPTIONS}
+       PATHS ${_TBB_LIBRARYDIR_SEARCH_DIRS}
+       PATH_SUFFIXES ${CMAKE_INSTALL_LIBDIR} lib64 lib
 diff -Naur openvdb-8.0.0/openvdb/openvdb/CMakeLists.txt openvdb/openvdb/openvdb/CMakeLists.txt
 --- openvdb-8.0.0/openvdb/openvdb/CMakeLists.txt	2020-12-24 10:13:14 -0700
 +++ openvdb/openvdb/openvdb/CMakeLists.txt	2021-02-05 11:18:33 -0700
+@@ -107,7 +107,9 @@
+   #        http://boost.2283326.n4.nabble.com/CMake-config-scripts-broken-in-1-70-td4708957.html
+   #        https://github.com/boostorg/boost_install/commit/160c7cb2b2c720e74463865ef0454d4c4cd9ae7c
+   set(BUILD_SHARED_LIBS ON)
+-  set(Boost_USE_STATIC_LIBS OFF)
++  if(NOT WIN32) # blender links boost statically on windows
++    set(Boost_USE_STATIC_LIBS OFF)
++  endif()
+ endif()
+ 
+ find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS iostreams system)
 @@ -146,6 +148,7 @@
          Boost::disable_autolinking  # add -DBOOST_ALL_NO_LIB
        )
@@ -75,18 +99,321 @@ diff -Naur openvdb-8.0.0/openvdb/openvdb/version.rc.in openvdb/openvdb/openvdb/v
 +
 +    END
 +END
-diff -Naur orig/openvdb/openvdb/tree/ValueAccessor.h openvdb/openvdb/openvdb/tree/ValueAccessor.h
+diff --git a/nanovdb/nanovdb/NanoVDB.h b/nanovdb/nanovdb/NanoVDB.h
---- orig/openvdb/openvdb/tree/ValueAccessor.h	2022-11-02 13:58:26 -0600
+index cc2e54b77..703d2eabc 100644
-+++ openvdb/openvdb/openvdb/tree/ValueAccessor.h	2022-11-02 18:55:09 -0600
+--- a/nanovdb/nanovdb/NanoVDB.h
-@@ -872,7 +872,10 @@
++++ b/nanovdb/nanovdb/NanoVDB.h
-     using LeafNodeType = typename NodeType::LeafNodeType;
+@@ -161,8 +161,8 @@ typedef unsigned long long uint64_t;
-     using CoordLimits = std::numeric_limits<Int32>;
  
--    static_assert(std::is_same<NodeType, LeafNodeType>::value);
+ #endif // __CUDACC_RTC__
-+    // Blender: Technically not an issue in OpenVDB, but USD 21.11 still builds 
-+    // as C++14 which does not support terse asserts yet. Add a message to 
-+    // explicitly select the C++14 supported static assert.
-+    static_assert(std::is_same<NodeType, LeafNodeType>::value, "cache item node type is not leaf node type");
  
-     CacheItem(TreeCacheT& parent)
+-#ifdef __CUDACC__
-         : mParent(&parent)
+-// Only define __hostdev__ when using NVIDIA CUDA compiler
++#if defined(__CUDACC__) || defined(__HIP__)
++// Only define __hostdev__ when using NVIDIA CUDA or HIP compiler
+ #define __hostdev__ __host__ __device__
+ #else
+ #define __hostdev__
+@@ -611,7 +611,7 @@ struct Delta<double>
+ /// Maximum floating-point values
+ template<typename T>
+ struct Maximum;
+-#ifdef __CUDA_ARCH__
++#if defined(__CUDA_ARCH__) || defined(__HIP__)
+ template<>
+ struct Maximum<int>
+ {
+@@ -1176,10 +1176,10 @@ using Vec3f = Vec3<float>;
+ using Vec3i = Vec3<int>;
+ 
+ /// @brief Return a single precision floating-point vector of this coordinate
+-Vec3f Coord::asVec3s() const { return Vec3f(float(mVec[0]), float(mVec[1]), float(mVec[2])); }
++__hostdev__ inline Vec3f Coord::asVec3s() const { return Vec3f(float(mVec[0]), float(mVec[1]), float(mVec[2])); }
+ 
+ /// @brief Return a double precision floating-point vector of this coordinate
+-Vec3d Coord::asVec3d() const { return Vec3d(double(mVec[0]), double(mVec[1]), double(mVec[2])); }
++__hostdev__ inline Vec3d Coord::asVec3d() const { return Vec3d(double(mVec[0]), double(mVec[1]), double(mVec[2])); }
+ 
+ // ----------------------------> Vec4 <--------------------------------------
+ 
+@@ -2042,7 +2042,7 @@ struct Map
+ }; // Map
+ 
+ template<typename Mat4T>
+-void Map::set(const Mat4T& mat, const Mat4T& invMat, double taper)
++__hostdev__ void Map::set(const Mat4T& mat, const Mat4T& invMat, double taper)
+ {
+     float * mf = mMatF, *vf = mVecF;
+     float*  mif = mInvMatF;
+@@ -2486,7 +2486,7 @@ class Grid : private GridData
+ }; // Class Grid
+ 
+ template<typename TreeT>
+-int Grid<TreeT>::findBlindDataForSemantic(GridBlindDataSemantic semantic) const
++__hostdev__ int Grid<TreeT>::findBlindDataForSemantic(GridBlindDataSemantic semantic) const
+ {
+     for (uint32_t i = 0, n = this->blindDataCount(); i < n; ++i)
+         if (this->blindMetaData(i).mSemantic == semantic)
+@@ -2671,7 +2671,7 @@ class Tree : private TreeData<RootT::LEVEL>
+ }; // Tree class
+ 
+ template<typename RootT>
+-void Tree<RootT>::extrema(ValueType& min, ValueType& max) const
++__hostdev__ void Tree<RootT>::extrema(ValueType& min, ValueType& max) const
+ {
+     min = this->root().minimum();
+     max = this->root().maximum();
+@@ -3880,7 +3880,7 @@ class LeafNode : private LeafData<BuildT, CoordT, MaskT, Log2Dim>
+ }; // LeafNode class
+ 
+ template<typename ValueT, typename CoordT, template<uint32_t> class MaskT, uint32_t LOG2DIM>
+-inline void LeafNode<ValueT, CoordT, MaskT, LOG2DIM>::updateBBox()
++__hostdev__ inline void LeafNode<ValueT, CoordT, MaskT, LOG2DIM>::updateBBox()
+ {
+     static_assert(LOG2DIM == 3, "LeafNode::updateBBox: only supports LOGDIM = 3!");
+     if (!this->isActive()) return;
+diff --git a/nanovdb/nanovdb/util/SampleFromVoxels.h b/nanovdb/nanovdb/util/SampleFromVoxels.h
+index 852123dac..e779d66cf 100644
+--- a/nanovdb/nanovdb/util/SampleFromVoxels.h
++++ b/nanovdb/nanovdb/util/SampleFromVoxels.h
+@@ -22,7 +22,7 @@
+ #define NANOVDB_SAMPLE_FROM_VOXELS_H_HAS_BEEN_INCLUDED
+ 
+ // Only define __hostdev__ when compiling as NVIDIA CUDA
+-#ifdef __CUDACC__
++#if defined(__CUDACC__) || defined(__HIP__)
+ #define __hostdev__ __host__ __device__
+ #else
+ #include <cmath> // for floor
+@@ -136,7 +136,7 @@ class SampleFromVoxels<TreeOrAccT, 0, false>
+ 
+ template<typename TreeOrAccT>
+ template<typename Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()(const Vec3T& xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()(const Vec3T& xyz) const
+ {
+     const CoordT ijk = Round<CoordT>(xyz);
+     if (ijk != mPos) {
+@@ -147,7 +147,7 @@ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()
+ }
+ 
+ template<typename TreeOrAccT>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()(const CoordT& ijk) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()(const CoordT& ijk) const
+ {
+     if (ijk != mPos) {
+         mPos = ijk;
+@@ -158,7 +158,7 @@ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, true>::operator()
+ 
+ template<typename TreeOrAccT>
+ template<typename Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, false>::operator()(const Vec3T& xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 0, false>::operator()(const Vec3T& xyz) const
+ {
+     return mAcc.getValue(Round<CoordT>(xyz));
+ }
+@@ -195,7 +195,7 @@ class TrilinearSampler
+ }; // TrilinearSamplerBase
+ 
+ template<typename TreeOrAccT>
+-void TrilinearSampler<TreeOrAccT>::stencil(CoordT& ijk, ValueT (&v)[2][2][2]) const
++__hostdev__ void TrilinearSampler<TreeOrAccT>::stencil(CoordT& ijk, ValueT (&v)[2][2][2]) const
+ {
+     v[0][0][0] = mAcc.getValue(ijk); // i, j, k
+ 
+@@ -224,7 +224,7 @@ void TrilinearSampler<TreeOrAccT>::stencil(CoordT& ijk, ValueT (&v)[2][2][2]) co
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType TrilinearSampler<TreeOrAccT>::sample(const Vec3T<RealT> &uvw, const ValueT (&v)[2][2][2])
++__hostdev__ typename TreeOrAccT::ValueType TrilinearSampler<TreeOrAccT>::sample(const Vec3T<RealT> &uvw, const ValueT (&v)[2][2][2])
+ {
+ #if 0
+   auto lerp = [](ValueT a, ValueT b, ValueT w){ return fma(w, b-a, a); };// = w*(b-a) + a
+@@ -239,7 +239,7 @@ typename TreeOrAccT::ValueType TrilinearSampler<TreeOrAccT>::sample(const Vec3T<
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-Vec3T<typename TreeOrAccT::ValueType> TrilinearSampler<TreeOrAccT>::gradient(const Vec3T<RealT> &uvw, const ValueT (&v)[2][2][2])
++__hostdev__ Vec3T<typename TreeOrAccT::ValueType> TrilinearSampler<TreeOrAccT>::gradient(const Vec3T<RealT> &uvw, const ValueT (&v)[2][2][2])
+ {
+     static_assert(is_floating_point<ValueT>::value, "TrilinearSampler::gradient requires a floating-point type");
+ #if 0
+@@ -270,7 +270,7 @@ Vec3T<typename TreeOrAccT::ValueType> TrilinearSampler<TreeOrAccT>::gradient(con
+ }
+ 
+ template<typename TreeOrAccT>
+-bool TrilinearSampler<TreeOrAccT>::zeroCrossing(const ValueT (&v)[2][2][2])
++__hostdev__ bool TrilinearSampler<TreeOrAccT>::zeroCrossing(const ValueT (&v)[2][2][2])
+ {
+     static_assert(is_floating_point<ValueT>::value, "TrilinearSampler::zeroCrossing requires a floating-point type");
+     const bool less = v[0][0][0] < ValueT(0);
+@@ -363,21 +363,21 @@ class SampleFromVoxels<TreeOrAccT, 1, true> : public TrilinearSampler<TreeOrAccT
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, true>::operator()(Vec3T<RealT> xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, true>::operator()(Vec3T<RealT> xyz) const
+ {
+     this->cache(xyz);
+     return BaseT::sample(xyz, mVal);
+ }
+ 
+ template<typename TreeOrAccT>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, true>::operator()(const CoordT &ijk) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, true>::operator()(const CoordT &ijk) const
+ {
+     return  ijk == mPos ? mVal[0][0][0] : BaseT::mAcc.getValue(ijk);
+ }
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, true>::gradient(Vec3T<RealT> xyz) const
++__hostdev__ Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, true>::gradient(Vec3T<RealT> xyz) const
+ {
+     this->cache(xyz);
+     return BaseT::gradient(xyz, mVal);
+@@ -393,7 +393,7 @@ __hostdev__ bool SampleFromVoxels<TreeOrAccT, 1, true>::zeroCrossing(Vec3T<RealT
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-void SampleFromVoxels<TreeOrAccT, 1, true>::cache(Vec3T<RealT>& xyz) const
++__hostdev__ void SampleFromVoxels<TreeOrAccT, 1, true>::cache(Vec3T<RealT>& xyz) const
+ {
+     CoordT ijk = Floor<CoordT>(xyz);
+     if (ijk != mPos) {
+@@ -406,7 +406,7 @@ void SampleFromVoxels<TreeOrAccT, 1, true>::cache(Vec3T<RealT>& xyz) const
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator()(Vec3T<RealT> xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator()(Vec3T<RealT> xyz) const
+ {
+     ValueT val[2][2][2];
+     CoordT ijk = Floor<CoordT>(xyz);
+@@ -418,7 +418,7 @@ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator(
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator()(Vec3T<RealT> xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator()(Vec3T<RealT> xyz) const
+ {
+     auto lerp = [](ValueT a, ValueT b, RealT w) { return a + ValueT(w) * (b - a); };
+ 
+@@ -463,7 +463,7 @@ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 1, false>::operator(
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-inline Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, false>::gradient(Vec3T<RealT> xyz) const
++__hostdev__ inline Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, false>::gradient(Vec3T<RealT> xyz) const
+ {
+     ValueT val[2][2][2];
+     CoordT ijk = Floor<CoordT>(xyz);
+@@ -473,7 +473,7 @@ inline Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, fal
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-bool SampleFromVoxels<TreeOrAccT, 1, false>::zeroCrossing(Vec3T<RealT> xyz) const
++__hostdev__ bool SampleFromVoxels<TreeOrAccT, 1, false>::zeroCrossing(Vec3T<RealT> xyz) const
+ {
+     ValueT val[2][2][2];
+     CoordT ijk = Floor<CoordT>(xyz);
+@@ -510,7 +510,7 @@ class TriquadraticSampler
+ }; // TriquadraticSamplerBase
+ 
+ template<typename TreeOrAccT>
+-void TriquadraticSampler<TreeOrAccT>::stencil(const CoordT &ijk, ValueT (&v)[3][3][3]) const
++__hostdev__ void TriquadraticSampler<TreeOrAccT>::stencil(const CoordT &ijk, ValueT (&v)[3][3][3]) const
+ {
+     CoordT p(ijk[0] - 1, 0, 0);
+     for (int dx = 0; dx < 3; ++dx, ++p[0]) {
+@@ -526,7 +526,7 @@ void TriquadraticSampler<TreeOrAccT>::stencil(const CoordT &ijk, ValueT (&v)[3][
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType TriquadraticSampler<TreeOrAccT>::sample(const Vec3T<RealT> &uvw, const ValueT (&v)[3][3][3])
++__hostdev__ typename TreeOrAccT::ValueType TriquadraticSampler<TreeOrAccT>::sample(const Vec3T<RealT> &uvw, const ValueT (&v)[3][3][3])
+ {
+     auto kernel = [](const ValueT* value, double weight)->ValueT {
+         return weight * (weight * (0.5f * (value[0] + value[2]) - value[1]) +
+@@ -545,7 +545,7 @@ typename TreeOrAccT::ValueType TriquadraticSampler<TreeOrAccT>::sample(const Vec
+ }
+ 
+ template<typename TreeOrAccT>
+-bool TriquadraticSampler<TreeOrAccT>::zeroCrossing(const ValueT (&v)[3][3][3])
++__hostdev__ bool TriquadraticSampler<TreeOrAccT>::zeroCrossing(const ValueT (&v)[3][3][3])
+ {
+     static_assert(is_floating_point<ValueT>::value, "TrilinearSampler::zeroCrossing requires a floating-point type");
+     const bool less = v[0][0][0] < ValueT(0);
+@@ -624,14 +624,14 @@ class SampleFromVoxels<TreeOrAccT, 2, true> : public TriquadraticSampler<TreeOrA
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, true>::operator()(Vec3T<RealT> xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, true>::operator()(Vec3T<RealT> xyz) const
+ {
+     this->cache(xyz);
+     return BaseT::sample(xyz, mVal);
+ }
+ 
+ template<typename TreeOrAccT>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, true>::operator()(const CoordT &ijk) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, true>::operator()(const CoordT &ijk) const
+ {
+     return  ijk == mPos ? mVal[1][1][1] : BaseT::mAcc.getValue(ijk);
+ }
+@@ -646,7 +646,7 @@ __hostdev__ bool SampleFromVoxels<TreeOrAccT, 2, true>::zeroCrossing(Vec3T<RealT
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-void SampleFromVoxels<TreeOrAccT, 2, true>::cache(Vec3T<RealT>& xyz) const
++__hostdev__ void SampleFromVoxels<TreeOrAccT, 2, true>::cache(Vec3T<RealT>& xyz) const
+ {
+     CoordT ijk = Floor<CoordT>(xyz);
+     if (ijk != mPos) {
+@@ -657,7 +657,7 @@ void SampleFromVoxels<TreeOrAccT, 2, true>::cache(Vec3T<RealT>& xyz) const
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, false>::operator()(Vec3T<RealT> xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, false>::operator()(Vec3T<RealT> xyz) const
+ {
+     ValueT val[3][3][3];
+     CoordT ijk = Floor<CoordT>(xyz);
+@@ -667,7 +667,7 @@ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 2, false>::operator(
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-bool SampleFromVoxels<TreeOrAccT, 2, false>::zeroCrossing(Vec3T<RealT> xyz) const
++__hostdev__ bool SampleFromVoxels<TreeOrAccT, 2, false>::zeroCrossing(Vec3T<RealT> xyz) const
+ {
+     ValueT val[3][3][3];
+     CoordT ijk = Floor<CoordT>(xyz);
+@@ -710,7 +710,7 @@ class TricubicSampler
+ }; // TricubicSampler
+ 
+ template<typename TreeOrAccT>
+-void TricubicSampler<TreeOrAccT>::stencil(const CoordT& ijk, ValueT (&C)[64]) const
++__hostdev__ void TricubicSampler<TreeOrAccT>::stencil(const CoordT& ijk, ValueT (&C)[64]) const
+ {
+     auto fetch = [&](int i, int j, int k) -> ValueT& { return C[((i + 1) << 4) + ((j + 1) << 2) + k + 1]; };
+ 
+@@ -929,7 +929,7 @@ class SampleFromVoxels<TreeOrAccT, 3, true> : public TricubicSampler<TreeOrAccT>
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 3, true>::operator()(Vec3T<RealT> xyz) const
++__hostdev__ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 3, true>::operator()(Vec3T<RealT> xyz) const
+ {
+     this->cache(xyz);
+     return BaseT::sample(xyz, mC);
+@@ -937,7 +937,7 @@ typename TreeOrAccT::ValueType SampleFromVoxels<TreeOrAccT, 3, true>::operator()
+ 
+ template<typename TreeOrAccT>
+ template<typename RealT, template<typename...> class Vec3T>
+-void SampleFromVoxels<TreeOrAccT, 3, true>::cache(Vec3T<RealT>& xyz) const
++__hostdev__ void SampleFromVoxels<TreeOrAccT, 3, true>::cache(Vec3T<RealT>& xyz) const
+ {
+     CoordT ijk = Floor<CoordT>(xyz);
+     if (ijk != mPos) {
+

build_files/build_environment/patches/osl.diff

@@ -1,8 +1,7 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
+diff -Naur OpenShadingLanguage-1.12.6.2/CMakeLists.txt external_osl/CMakeLists.txt
-index d527232..5ad6eaa 100644
+--- OpenShadingLanguage-1.12.6.2/CMakeLists.txt	2022-09-30 17:43:53 -0600
---- a/CMakeLists.txt
++++ external_osl/CMakeLists.txt	2022-10-15 14:49:26 -0600
-+++ b/CMakeLists.txt
+@@ -101,6 +101,11 @@
-@@ -99,6 +99,11 @@ set (OSL_PTX_INSTALL_DIR "${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}/ptx"
       CACHE STRING "Directory where OptiX PTX files will be installed")
  set (CMAKE_DEBUG_POSTFIX "" CACHE STRING "Library naming postfix for Debug builds (e.g., '_debug')")
  
@@ -14,11 +13,10 @@ index d527232..5ad6eaa 100644
  
  set (OSL_NO_DEFAULT_TEXTURESYSTEM OFF CACHE BOOL "Do not use create a raw OIIO::TextureSystem")
  if (OSL_NO_DEFAULT_TEXTURESYSTEM)
-diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
+diff -Naur OpenShadingLanguage-1.12.6.2/src/cmake/externalpackages.cmake external_osl/src/cmake/externalpackages.cmake
-index a7e098b..dad11d0 100644
+--- OpenShadingLanguage-1.12.6.2/src/cmake/externalpackages.cmake	2022-09-30 17:43:53 -0600
---- a/src/cmake/externalpackages.cmake
++++ external_osl/src/cmake/externalpackages.cmake	2022-10-15 14:49:26 -0600
-+++ b/src/cmake/externalpackages.cmake
+@@ -77,6 +77,7 @@
-@@ -77,6 +77,7 @@ link_directories ("${Boost_LIBRARY_DIRS}")
  
  
  checked_find_package (ZLIB REQUIRED)  # Needed by several packages
@@ -26,10 +24,30 @@ index a7e098b..dad11d0 100644
  
  # IlmBase & OpenEXR
  checked_find_package (OpenEXR REQUIRED
-diff --git a/src/liboslcomp/oslcomp.cpp b/src/liboslcomp/oslcomp.cpp
+diff -Naur OpenShadingLanguage-1.12.6.2/src/include/OSL/llvm_util.h external_osl/src/include/OSL/llvm_util.h
-index 8c2e77b..211b8a7 100644
+--- OpenShadingLanguage-1.12.6.2/src/include/OSL/llvm_util.h	2022-09-30 17:43:53 -0600
---- a/src/liboslcomp/oslcomp.cpp
++++ external_osl/src/include/OSL/llvm_util.h	2022-10-15 15:37:24 -0600
-+++ b/src/liboslcomp/oslcomp.cpp
+@@ -9,6 +9,8 @@
+ #include <unordered_set>
+ #include <vector>
+ 
++#define OSL_HAS_BLENDER_CLEANUP_FIX
++
+ #ifdef LLVM_NAMESPACE
+ namespace llvm = LLVM_NAMESPACE;
+ #endif
+@@ -455,7 +457,7 @@
+     llvm::BasicBlock* masked_return_block() const;
+ 
+     bool is_masking_required() const { return m_is_masking_required; }
+-
++    static void Cleanup ();
+     struct ScopedMasking {
+         ScopedMasking() {}
+ 
+diff -Naur OpenShadingLanguage-1.12.6.2/src/liboslcomp/oslcomp.cpp external_osl/src/liboslcomp/oslcomp.cpp
+--- OpenShadingLanguage-1.12.6.2/src/liboslcomp/oslcomp.cpp	2022-09-30 17:43:53 -0600
++++ external_osl/src/liboslcomp/oslcomp.cpp	2022-10-15 14:49:26 -0600
 @@ -21,6 +21,13 @@
  #if !defined(__STDC_CONSTANT_MACROS)
  #    define __STDC_CONSTANT_MACROS 1
@@ -44,34 +62,50 @@ index 8c2e77b..211b8a7 100644
  #include <clang/Basic/TargetInfo.h>
  #include <clang/Frontend/CompilerInstance.h>
  #include <clang/Frontend/TextDiagnosticPrinter.h>
-diff --git a/src/liboslexec/llvm_instance.cpp b/src/liboslexec/llvm_instance.cpp
+diff -Naur OpenShadingLanguage-1.12.6.2/src/liboslexec/llvm_util.cpp external_osl/src/liboslexec/llvm_util.cpp
-index 8f52546..8c2d0c7 100644
+--- OpenShadingLanguage-1.12.6.2/src/liboslexec/llvm_util.cpp	2022-09-30 17:43:53 -0600
---- a/src/liboslexec/llvm_instance.cpp
++++ external_osl/src/liboslexec/llvm_util.cpp	2022-10-15 15:53:11 -0600
-+++ b/src/liboslexec/llvm_instance.cpp
+@@ -116,8 +116,6 @@
-@@ -1363,6 +1363,10 @@ BackendLLVM::run()
+     return { A.data(), size_t(A.size()) };
- #ifdef OSL_LLVM_NO_BITCODE
-         OSL_ASSERT(!use_rs_bitcode());
-         ll.module(ll.new_module("llvm_ops"));
-+        if (use_optix()) {
-+            ll.module()->setDataLayout("e-i64:64-i128:128-v16:16-v32:32-n16:32:64");
-+            ll.module()->setTargetTriple("nvptx64-nvidia-cuda");
-+        }
- #else
-         if (!use_optix()) {
-             if (use_rs_bitcode()) {
-diff --git a/src/liboslexec/shadingsys.cpp b/src/liboslexec/shadingsys.cpp
-index 46e4529..8e86486 100644
---- a/src/liboslexec/shadingsys.cpp
-+++ b/src/liboslexec/shadingsys.cpp
-@@ -2121,6 +2121,11 @@ ShadingSystemImpl::getattribute(ShaderGroup* group, string_view name,
-         return true;
-     }
- 
-+    if (name == "groupdata_size" && type == TypeDesc::TypeInt) {
-+        *(int*)val = (int)group->m_llvm_groupdata_size;
-+        return true;
-+    }
-+
-     return false;
  }
  
+-
+-
+ namespace pvt {
+ 
+ typedef llvm::SectionMemoryManager LLVMMemoryManager;
+@@ -182,6 +180,13 @@
+     ++jit_mem_hold_users;
+ }
+ 
++void
++LLVM_Util::Cleanup()
++{
++    if (jitmm_hold)
++        jitmm_hold->clear();
++}
++
+ 
+ LLVM_Util::ScopedJitMemoryUser::~ScopedJitMemoryUser()
+ {
+diff --git a/src/include/OSL/mask.h b/src/include/OSL/mask.h
+index 24197af..b9275f6 100644
+--- a/src/include/OSL/mask.h
++++ b/src/include/OSL/mask.h
+@@ -4,7 +4,6 @@
+ 
+ #pragma once
+ 
+-#include <immintrin.h>
+ #include <type_traits>
+ 
+ #include <OSL/oslconfig.h>
+@@ -23,6 +22,8 @@ using std::countr_zero;
+ 
+ #elif OSL_INTEL_CLASSIC_COMPILER_VERSION
+ 
++#include <immintrin.h>
++
+ OSL_FORCEINLINE int popcount(uint32_t x) noexcept { return _mm_popcnt_u32(x);}
+ OSL_FORCEINLINE int popcount(uint64_t x) noexcept { return _mm_popcnt_u64(x); }
+ OSL_FORCEINLINE int countr_zero(uint32_t x) noexcept { return _bit_scan_forward(x); }

build_files/build_environment/patches/python_unix.diff

@@ -36,39 +36,3 @@ index a97a755..07ce853 100644
                  if (self.compiler.find_library_file(self.lib_dirs, lib_name)):
                      ffi_lib = lib_name
                      break
---- a/Modules/posixmodule.c	2022-12-09 21:44:03
-+++ b/Modules/posixmodule.c	2022-12-09 21:39:46
-@@ -10564,10 +10564,15 @@
-         Py_BEGIN_ALLOW_THREADS
- #ifdef HAVE_MKFIFOAT
-         if (dir_fd != DEFAULT_DIR_FD) {
-+// BLENDER: disable also at compile time for compatibility when linking with older Xcode.
-+// https://github.com/python/cpython/issues/97897
-+#ifndef __APPLE__
-             if (HAVE_MKFIFOAT_RUNTIME) {
-                 result = mkfifoat(dir_fd, path->narrow, mode);
- 
-+            } else
-+#endif
-+            {
--            } else {
-                 mkfifoat_unavailable = 1;
-                 result = 0;
-             }
-@@ -10638,10 +10633,15 @@
-         Py_BEGIN_ALLOW_THREADS
- #ifdef HAVE_MKNODAT
-         if (dir_fd != DEFAULT_DIR_FD) {
-+// BLENDER: disable also at compile time for compatibility when linking with older Xcode.
-+// https://github.com/python/cpython/issues/97897
-+#ifndef __APPLE__
-             if (HAVE_MKNODAT_RUNTIME) {
-                 result = mknodat(dir_fd, path->narrow, mode, device);
- 
-+            } else
-+#endif
-+            {
--            } else {
-                 mknodat_unavailable = 1;
-                 result = 0;
-             }

build_files/build_environment/patches/python_windows.diff

@@ -1,22 +0,0 @@
---- a/PCbuild/prepare_ssl.bat	2022-10-30 11:48:14 -0600
-+++ b/PCbuild/prepare_ssl.bat	2022-10-30 11:53:16 -0600
-@@ -47,12 +47,13 @@
- if "%PERL%" == "" where perl > "%TEMP%\perl.loc" 2> nul && set /P PERL= <"%TEMP%\perl.loc" & del "%TEMP%\perl.loc"
- if "%PERL%" == "" (echo Cannot locate perl.exe on PATH or as PERL variable & exit /b 4)
- 
--%MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=Win32
--if errorlevel 1 exit /b
-+REM Blender: we only need x64, ssl is kind of a long build, so just build what we need
-+REM %MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=Win32
-+REM if errorlevel 1 exit /b
- %MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=x64
- if errorlevel 1 exit /b
--%MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=ARM
--if errorlevel 1 exit /b
--%MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=ARM64
--if errorlevel 1 exit /b
-+REM %MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=ARM
-+REM if errorlevel 1 exit /b
-+REM %MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=ARM64
-+REM if errorlevel 1 exit /b
- 

build_files/build_environment/patches/sdl.diff

@@ -30,19 +30,3 @@ diff -ru ./src/video/SDL_video.c ./src/video/SDL_video.c
      if (SDL_strcmp(_this->name, "cocoa") == 0) {  /* don't do this for X11, etc */
          if (Cocoa_IsWindowInFullscreenSpace(window)) {
              return SDL_FALSE;
---- CMakeLists.txt	2022-12-09 20:40:00
-+++ CMakeLists.txt	2022-12-09 20:40:00
-@@ -526,6 +526,13 @@
-     list(APPEND EXTRA_CFLAGS "-fno-strict-aliasing")
-   endif()
- 
-+  # BLENDER: make libs compatible with older Xcode.
-+  # https://github.com/KhronosGroup/MoltenVK/issues/1756
-+  check_c_compiler_flag(-fno-objc-msgsend-selector-stubs HAVE_GCC_NO_OBJC_MSGSEND_SELECTOR_STUBS)
-+  if(HAVE_GCC_NO_OBJC_MSGSEND_SELECTOR_STUBS)
-+    list(APPEND EXTRA_CFLAGS "-fno-objc-msgsend-selector-stubs")
-+  endif()
-+
-   check_c_compiler_flag(-Wdeclaration-after-statement HAVE_GCC_WDECLARATION_AFTER_STATEMENT)
-   if(HAVE_GCC_WDECLARATION_AFTER_STATEMENT)
-     check_c_compiler_flag(-Werror=declaration-after-statement HAVE_GCC_WERROR_DECLARATION_AFTER_STATEMENT)

build_files/build_environment/patches/usd.diff

@@ -1,7 +1,7 @@
-diff -Naur orig/cmake/defaults/Packages.cmake external_usd/cmake/defaults/Packages.cmake
+diff -x .git -ur usd.orig/cmake/defaults/Packages.cmake external_usd/cmake/defaults/Packages.cmake
---- orig/cmake/defaults/Packages.cmake	2022-10-27 12:56:33 -0600
+--- usd.orig/cmake/defaults/Packages.cmake	2019-10-24 22:39:53.000000000 +0200
-+++ external_usd/cmake/defaults/Packages.cmake	2022-10-27 13:05:08 -0600
++++ external_usd/cmake/defaults/Packages.cmake	2019-11-28 13:00:33.185957483 +0100
-@@ -129,7 +129,7 @@
+@@ -64,7 +64,7 @@
  endif()
  
  # --TBB
@@ -10,9 +10,10 @@ diff -Naur orig/cmake/defaults/Packages.cmake external_usd/cmake/defaults/Packag
  add_definitions(${TBB_DEFINITIONS})
  
  # --math
-diff -Naur orig/cmake/defaults/msvcdefaults.cmake external_usd/cmake/defaults/msvcdefaults.cmake
+
---- orig/cmake/defaults/msvcdefaults.cmake	2022-10-27 12:56:33 -0600
+diff -Naur usd_orig/cmake/defaults/msvcdefaults.cmake external_usd/cmake/defaults/msvcdefaults.cmake
-+++ external_usd/cmake/defaults/msvcdefaults.cmake	2022-10-27 13:05:08 -0600
+--- usd_orig/cmake/defaults/msvcdefaults.cmake	2022-02-18 14:49:09 -0700
++++ external_usd/cmake/defaults/msvcdefaults.cmake	2022-03-14 11:41:50 -0600
 @@ -120,9 +120,6 @@
  # for all translation units.
  set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /bigobj")
@@ -23,10 +24,38 @@ diff -Naur orig/cmake/defaults/msvcdefaults.cmake external_usd/cmake/defaults/ms
  # Enable multiprocessor builds.
  set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /MP")
  set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /Gm-")
-diff -Naur orig/pxr/base/arch/timing.h external_usd/pxr/base/arch/timing.h
+
---- orig/pxr/base/arch/timing.h	2022-10-27 12:56:34 -0600
+diff --git a/pxr/base/work/singularTask.h b/pxr/base/work/singularTask.h
-+++ external_usd/pxr/base/arch/timing.h	2022-10-27 13:05:08 -0600
+--- a/pxr/base/work/singularTask.h
-@@ -84,6 +84,10 @@
++++ b/pxr/base/work/singularTask.h
+@@ -120,7 +120,7 @@
+                     // case we go again to ensure the task can do whatever it
+                     // was awakened to do.  Once we successfully take the count
+                     // to zero, we stop.
+-                    size_t old = count;
++                    std::size_t old = count;
+                     do { _fn(); } while (
+                         !count.compare_exchange_strong(old, 0));
+                 });
+
+diff --git a/pxr/usd/sdr/shaderMetadataHelpers.h b/pxr/usd/sdr/shaderMetadataHelpers.h
+--- a/pxr/usd/sdr/shaderMetadataHelpers.h
++++ b/pxr/usd/sdr/shaderMetadataHelpers.h
+@@ -32,6 +32,8 @@
+ #include "pxr/base/tf/token.h"
+ #include "pxr/usd/sdr/declare.h"
+ 
++#include <limits>
++
+ PXR_NAMESPACE_OPEN_SCOPE
+ 
+ /// \namespace ShaderMetadataHelpers
+
+diff --git a/pxr/base/arch/timing.h b/pxr/base/arch/timing.h
+index 517561f..fda5a1f 100644
+--- a/pxr/base/arch/timing.h
++++ b/pxr/base/arch/timing.h
+@@ -91,6 +91,10 @@ ArchGetTickTime()
  inline uint64_t
  ArchGetStartTickTime()
  {
@@ -37,7 +66,7 @@ diff -Naur orig/pxr/base/arch/timing.h external_usd/pxr/base/arch/timing.h
      uint64_t t;
  #if defined (ARCH_OS_DARWIN)
      return ArchGetTickTime();
-@@ -116,6 +120,7 @@
+@@ -123,6 +127,7 @@ ArchGetStartTickTime()
  #error "Unsupported architecture."
  #endif
    return t;
@@ -45,7 +74,7 @@ diff -Naur orig/pxr/base/arch/timing.h external_usd/pxr/base/arch/timing.h
  }
  
  /// Get a "stop" tick time for measuring an interval of time.  See
-@@ -125,6 +130,10 @@
+@@ -132,6 +137,10 @@ ArchGetStartTickTime()
  inline uint64_t
  ArchGetStopTickTime()
  {
@@ -56,7 +85,7 @@ diff -Naur orig/pxr/base/arch/timing.h external_usd/pxr/base/arch/timing.h
      uint64_t t;
  #if defined (ARCH_OS_DARWIN)
      return ArchGetTickTime();
-@@ -155,11 +164,11 @@
+@@ -162,11 +171,11 @@ ArchGetStopTickTime()
  #error "Unsupported architecture."
  #endif
    return t;
@@ -71,46 +100,3 @@ diff -Naur orig/pxr/base/arch/timing.h external_usd/pxr/base/arch/timing.h
  
  /// A simple timer class for measuring an interval of time using the
  /// ArchTickTimer facilities.
-diff -Naur orig/pxr/imaging/hioOpenVDB/CMakeLists.txt external_usd/pxr/imaging/hioOpenVDB/CMakeLists.txt
---- orig/pxr/imaging/hioOpenVDB/CMakeLists.txt	2022-10-27 12:56:35 -0600
-+++ external_usd/pxr/imaging/hioOpenVDB/CMakeLists.txt	2022-10-27 13:05:08 -0600
-@@ -20,6 +20,12 @@
-     LIST(APPEND __VDB_IMATH_LIBS ${OPENEXR_Half_LIBRARY})
- endif()
- 
-+if (WIN32)
-+    # OpenVDB uses constants from <cmath> that aren't available on
-+    # Windows unless this is defined.
-+    add_definitions(-D_USE_MATH_DEFINES)
-+endif()
-+
- pxr_library(hioOpenVDB
-     LIBRARIES
-         ar
-diff -Naur orig/pxr/usdImaging/CMakeLists.txt external_usd/pxr/usdImaging/CMakeLists.txt
---- orig/pxr/usdImaging/CMakeLists.txt	2022-10-27 12:56:37 -0600
-+++ external_usd/pxr/usdImaging/CMakeLists.txt	2022-10-27 13:05:08 -0600
-@@ -7,7 +7,7 @@
-     usdVolImaging
-     usdAppUtils
-     usdviewq
--    bin
-+#    bin
-     plugin
- )
- 
-diff -Naur orig/cmake/macros/Private.cmake external_usd/cmake/macros/Private.cmake
---- orig/cmake/macros/Private.cmake     2022-02-18 14:49:09 -0700
-+++ external_usd/cmake/macros/Private.cmake     2022-08-05 10:42:03 -0600
-@@ -900,8 +900,10 @@
-         return()
-     endif()
-
--    if (WIN32 AND PXR_USE_DEBUG_PYTHON)
-+    if (WIN32 AND PXR_USE_DEBUG_PYTHON AND NOT CMAKE_DEBUG_POSTFIX)
-         # On Windows when compiling with debug python the library must be named with _d.
-+        # Blender: but this can be skipped if CMAKE_DEBUG_POSTFIX is set, it knows
-+        # what it is doing and we don't want libraries ending in _d_d.pyd 
-         set(LIBRARY_NAME "_${NAME}_d")
-     else()
-         set(LIBRARY_NAME "_${NAME}")

build_files/build_environment/windows/build_deps.cmd

@@ -103,19 +103,15 @@ if %ERRORLEVEL% NEQ 0 (
 )
 
 set StatusFile=%BUILD_DIR%\%1_%2.log
-set original_path=%path%
+set path=%BUILD_DIR%\downloads\mingw\mingw64\msys\1.0\bin\;%BUILD_DIR%\downloads\nasm-2.12.01\;%path%
-set oiio_paths=%Staging%\%BuildDir%%ARCH%R\Release\openimageio\bin;%Staging%\%BuildDir%%ARCH%D\Debug\openimageio\bin
-set boost_paths=%Staging%\%BuildDir%%ARCH%R\Release\boost\lib;%Staging%\%BuildDir%%ARCH%D\Debug\boost\lib
-set openexr_paths=%Staging%\%BuildDir%%ARCH%R\Release\openexr\bin;%Staging%\%BuildDir%%ARCH%D\Debug\openexr\bin
-set imath_paths=%Staging%\%BuildDir%%ARCH%R\Release\imath\bin;%Staging%\%BuildDir%%ARCH%D\Debug\imath\bin
-set path=%BUILD_DIR%\downloads\mingw\mingw64\msys\1.0\bin\;%BUILD_DIR%\downloads\nasm-2.12.01\;%path%;%boost_paths%;%oiio_paths%;%openexr_paths%;%imath_paths%
 mkdir %STAGING%\%BuildDir%%ARCH%R
 cd %Staging%\%BuildDir%%ARCH%R
 echo %DATE% %TIME% : Start > %StatusFile%
 cmake -G "%CMAKE_BUILDER%" %CMAKE_BUILD_ARCH% -Thost=x64  %SOURCE_DIR% -DPACKAGE_DIR=%BUILD_DIR%/packages -DDOWNLOAD_DIR=%BUILD_DIR%/downloads -DBUILD_MODE=Release -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/
 echo %DATE% %TIME% : Release Configuration done >> %StatusFile%
 if "%dobuild%" == "1" (
-	msbuild -maxcpucount:1 "BlenderDependencies.sln" /p:Configuration=Release /fl /flp:logfile=BlenderDeps.log;Verbosity=minimal  /verbosity:minimal
+	msbuild /m:1 "ll.vcxproj" /p:Configuration=Release /fl /flp:logfile=BlenderDeps_llvm.log;Verbosity=normal
+	msbuild /m:1 "BlenderDependencies.sln" /p:Configuration=Release /fl /flp:logfile=BlenderDeps.log;Verbosity=minimal  /verbosity:minimal
 	echo %DATE% %TIME% : Release Build done >> %StatusFile%
 	cmake --build . --target Harvest_Release_Results  > Harvest_Release.txt
 )
@@ -127,7 +123,8 @@ cd %Staging%\%BuildDir%%ARCH%D
 cmake -G "%CMAKE_BUILDER%" %CMAKE_BUILD_ARCH% -Thost=x64 %SOURCE_DIR% -DPACKAGE_DIR=%BUILD_DIR%/packages -DDOWNLOAD_DIR=%BUILD_DIR%/downloads -DCMAKE_BUILD_TYPE=Debug -DBUILD_MODE=Debug -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/  %CMAKE_DEBUG_OPTIONS%
 echo %DATE% %TIME% : Debug Configuration done >> %StatusFile%
 if "%dobuild%" == "1" (
-	msbuild -maxcpucount:1 "BlenderDependencies.sln" /p:Configuration=Debug /verbosity:n /fl /flp:logfile=BlenderDeps.log;;Verbosity=normal
+	msbuild /m:1 "ll.vcxproj" /p:Configuration=Debug /fl /flp:logfile=BlenderDeps_llvm.log;;Verbosity=normal 
+	msbuild /m:1 "BlenderDependencies.sln" /p:Configuration=Debug /verbosity:n /fl /flp:logfile=BlenderDeps.log;;Verbosity=normal
 	echo %DATE% %TIME% : Debug Build done >> %StatusFile%
 	cmake --build . --target Harvest_Debug_Results> Harvest_Debug.txt
 )
@@ -135,5 +132,4 @@ echo %DATE% %TIME% : Debug Harvest done >> %StatusFile%
 cd %BUILD_DIR%
 
 :exit
-set path=%original_path%
 Echo .

build_files/buildbot/config/blender_linux.cmake

@@ -28,4 +28,4 @@ set(LIBDIR "${CMAKE_CURRENT_LIST_DIR}/../../../../lib/${LIBDIR_NAME}" CACHE STRI
 # Platform specific configuration, to ensure static linking against everything.
 
 # Additional linking libraries
-set(CMAKE_EXE_LINKER_FLAGS   "-lrt -no-pie"  CACHE STRING "" FORCE)
+set(CMAKE_EXE_LINKER_FLAGS   "-lrt -static-libstdc++ -no-pie"  CACHE STRING "" FORCE)

build_files/cmake/Modules/FindOpenColorIO.cmake

@@ -24,7 +24,6 @@ SET(_opencolorio_FIND_COMPONENTS
   yaml-cpp
   expat
   pystring
-  minizip
 )
 
 SET(_opencolorio_SEARCH_DIRS

build_files/cmake/Modules/FindPythonLibsUnix.cmake

@@ -13,7 +13,6 @@
 #
 # This module defines
 #  PYTHON_VERSION
-#  PYTHON_VERSION_NO_DOTS
 #  PYTHON_INCLUDE_DIRS
 #  PYTHON_INCLUDE_CONFIG_DIRS
 #  PYTHON_LIBRARIES
@@ -65,11 +64,11 @@ IF(DEFINED PYTHON_LIBPATH)
   SET(_IS_LIB_PATH_DEF ON)
 ENDIF()
 
-STRING(REPLACE "." "" PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
+STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
 
 SET(_python_SEARCH_DIRS
   ${PYTHON_ROOT_DIR}
-  "$ENV{HOME}/py${PYTHON_VERSION_NO_DOTS}"
+  "$ENV{HOME}/py${_PYTHON_VERSION_NO_DOTS}"
   "/opt/lib/python-${PYTHON_VERSION}"
 )
 
@@ -212,6 +211,7 @@ IF(PYTHONLIBSUNIX_FOUND)
   )
 ENDIF()
 
+UNSET(_PYTHON_VERSION_NO_DOTS)
 UNSET(_PYTHON_ABI_FLAGS)
 UNSET(_python_SEARCH_DIRS)
 

build_files/cmake/Modules/FindUSD.cmake

@@ -59,9 +59,6 @@ ELSE()
     get_filename_component(USD_LIBRARY_DIR ${USD_LIBRARY} DIRECTORY)
     SET(USD_INCLUDE_DIRS ${USD_INCLUDE_DIR})
     set(USD_LIBRARIES ${USD_LIBRARY})
-    IF(EXISTS ${USD_INCLUDE_DIR}/pxr/base/tf/pyModule.h)
-      SET(USD_PYTHON_SUPPORT ON)
-    ENDIF()
   ENDIF()
 ENDIF()
 

build_files/cmake/Modules/GTestTesting.cmake

@@ -95,9 +95,6 @@ macro(BLENDER_SRC_GTEST_EX)
       set_tests_properties(${TARGET_NAME} PROPERTIES
         ENVIRONMENT LSAN_OPTIONS=exitcode=0:$ENV{LSAN_OPTIONS}
       )
-      if(WIN32)
-        set_tests_properties(${TARGET_NAME} PROPERTIES ENVIRONMENT "PATH=${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/blender.shared/;$ENV{PATH}")
-      endif()
     endif()
     if(WIN32)
       set_target_properties(${TARGET_NAME} PROPERTIES VS_GLOBAL_VcpkgEnabled "false")

build_files/cmake/config/blender_full.cmake

@@ -58,7 +58,6 @@ 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           OFF CACHE BOOL "" FORCE)
 
 set(WITH_MEM_JEMALLOC        ON  CACHE BOOL "" FORCE)
 

build_files/cmake/config/blender_lite.cmake

@@ -63,7 +63,6 @@ set(WITH_QUADRIFLOW          OFF CACHE BOOL "" FORCE)
 set(WITH_SDL                 OFF CACHE BOOL "" FORCE)
 set(WITH_TBB                 OFF CACHE BOOL "" FORCE)
 set(WITH_USD                 OFF CACHE BOOL "" FORCE)
-set(WITH_MATERIALX           OFF CACHE BOOL "" FORCE)
 set(WITH_WASAPI              OFF CACHE BOOL "" FORCE)
 set(WITH_XR_OPENXR           OFF CACHE BOOL "" FORCE)
 

build_files/cmake/config/blender_release.cmake

@@ -59,7 +59,6 @@ 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           OFF CACHE BOOL "" FORCE)
 
 set(WITH_MEM_JEMALLOC          ON  CACHE BOOL "" FORCE)
 

build_files/cmake/macros.cmake

@@ -422,9 +422,7 @@ function(blender_add_test_suite)
       --test-assets-dir "${CMAKE_SOURCE_DIR}/../lib/tests"
       --test-release-dir "${_test_release_dir}"
   )
-  if(WIN32)
+
-    set_tests_properties(${ARGS_SUITE_NAME} PROPERTIES ENVIRONMENT "PATH=${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/blender.shared/;$ENV{PATH}")
-  endif()
   unset(_test_release_dir)
 endfunction()
 
@@ -1259,88 +1257,3 @@ endmacro()
 macro(without_system_libs_end)
   unset(CMAKE_IGNORE_PATH)
 endmacro()
-
-# Utility to gather and install precompiled shared libraries.
-macro(add_bundled_libraries library_dir)
-  if(EXISTS ${LIBDIR})
-    set(_library_dir ${LIBDIR}/${library_dir})
-    if(WIN32)
-      file(GLOB _all_library_versions ${_library_dir}/*\.dll)
-    elseif(APPLE)
-      file(GLOB _all_library_versions ${_library_dir}/*\.dylib*)
-    else()
-      file(GLOB _all_library_versions ${_library_dir}/*\.so*)
-    endif()
-    list(APPEND PLATFORM_BUNDLED_LIBRARIES ${_all_library_versions})
-    list(APPEND PLATFORM_BUNDLED_LIBRARY_DIRS ${_library_dir})
-    unset(_all_library_versions)
-    unset(_library_dir)
- endif()
-endmacro()
-
-macro(windows_install_shared_manifest)
-  set(options OPTIONAL DEBUG RELEASE ALL)
-  set(oneValueArgs)
-  set(multiValueArgs FILES)
-  cmake_parse_arguments(WINDOWS_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
-  # If none of the options are set assume ALL.
-  unset(WINDOWS_CONFIGURATIONS)
-  if(NOT WINDOWS_INSTALL_ALL AND
-     NOT WINDOWS_INSTALL_DEBUG AND
-     NOT WINDOWS_INSTALL_RELEASE)
-    set(WINDOWS_INSTALL_ALL TRUE)
-  endif()
-  # If all is set, turn both DEBUG and RELEASE on.
-  if(WINDOWS_INSTALL_ALL)
-    set(WINDOWS_INSTALL_DEBUG TRUE)
-    set(WINDOWS_INSTALL_RELEASE TRUE)
-  endif()
-  if(WINDOWS_INSTALL_DEBUG)
-    set(WINDOWS_CONFIGURATIONS "${WINDOWS_CONFIGURATIONS};Debug")
-    list(APPEND WINDOWS_SHARED_MANIFEST_DEBUG ${WINDOWS_INSTALL_FILES})
-  endif()
-  if(WINDOWS_INSTALL_RELEASE)
-    list(APPEND WINDOWS_SHARED_MANIFEST_RELEASE ${WINDOWS_INSTALL_FILES})
-    set(WINDOWS_CONFIGURATIONS "${WINDOWS_CONFIGURATIONS};Release;RelWithDebInfo;MinSizeRel")
-  endif()
-  install(FILES ${WINDOWS_INSTALL_FILES}
-          CONFIGURATIONS ${WINDOWS_CONFIGURATIONS}
-          DESTINATION "./blender.shared"
-  )
-endmacro()
-
-macro(windows_generate_manifest)
-  set(options)
-  set(oneValueArgs OUTPUT NAME)
-  set(multiValueArgs FILES)
-  cmake_parse_arguments(WINDOWS_MANIFEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
-  set(MANIFEST_LIBS "")
-  foreach(lib ${WINDOWS_MANIFEST_FILES})
-    get_filename_component(filename ${lib} NAME)
-    set(MANIFEST_LIBS "${MANIFEST_LIBS}    <file name=\"${filename}\"/>\n")
-  endforeach()
-  configure_file(${CMAKE_SOURCE_DIR}/release/windows/manifest/blender.manifest.in ${WINDOWS_MANIFEST_OUTPUT} @ONLY)
-endmacro()
-
-macro(windows_generate_shared_manifest)
-  windows_generate_manifest(
-    FILES "${WINDOWS_SHARED_MANIFEST_DEBUG}"
-    OUTPUT "${CMAKE_BINARY_DIR}/Debug/blender.shared.manifest"
-    NAME "blender.shared"
-  )
-  windows_generate_manifest(
-    FILES "${WINDOWS_SHARED_MANIFEST_RELEASE}"
-    OUTPUT "${CMAKE_BINARY_DIR}/Release/blender.shared.manifest"
-    NAME "blender.shared"
-  )
-  install(
-      FILES ${CMAKE_BINARY_DIR}/Release/blender.shared.manifest
-      DESTINATION "./blender.shared"
-      CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
-  )
-  install(
-      FILES ${CMAKE_BINARY_DIR}/Debug/blender.shared.manifest
-      DESTINATION "./blender.shared"
-      CONFIGURATIONS Debug
-  )
-endmacro()

build_files/cmake/platform/platform_apple.cmake

@@ -21,6 +21,18 @@ function(print_found_status
   endif()
 endfunction()
 
+# Utility to install precompiled shared libraries.
+macro(add_bundled_libraries library)
+  if(EXISTS ${LIBDIR})
+    set(_library_dir ${LIBDIR}/${library}/lib)
+    file(GLOB _all_library_versions ${_library_dir}/*\.dylib*)
+    list(APPEND PLATFORM_BUNDLED_LIBRARIES ${_all_library_versions})
+    list(APPEND PLATFORM_BUNDLED_LIBRARY_DIRS ${_library_dir})
+    unset(_all_library_versions)
+    unset(_library_dir)
+  endif()
+endmacro()
+
 # ------------------------------------------------------------------------
 # Find system provided libraries.
 
@@ -86,15 +98,6 @@ endif()
 
 if(WITH_USD)
   find_package(USD REQUIRED)
-  add_bundled_libraries(usd/lib)
-endif()
-
-if(WITH_MATERIALX)
-  find_package(MaterialX)
-  set_and_warn_library_found("MaterialX" MaterialX_FOUND WITH_MATERIALX)
-  if(WITH_MATERIALX)
-    add_bundled_libraries(materialx/lib)
-  endif()
 endif()
 
 if(WITH_VULKAN_BACKEND)
@@ -105,10 +108,9 @@ if(WITH_VULKAN_BACKEND)
     set(VULKAN_ROOT_DIR ${LIBDIR}/vulkan/macOS)
     set(VULKAN_INCLUDE_DIR ${VULKAN_ROOT_DIR}/include)
     set(VULKAN_LIBRARY ${VULKAN_ROOT_DIR}/lib/libvulkan.1.dylib)
-    set(SHADERC_LIBRARY ${VULKAN_ROOT_DIR}/lib/libshaderc_combined.a)
 
     set(VULKAN_INCLUDE_DIRS ${VULKAN_INCLUDE_DIR} ${MOLTENVK_INCLUDE_DIRS})
-    set(VULKAN_LIBRARIES ${VULKAN_LIBRARY} ${SHADERC_LIBRARY} ${MOLTENVK_LIBRARIES})
+    set(VULKAN_LIBRARIES ${VULKAN_LIBRARY} ${MOLTENVK_LIBRARIES})
   else()
     message(WARNING "Vulkan SDK was not found, disabling WITH_VULKAN_BACKEND")
     set(WITH_VULKAN_BACKEND OFF)
@@ -117,7 +119,6 @@ endif()
 
 if(WITH_OPENSUBDIV)
   find_package(OpenSubdiv)
-  add_bundled_libraries(opensubdiv/lib)
 endif()
 
 if(WITH_CODEC_SNDFILE)
@@ -156,8 +157,6 @@ list(APPEND FREETYPE_LIBRARIES
 
 if(WITH_IMAGE_OPENEXR)
   find_package(OpenEXR)
-  add_bundled_libraries(openexr/lib)
-  add_bundled_libraries(imath/lib)
 endif()
 
 if(WITH_CODEC_FFMPEG)
@@ -256,22 +255,12 @@ if(WITH_BOOST)
   if(WITH_OPENVDB)
     list(APPEND _boost_FIND_COMPONENTS iostreams)
   endif()
-  if(WITH_USD AND USD_PYTHON_SUPPORT)
-    list(APPEND _boost_FIND_COMPONENTS python${PYTHON_VERSION_NO_DOTS})
-  endif()
   find_package(Boost COMPONENTS ${_boost_FIND_COMPONENTS})
 
-  # Boost Python is separate to avoid linking Python into tests that don't need it.
   set(BOOST_LIBRARIES ${Boost_LIBRARIES})
-  if(WITH_USD AND USD_PYTHON_SUPPORT)
-    set(BOOST_PYTHON_LIBRARIES ${Boost_PYTHON${PYTHON_VERSION_NO_DOTS}_LIBRARY})
-    list(REMOVE_ITEM BOOST_LIBRARIES ${BOOST_PYTHON_LIBRARIES})
-  endif()
   set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
   set(BOOST_DEFINITIONS)
 
-  add_bundled_libraries(boost/lib)
-
   mark_as_advanced(Boost_LIBRARIES)
   mark_as_advanced(Boost_INCLUDE_DIRS)
   unset(_boost_FIND_COMPONENTS)
@@ -297,24 +286,18 @@ if(WITH_OPENIMAGEIO)
   )
   set(OPENIMAGEIO_DEFINITIONS "-DOIIO_STATIC_BUILD")
   set(OPENIMAGEIO_IDIFF "${LIBDIR}/openimageio/bin/idiff")
-  add_bundled_libraries(openimageio/lib)
 endif()
 
 if(WITH_OPENCOLORIO)
   find_package(OpenColorIO 2.0.0 REQUIRED)
-  add_bundled_libraries(opencolorio/lib)
 endif()
 
 if(WITH_OPENVDB)
   find_package(OpenVDB)
   find_library(BLOSC_LIBRARIES NAMES blosc HINTS ${LIBDIR}/openvdb/lib)
-  if(BLOSC_LIBRARIES)
+  print_found_status("Blosc" "${BLOSC_LIBRARIES}")
-    list(APPEND OPENVDB_LIBRARIES ${BLOSC_LIBRARIES})
+  list(APPEND OPENVDB_LIBRARIES ${BLOSC_LIBRARIES})
-  else()
-    unset(BLOSC_LIBRARIES CACHE)
-  endif()
   set(OPENVDB_DEFINITIONS)
-  add_bundled_libraries(openvdb/lib)
 endif()
 
 if(WITH_NANOVDB)
@@ -363,7 +346,6 @@ endif()
 
 if(WITH_TBB)
   find_package(TBB REQUIRED)
-  add_bundled_libraries(tbb/lib)
 endif()
 
 if(WITH_POTRACE)
@@ -382,7 +364,7 @@ if(WITH_OPENMP)
     set(OpenMP_LIBRARY_DIR "${LIBDIR}/openmp/lib/")
     set(OpenMP_LINKER_FLAGS "-L'${OpenMP_LIBRARY_DIR}' -lomp")
     set(OpenMP_LIBRARY "${OpenMP_LIBRARY_DIR}/libomp.dylib")
-    add_bundled_libraries(openmp/lib)
+    add_bundled_libraries(openmp)
   endif()
 endif()
 
@@ -498,12 +480,6 @@ if(PLATFORM_BUNDLED_LIBRARIES)
   # different.
   set(CMAKE_SKIP_BUILD_RPATH FALSE)
   list(APPEND CMAKE_BUILD_RPATH ${PLATFORM_BUNDLED_LIBRARY_DIRS})
-
-  # Environment variables to run precompiled executables that needed libraries.
-  list(JOIN PLATFORM_BUNDLED_LIBRARY_DIRS ":" _library_paths)
-  set(PLATFORM_ENV_BUILD "DYLD_LIBRARY_PATH=\"${_library_paths};${DYLD_LIBRARY_PATH}\"")
-  set(PLATFORM_ENV_INSTALL "DYLD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/Blender.app/Contents/Resources/lib/;$DYLD_LIBRARY_PATH")
-  unset(_library_paths)
 endif()
 
 # Same as `CFBundleIdentifier` in Info.plist.

build_files/cmake/platform/platform_old_libs_update.cmake

@@ -44,22 +44,3 @@ if(UNIX AND DEFINED NANOVDB_INCLUDE_DIR)
     unset_cache_variables("^NANOVDB")
   endif()
 endif()
-
-# Detect update to 3.5 libs with shared libraries.
-if(UNIX AND
-  DEFINED TBB_LIBRARY AND
-  TBB_LIBRARY MATCHES "libtbb.a$" AND
-  EXISTS ${LIBDIR}/usd/include/pxr/base/tf/pyModule.h)
-  message(STATUS "Auto updating CMake configuration for Blender 3.5 libraries")
-  unset_cache_variables("^BLOSC")
-  unset_cache_variables("^BOOST")
-  unset_cache_variables("^Boost")
-  unset_cache_variables("^IMATH")
-  unset_cache_variables("^OPENCOLORIO")
-  unset_cache_variables("^OPENEXR")
-  unset_cache_variables("^OPENIMAGEIO")
-  unset_cache_variables("^OPENSUBDIV")
-  unset_cache_variables("^OPENVDB")
-  unset_cache_variables("^TBB")
-  unset_cache_variables("^USD")
-endif()

build_files/cmake/platform/platform_unix.cmake

@@ -68,7 +68,10 @@ if(EXISTS ${LIBDIR})
   set(Boost_NO_SYSTEM_PATHS ON)
   set(OPENEXR_ROOT_DIR ${LIBDIR}/openexr)
   set(CLANG_ROOT_DIR ${LIBDIR}/llvm)
-  set(MaterialX_DIR ${LIBDIR}/materialx/lib/cmake/MaterialX)
+endif()
+
+if(WITH_STATIC_LIBS)
+  string(APPEND CMAKE_EXE_LINKER_FLAGS " -static-libstdc++")
 endif()
 
 # Wrapper to prefer static libraries
@@ -80,6 +83,15 @@ macro(find_package_wrapper)
   endif()
 endmacro()
 
+# Utility to install precompiled shared libraries.
+macro(add_bundled_libraries library)
+  if(EXISTS ${LIBDIR})
+    file(GLOB _all_library_versions ${LIBDIR}/${library}/lib/*\.so*)
+    list(APPEND PLATFORM_BUNDLED_LIBRARIES ${_all_library_versions})
+    unset(_all_library_versions)
+  endif()
+endmacro()
+
 # ----------------------------------------------------------------------------
 # Precompiled Libraries
 #
@@ -167,10 +179,6 @@ endif()
 if(WITH_IMAGE_OPENEXR)
   find_package_wrapper(OpenEXR)  # our own module
   set_and_warn_library_found("OpenEXR" OPENEXR_FOUND WITH_IMAGE_OPENEXR)
-  if(WITH_IMAGE_OPENEXR)
-    add_bundled_libraries(openexr/lib)
-    add_bundled_libraries(imath/lib)
-  endif()
 endif()
 
 if(WITH_IMAGE_OPENJPEG)
@@ -327,12 +335,11 @@ if(WITH_CYCLES AND WITH_CYCLES_DEVICE_ONEAPI)
 endif()
 
 if(WITH_OPENVDB)
-  find_package(OpenVDB)
+  find_package_wrapper(OpenVDB)
   set_and_warn_library_found("OpenVDB" OPENVDB_FOUND WITH_OPENVDB)
 
   if(OPENVDB_FOUND)
-  add_bundled_libraries(openvdb/lib)
+    find_package_wrapper(Blosc)
-  find_package_wrapper(Blosc)
     set_and_warn_library_found("Blosc" BLOSC_FOUND WITH_OPENVDB_BLOSC)
   endif()
 endif()
@@ -354,24 +361,13 @@ endif()
 if(WITH_USD)
   find_package_wrapper(USD)
   set_and_warn_library_found("USD" USD_FOUND WITH_USD)
- if(WITH_USD)
-    add_bundled_libraries(usd/lib)
- endif()
-endif()
-
-if(WITH_MATERIALX)
-  find_package_wrapper(MaterialX)
-  set_and_warn_library_found("MaterialX" MaterialX_FOUND WITH_MATERIALX)
-  if(WITH_MATERIALX)
-    add_bundled_libraries(materialx/lib)
-  endif()
 endif()
 
 if(WITH_BOOST)
   # uses in build instructions to override include and library variables
   if(NOT BOOST_CUSTOM)
     if(WITH_STATIC_LIBS)
-      set(Boost_USE_STATIC_LIBS OFF)
+      set(Boost_USE_STATIC_LIBS ON)
     endif()
     set(Boost_USE_MULTITHREADED ON)
     set(__boost_packages filesystem regex thread date_time)
@@ -387,9 +383,6 @@ if(WITH_BOOST)
     if(WITH_OPENVDB)
       list(APPEND __boost_packages iostreams)
     endif()
-    if(WITH_USD AND USD_PYTHON_SUPPORT)
-      list(APPEND __boost_packages python${PYTHON_VERSION_NO_DOTS})
-    endif()
     list(APPEND __boost_packages system)
     find_package(Boost 1.48 COMPONENTS ${__boost_packages})
     if(NOT Boost_FOUND)
@@ -407,13 +400,8 @@ if(WITH_BOOST)
     mark_as_advanced(Boost_INCLUDE_DIR)  # why doesn't boost do this?
   endif()
 
-  # Boost Python is separate to avoid linking Python into tests that don't need it.
-  set(BOOST_LIBRARIES ${Boost_LIBRARIES})
-  if(WITH_USD AND USD_PYTHON_SUPPORT)
-    set(BOOST_PYTHON_LIBRARIES ${Boost_PYTHON${PYTHON_VERSION_NO_DOTS}_LIBRARY})
-    list(REMOVE_ITEM BOOST_LIBRARIES ${BOOST_PYTHON_LIBRARIES})
-  endif()
   set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
+  set(BOOST_LIBRARIES ${Boost_LIBRARIES})
   set(BOOST_LIBPATH ${Boost_LIBRARY_DIRS})
   set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
 
@@ -421,8 +409,6 @@ if(WITH_BOOST)
     find_package(IcuLinux)
     list(APPEND BOOST_LIBRARIES ${ICU_LIBRARIES})
   endif()
-
-  add_bundled_libraries(boost/lib)
 endif()
 
 if(WITH_PUGIXML)
@@ -445,6 +431,7 @@ if(WITH_OPENIMAGEIO)
     ${ZLIB_LIBRARIES}
     ${BOOST_LIBRARIES}
   )
+  set(OPENIMAGEIO_LIBPATH)  # TODO, remove and reference the absolute path everywhere
   set(OPENIMAGEIO_DEFINITIONS "")
 
   if(WITH_IMAGE_TIFF)
@@ -458,20 +445,16 @@ if(WITH_OPENIMAGEIO)
   endif()
 
   set_and_warn_library_found("OPENIMAGEIO" OPENIMAGEIO_FOUND WITH_OPENIMAGEIO)
-  if(WITH_OPENIMAGEIO)
-    add_bundled_libraries(openimageio/lib)
-  endif()
 endif()
 
 if(WITH_OPENCOLORIO)
   find_package_wrapper(OpenColorIO 2.0.0)
 
+  set(OPENCOLORIO_LIBRARIES ${OPENCOLORIO_LIBRARIES})
+  set(OPENCOLORIO_LIBPATH)  # TODO, remove and reference the absolute path everywhere
   set(OPENCOLORIO_DEFINITIONS)
-  set_and_warn_library_found("OpenColorIO" OPENCOLORIO_FOUND WITH_OPENCOLORIO)
 
-  if(WITH_OPENCOLORIO)
+  set_and_warn_library_found("OpenColorIO" OPENCOLORIO_FOUND WITH_OPENCOLORIO)
-    add_bundled_libraries(opencolorio/lib)
-  endif()
 endif()
 
 if(WITH_CYCLES AND WITH_CYCLES_EMBREE)
@@ -507,23 +490,17 @@ if(WITH_LLVM)
 endif()
 
 if(WITH_OPENSUBDIV)
-  find_package(OpenSubdiv)
+  find_package_wrapper(OpenSubdiv)
 
   set(OPENSUBDIV_LIBRARIES ${OPENSUBDIV_LIBRARIES})
   set(OPENSUBDIV_LIBPATH)  # TODO, remove and reference the absolute path everywhere
 
   set_and_warn_library_found("OpenSubdiv" OPENSUBDIV_FOUND WITH_OPENSUBDIV)
-  if(WITH_OPENSUBDIV)
-    add_bundled_libraries(opensubdiv/lib)
-  endif()
 endif()
 
 if(WITH_TBB)
   find_package_wrapper(TBB)
   set_and_warn_library_found("TBB" TBB_FOUND WITH_TBB)
-  if(WITH_TBB)
-    add_bundled_libraries(tbb/lib)
-  endif()
 endif()
 
 if(WITH_XR_OPENXR)
@@ -1028,10 +1005,4 @@ if(PLATFORM_BUNDLED_LIBRARIES)
   # and because the build and install folder may be different.
   set(CMAKE_SKIP_BUILD_RPATH FALSE)
   list(APPEND CMAKE_BUILD_RPATH $ORIGIN/lib ${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/lib)
-
-  # Environment variables to run precompiled executables that needed libraries.
-  list(JOIN PLATFORM_BUNDLED_LIBRARY_DIRS ":" _library_paths)
-  set(PLATFORM_ENV_BUILD "LD_LIBRARY_PATH=\"${_library_paths};${LD_LIBRARY_PATH}\"")
-  set(PLATFORM_ENV_INSTALL "LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/lib/;$LD_LIBRARY_PATH")
-  unset(_library_paths)
 endif()

build_files/cmake/platform/platform_win32.cmake

@@ -83,7 +83,7 @@ string(APPEND CMAKE_MODULE_LINKER_FLAGS " /SAFESEH:NO /ignore:4099")
 list(APPEND PLATFORM_LINKLIBS
   ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 Comctl32 version
   advapi32 shfolder shell32 ole32 oleaut32 uuid psapi Dbghelp Shlwapi
-  pathcch Shcore Dwmapi Crypt32
+  pathcch Shcore Dwmapi
 )
 
 if(WITH_INPUT_IME)
@@ -110,41 +110,7 @@ remove_cc_flag("/GR")
 
 # Make the Windows 8.1 API available for use.
 add_definitions(-D_WIN32_WINNT=0x603)
-
+include(build_files/cmake/platform/platform_win32_bundle_crt.cmake)
-# First generate the manifest for tests since it will not need the dependency on the CRT.
-configure_file(${CMAKE_SOURCE_DIR}/release/windows/manifest/blender.exe.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/tests.exe.manifest @ONLY)
-
-if(WITH_WINDOWS_BUNDLE_CRT)
-  set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
-  set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
-  set(CMAKE_INSTALL_OPENMP_LIBRARIES ${WITH_OPENMP})
-  include(InstallRequiredSystemLibraries)
-
-  # ucrtbase(d).dll cannot be in the manifest, due to the way windows 10 handles
-  # redirects for this dll, for details see T88813.
-  foreach(lib ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS})
-    string(FIND ${lib} "ucrtbase" pos)
-    if(NOT pos EQUAL -1)
-      list(REMOVE_ITEM CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS ${lib})
-      install(FILES ${lib} DESTINATION . COMPONENT Libraries)
-    endif()
-  endforeach()
-  # Install the CRT to the blender.crt Sub folder.
-  install(FILES ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ./blender.crt COMPONENT Libraries)
-
-  windows_generate_manifest(
-    FILES "${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}"
-    OUTPUT "${CMAKE_BINARY_DIR}/blender.crt.manifest"
-    NAME "blender.crt"
-  )
-
-  install(FILES ${CMAKE_BINARY_DIR}/blender.crt.manifest DESTINATION ./blender.crt)
-  set(BUNDLECRT "<dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"blender.crt\" version=\"1.0.0.0\" /></dependentAssembly></dependency>")
-  set(BUNDLECRT "${BUNDLECRT}<dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"blender.shared\" version=\"1.0.0.0\" /></dependentAssembly></dependency>")
-endif()
-configure_file(${CMAKE_SOURCE_DIR}/release/windows/manifest/blender.exe.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/blender.exe.manifest @ONLY)
-
-
 remove_cc_flag("/MDd" "/MD" "/Zi")
 
 if(MSVC_CLANG) # Clangs version of cl doesn't support all flags
@@ -285,11 +251,6 @@ if(CMAKE_GENERATOR MATCHES "^Visual Studio.+" AND WITH_CLANG_TIDY)
   set(VS_CLANG_TIDY ON)
 endif()
 
-# To support building against both 3.4 and 3.5 lib folders, disable materialX if it is not found
-set(MATERIALX_LIB_FOLDER_EXISTS EXISTS ${LIBDIR}/materialx)
-set_and_warn_library_found("MaterialX" MATERIALX_LIB_FOLDER_EXISTS WITH_MATERIALX)
-unset(MATERIALX_LIB_FOLDER_EXISTS)
-
 # Mark libdir as system headers with a lower warn level, to resolve some warnings
 # that we have very little control over
 if(NOT MSVC_CLANG                  AND # Available with MSVC 15.7+ but not for CLANG.
@@ -446,12 +407,9 @@ if(WITH_IMAGE_OPENEXR)
     set(IMATH_INCLUDE_DIR ${IMATH}/include)
     set(IMATH_INCLUDE_DIRS ${IMATH_INCLUDE_DIR} ${IMATH}/include/Imath)
     set(IMATH_LIBPATH ${IMATH}/lib)
-    if(EXISTS ${IMATH_LIBPATH}/Imath_s.lib)
-      set(IMATH_POSTFIX _s)
-    endif()
     set(IMATH_LIBRARIES
-      optimized ${IMATH_LIBPATH}/Imath${IMATH_POSTFIX}.lib
+      optimized ${IMATH_LIBPATH}/Imath_s.lib
-      debug ${IMATH_LIBPATH}/Imath${IMATH_POSTFIX}_d.lib
+      debug ${IMATH_LIBPATH}/Imath_s_d.lib
     )
   endif()
   set(OPENEXR_ROOT_DIR ${LIBDIR}/openexr)
@@ -463,24 +421,36 @@ if(WITH_IMAGE_OPENEXR)
     set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
     set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIRS} ${OPENEXR_INCLUDE_DIR}/OpenEXR)
     set(OPENEXR_LIBPATH ${OPENEXR}/lib)
-    # Check if the blender 3.3 lib static library eixts
+    # Check if the 3.x library name exists
-    # if not assume this is a 3.4+ dynamic version.
+    # if not assume this is a 2.x library folder
     if(EXISTS "${OPENEXR_LIBPATH}/OpenEXR_s.lib")
-      set(OPENEXR_POSTFIX _s)
+      set(OPENEXR_LIBRARIES
+        optimized ${OPENEXR_LIBPATH}/Iex_s.lib
+        optimized ${OPENEXR_LIBPATH}/IlmThread_s.lib
+        optimized ${OPENEXR_LIBPATH}/OpenEXR_s.lib
+        optimized ${OPENEXR_LIBPATH}/OpenEXRCore_s.lib
+        optimized ${OPENEXR_LIBPATH}/OpenEXRUtil_s.lib
+        debug ${OPENEXR_LIBPATH}/Iex_s_d.lib
+        debug ${OPENEXR_LIBPATH}/IlmThread_s_d.lib
+        debug ${OPENEXR_LIBPATH}/OpenEXR_s_d.lib
+        debug ${OPENEXR_LIBPATH}/OpenEXRCore_s_d.lib
+        debug ${OPENEXR_LIBPATH}/OpenEXRUtil_s_d.lib
+        ${IMATH_LIBRARIES}
+      )
+    else()
+      set(OPENEXR_LIBRARIES
+        optimized ${OPENEXR_LIBPATH}/Iex_s.lib
+        optimized ${OPENEXR_LIBPATH}/Half_s.lib
+        optimized ${OPENEXR_LIBPATH}/IlmImf_s.lib
+        optimized ${OPENEXR_LIBPATH}/Imath_s.lib
+        optimized ${OPENEXR_LIBPATH}/IlmThread_s.lib
+        debug ${OPENEXR_LIBPATH}/Iex_s_d.lib
+        debug ${OPENEXR_LIBPATH}/Half_s_d.lib
+        debug ${OPENEXR_LIBPATH}/IlmImf_s_d.lib
+        debug ${OPENEXR_LIBPATH}/Imath_s_d.lib
+        debug ${OPENEXR_LIBPATH}/IlmThread_s_d.lib
+      )
     endif()
-    set(OPENEXR_LIBRARIES
-      optimized ${OPENEXR_LIBPATH}/Iex${OPENEXR_POSTFIX}.lib
-      optimized ${OPENEXR_LIBPATH}/IlmThread${OPENEXR_POSTFIX}.lib
-      optimized ${OPENEXR_LIBPATH}/OpenEXR${OPENEXR_POSTFIX}.lib
-      optimized ${OPENEXR_LIBPATH}/OpenEXRCore${OPENEXR_POSTFIX}.lib
-      optimized ${OPENEXR_LIBPATH}/OpenEXRUtil${OPENEXR_POSTFIX}.lib
-      debug ${OPENEXR_LIBPATH}/Iex${OPENEXR_POSTFIX}_d.lib
-      debug ${OPENEXR_LIBPATH}/IlmThread${OPENEXR_POSTFIX}_d.lib
-      debug ${OPENEXR_LIBPATH}/OpenEXR${OPENEXR_POSTFIX}_d.lib
-      debug ${OPENEXR_LIBPATH}/OpenEXRCore${OPENEXR_POSTFIX}_d.lib
-      debug ${OPENEXR_LIBPATH}/OpenEXRUtil${OPENEXR_POSTFIX}_d.lib
-      ${IMATH_LIBRARIES}
-    )
   endif()
 endif()
 
@@ -550,47 +520,38 @@ if(WITH_BOOST)
     if(NOT BOOST_VERSION)
       message(FATAL_ERROR "Unable to determine Boost version")
     endif()
-    set(BOOST_POSTFIX "vc142-mt-x64-${BOOST_VERSION}")
+    set(BOOST_POSTFIX "vc142-mt-x64-${BOOST_VERSION}.lib")
-    set(BOOST_DEBUG_POSTFIX "vc142-mt-gyd-x64-${BOOST_VERSION}")
+    set(BOOST_DEBUG_POSTFIX "vc142-mt-gd-x64-${BOOST_VERSION}.lib")
-    set(BOOST_PREFIX "")
+    if(NOT EXISTS ${BOOST_LIBPATH}/libboost_date_time-${BOOST_POSTFIX})
-    # This is file new in 3.4 if it does not exist, assume we are building against 3.3 libs
+      # If the new library names do not exist fall back to the old ones
-    set(BOOST_34_TRIGGER_FILE ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_python310-${BOOST_DEBUG_POSTFIX}.lib)
+      # to ease the transition period between the libs.
-    if (NOT EXISTS ${BOOST_34_TRIGGER_FILE})
+      set(BOOST_POSTFIX "vc141-mt-x64-${BOOST_VERSION}.lib")
-      set(BOOST_DEBUG_POSTFIX "vc142-mt-gd-x64-${BOOST_VERSION}")
+      set(BOOST_DEBUG_POSTFIX "vc141-mt-gd-x64-${BOOST_VERSION}.lib")
-      set(BOOST_PREFIX "lib")
     endif()
     set(BOOST_LIBRARIES
-      optimized ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_date_time-${BOOST_POSTFIX}.lib
+      optimized ${BOOST_LIBPATH}/libboost_date_time-${BOOST_POSTFIX}
-      optimized ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_filesystem-${BOOST_POSTFIX}.lib
+      optimized ${BOOST_LIBPATH}/libboost_filesystem-${BOOST_POSTFIX}
-      optimized ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_regex-${BOOST_POSTFIX}.lib
+      optimized ${BOOST_LIBPATH}/libboost_regex-${BOOST_POSTFIX}
-      optimized ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_system-${BOOST_POSTFIX}.lib
+      optimized ${BOOST_LIBPATH}/libboost_system-${BOOST_POSTFIX}
-      optimized ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_thread-${BOOST_POSTFIX}.lib
+      optimized ${BOOST_LIBPATH}/libboost_thread-${BOOST_POSTFIX}
-      optimized ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_chrono-${BOOST_POSTFIX}.lib
+      optimized ${BOOST_LIBPATH}/libboost_chrono-${BOOST_POSTFIX}
-      debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_date_time-${BOOST_DEBUG_POSTFIX}.lib
+      debug ${BOOST_LIBPATH}/libboost_date_time-${BOOST_DEBUG_POSTFIX}
-      debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_filesystem-${BOOST_DEBUG_POSTFIX}.lib
+      debug ${BOOST_LIBPATH}/libboost_filesystem-${BOOST_DEBUG_POSTFIX}
-      debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_regex-${BOOST_DEBUG_POSTFIX}.lib
+      debug ${BOOST_LIBPATH}/libboost_regex-${BOOST_DEBUG_POSTFIX}
-      debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_system-${BOOST_DEBUG_POSTFIX}.lib
+      debug ${BOOST_LIBPATH}/libboost_system-${BOOST_DEBUG_POSTFIX}
-      debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_thread-${BOOST_DEBUG_POSTFIX}.lib
+      debug ${BOOST_LIBPATH}/libboost_thread-${BOOST_DEBUG_POSTFIX}
-      debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_chrono-${BOOST_DEBUG_POSTFIX}.lib
+      debug ${BOOST_LIBPATH}/libboost_chrono-${BOOST_DEBUG_POSTFIX}
     )
-    if (EXISTS ${BOOST_34_TRIGGER_FILE})
-      if(WITH_USD)
-        set(BOOST_PYTHON_LIBRARIES
-          debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_python310-${BOOST_DEBUG_POSTFIX}.lib
-          optimized ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_python310-${BOOST_POSTFIX}.lib
-        )
-      endif()
-    endif()
     if(WITH_CYCLES AND WITH_CYCLES_OSL)
       set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
-        optimized ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_wave-${BOOST_POSTFIX}.lib
+        optimized ${BOOST_LIBPATH}/libboost_wave-${BOOST_POSTFIX}
-        debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_wave-${BOOST_DEBUG_POSTFIX}.lib
+        debug ${BOOST_LIBPATH}/libboost_wave-${BOOST_DEBUG_POSTFIX}
       )
     endif()
     if(WITH_INTERNATIONAL)
       set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
-        optimized ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_locale-${BOOST_POSTFIX}.lib
+        optimized ${BOOST_LIBPATH}/libboost_locale-${BOOST_POSTFIX}
-        debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_locale-${BOOST_DEBUG_POSTFIX}.lib
+        debug ${BOOST_LIBPATH}/libboost_locale-${BOOST_DEBUG_POSTFIX}
       )
     endif()
   else() # we found boost using find_package
@@ -615,10 +576,7 @@ if(WITH_OPENIMAGEIO)
   endif()
   set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0")
   set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe")
-  # If the .dll does not exist, assume it is a static OIIO
+  add_definitions(-DOIIO_STATIC_DEFINE)
-  if(NOT EXISTS ${OPENIMAGEIO}/bin/OpenImageIO.dll)
-    add_definitions(-DOIIO_STATIC_DEFINE)
-  endif()
   add_definitions(-DOIIO_NO_SSE=1)
 endif()
 
@@ -654,25 +612,18 @@ if(WITH_OPENCOLORIO)
     set(OPENCOLORIO ${LIBDIR}/OpenColorIO)
     set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
     set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
-    if(EXISTS ${OPENCOLORIO_LIBPATH}/libexpatMD.lib) # 3.4
+    set(OPENCOLORIO_LIBRARIES
-      set(OPENCOLORIO_LIBRARIES
+      optimized ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib
-        optimized ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib
+      optimized ${OPENCOLORIO_LIBPATH}/libyaml-cpp.lib
-        optimized ${OPENCOLORIO_LIBPATH}/libexpatMD.lib
+      optimized ${OPENCOLORIO_LIBPATH}/libexpatMD.lib
-        optimized ${OPENCOLORIO_LIBPATH}/pystring.lib
+      optimized ${OPENCOLORIO_LIBPATH}/pystring.lib
-        optimized ${OPENCOLORIO_LIBPATH}/libyaml-cpp.lib
+      debug ${OPENCOLORIO_LIBPATH}/OpencolorIO_d.lib
-        debug ${OPENCOLORIO_LIBPATH}/OpencolorIO_d.lib
+      debug ${OPENCOLORIO_LIBPATH}/libyaml-cpp_d.lib
-        debug ${OPENCOLORIO_LIBPATH}/libexpatdMD.lib
+      debug ${OPENCOLORIO_LIBPATH}/libexpatdMD.lib
-        debug ${OPENCOLORIO_LIBPATH}/pystring_d.lib
+      debug ${OPENCOLORIO_LIBPATH}/pystring_d.lib
-        debug ${OPENCOLORIO_LIBPATH}/libyaml-cpp_d.lib
+    )
-      )
-      set(OPENCOLORIO_DEFINITIONS "-DOpenColorIO_SKIP_IMPORTS")
-    else()
-      set(OPENCOLORIO_LIBRARIES
-        optimized ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib
-        debug ${OPENCOLORIO_LIBPATH}/OpencolorIO_d.lib
-      )
-    endif()
   endif()
+  set(OPENCOLORIO_DEFINITIONS "-DOpenColorIO_SKIP_IMPORTS")
 endif()
 
 if(WITH_OPENVDB)
@@ -876,21 +827,16 @@ endif()
 if(WITH_USD)
   windows_find_package(USD)
   if(NOT USD_FOUND)
-    # 3.5 22.03 libs
     set(USD_INCLUDE_DIRS ${LIBDIR}/usd/include)
-    set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/usd_usd_ms.lib)
+    set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/usd_usd_m.lib)
-    set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/usd_usd_ms_d.lib)
+    set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/usd_usd_m_d.lib)
     set(USD_LIBRARY_DIR ${LIBDIR}/usd/lib)
-    if(NOT EXISTS "${USD_RELEASE_LIB}") # 3.5 22.11 libs
-      set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/usd_ms.lib)
-      set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/usd_ms_d.lib)
-    endif()
     # Older USD had different filenames, if the new ones are
     # not found see if the older ones exist, to ease the
     # transition period while landing libs.
-    if(NOT EXISTS "${USD_RELEASE_LIB}") # 3.3 static libs
+    if(NOT EXISTS "${USD_RELEASE_LIB}")
-      set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/usd_usd_m.lib)
+      set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/libusd_m.lib)
-      set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/usd_usd_m_d.lib)
+      set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/libusd_m_d.lib)
     endif()
     set(USD_LIBRARIES
       debug ${USD_DEBUG_LIB}
@@ -1036,12 +982,3 @@ if(WITH_CYCLES AND WITH_CYCLES_DEVICE_ONEAPI)
   list(APPEND PLATFORM_BUNDLED_LIBRARIES ${_sycl_runtime_libraries})
   unset(_sycl_runtime_libraries)
 endif()
-
-
-# Environment variables to run precompiled executables that needed libraries.
-list(JOIN PLATFORM_BUNDLED_LIBRARY_DIRS ";" _library_paths)
-set(PLATFORM_ENV_BUILD_DIRS "${LIBDIR}/OpenImageIO/bin\;${LIBDIR}/boost/lib\;${LIBDIR}/openexr/bin\;${LIBDIR}/imath/bin\;${PATH}")
-set(PLATFORM_ENV_BUILD "PATH=${PLATFORM_ENV_BUILD_DIRS}")
-# Install needs the additional folders from PLATFORM_ENV_BUILD_DIRS as well, as tools like idiff and abcls use the release mode dlls
-set(PLATFORM_ENV_INSTALL "PATH=${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/blender.shared/\;${PLATFORM_ENV_BUILD_DIRS}\;$ENV{PATH}")
-unset(_library_paths)

build_files/cmake/platform/platform_win32_bundle_crt.cmake

@@ -0,0 +1,56 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# First generate the manifest for tests since it will not need the dependency on the CRT.
+configure_file(${CMAKE_SOURCE_DIR}/release/windows/manifest/blender.exe.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/tests.exe.manifest @ONLY)
+
+# Always detect system libraries, since they are also used by oneAPI.
+# But don't always install them, only for WITH_WINDOWS_BUNDLE_CRT=ON.
+set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
+set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
+set(CMAKE_INSTALL_OPENMP_LIBRARIES ${WITH_OPENMP})
+
+# This sometimes can change when updates are installed and the compiler version
+# changes, so test if it exists and if not, give InstallRequiredSystemLibraries
+# another chance to figure out the path.
+if(MSVC_REDIST_DIR AND NOT EXISTS "${MSVC_REDIST_DIR}")
+  unset(MSVC_REDIST_DIR CACHE)
+endif()
+
+include(InstallRequiredSystemLibraries)
+
+if(WITH_WINDOWS_BUNDLE_CRT)
+  # ucrtbase(d).dll cannot be in the manifest, due to the way windows 10 handles
+  # redirects for this dll, for details see T88813.
+  foreach(lib ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS})
+    string(FIND ${lib} "ucrtbase" pos)
+    if(NOT pos EQUAL -1)
+      list(REMOVE_ITEM CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS ${lib})
+      install(FILES ${lib} DESTINATION . COMPONENT Libraries)
+    endif()
+  endforeach()
+  # Install the CRT to the blender.crt Sub folder.
+  install(FILES ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ./blender.crt COMPONENT Libraries)
+
+  # Generating the manifest is a relatively expensive operation since
+  # it is collecting an sha1 hash for every file required. so only do
+  # this work when the libs have either changed or the manifest does
+  # not exist yet.
+
+  string(SHA1 libshash "${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}")
+  set(manifest_trigger_file "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/crt_${libshash}")
+
+  if(NOT EXISTS ${manifest_trigger_file})
+    set(CRTLIBS "")
+    foreach(lib ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS})
+      get_filename_component(filename ${lib} NAME)
+      file(SHA1 "${lib}" sha1_file)
+      string(APPEND CRTLIBS "    <file name=\"${filename}\" hash=\"${sha1_file}\"  hashalg=\"SHA1\" />\n")
+    endforeach()
+    configure_file(${CMAKE_SOURCE_DIR}/release/windows/manifest/blender.crt.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/blender.crt.manifest @ONLY)
+    file(TOUCH ${manifest_trigger_file})
+  endif()
+
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/blender.crt.manifest DESTINATION ./blender.crt)
+  set(BUNDLECRT "<dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"blender.crt\" version=\"1.0.0.0\" /></dependentAssembly></dependency>")
+endif()
+configure_file(${CMAKE_SOURCE_DIR}/release/windows/manifest/blender.exe.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/blender.exe.manifest @ONLY)

build_files/config/pipeline_config.yaml

@@ -5,7 +5,7 @@
 update-code:
     git:
         submodules:
-        -   branch: xr-dev
+        -   branch: master
             commit_id: HEAD
             path: release/scripts/addons
         -   branch: master

doc/python_api/rst_from_bmesh_opdefines.py

@@ -235,6 +235,27 @@ def main():
         if args_out is not None:
             args_out_index[:] = [i for (i, a) in enumerate(args_out) if type(a) == tuple]
 
+        fw(".. function:: %s(bm, %s)\n\n" % (b[0], ", ".join([args_in[i][0] for i in args_in_index])))
+
+        # -- wash the comment
+        comment_washed = []
+        comment = [] if comment is None else comment
+        for i, l in enumerate(comment):
+            assert ((l.strip() == "") or
+                    (l in {"/*", " *"}) or
+                    (l.startswith(("/* ", " * "))))
+
+            l = l[3:]
+            if i == 0 and not l.strip():
+                continue
+            if l.strip():
+                l = "   " + l
+            comment_washed.append(l)
+
+        fw("\n".join(comment_washed))
+        fw("\n")
+        # -- done
+
         # get the args
         def get_args_wash(args, args_index, is_ret):
             args_wash = []
@@ -275,36 +296,26 @@ def main():
                 if comment_next:
                     comment += ("\n" if comment_prev else "") + comment_next.strip()
 
-                default_value = None
                 if tp == BMO_OP_SLOT_FLT:
                     tp_str = "float"
-                    default_value = '0'
-
                 elif tp == BMO_OP_SLOT_INT:
                     if tp_sub == BMO_OP_SLOT_SUBTYPE_INT_ENUM:
-                        default_value = enums.split(",", 1)[0].strip("[")
+                        tp_str = "enum in " + enums + ", default " + enums.split(",", 1)[0].strip("[")
-                        tp_str = "enum in " + enums + ", default " + default_value
                     elif tp_sub == BMO_OP_SLOT_SUBTYPE_INT_FLAG:
-                        default_value = 'set()'
+                        tp_str = "set of flags from " + enums + ", default {}"
-                        tp_str = "set of flags from " + enums + ", default " + default_value
                     else:
                         tp_str = "int"
-                        default_value = '0'
                 elif tp == BMO_OP_SLOT_BOOL:
                     tp_str = "bool"
-                    default_value = 'False'
                 elif tp == BMO_OP_SLOT_MAT:
                     tp_str = ":class:`mathutils.Matrix`"
-                    default_value = 'mathutils.Matrix.Identity(4)'
                 elif tp == BMO_OP_SLOT_VEC:
                     tp_str = ":class:`mathutils.Vector`"
-                    default_value = 'mathutils.Vector()'
                     if not is_ret:
                         tp_str += " or any sequence of 3 floats"
                 elif tp == BMO_OP_SLOT_PTR:
+                    tp_str = "dict"
                     assert tp_sub is not None
-                    if 'if None' in comment:
-                        default_value = 'None'
                     if tp_sub == BMO_OP_SLOT_SUBTYPE_PTR_BMESH:
                         tp_str = ":class:`bmesh.types.BMesh`"
                     elif tp_sub == BMO_OP_SLOT_SUBTYPE_PTR_SCENE:
@@ -337,16 +348,13 @@ def main():
                         tp_str = "/".join(ls)
                     else:
                         tp_str = ("list of (%s)" % ", ".join(ls))
-                        default_value = '[]'
 
                     del ls
                 elif tp == BMO_OP_SLOT_MAPPING:
                     if tp_sub & BMO_OP_SLOT_SUBTYPE_MAP_EMPTY:
                         tp_str = "set of vert/edge/face type"
-                        default_value = 'set()'
                     else:
                         tp_str = "dict mapping vert/edge/face types to "
-                        default_value = '{}'
                         if tp_sub == BMO_OP_SLOT_SUBTYPE_MAP_BOOL:
                             tp_str += "bool"
                         elif tp_sub == BMO_OP_SLOT_SUBTYPE_MAP_INT:
@@ -364,40 +372,18 @@ def main():
                     print("Can't find", vars_dict_reverse[tp])
                     assert 0
 
-                args_wash.append((name, default_value, tp_str, comment))
+                args_wash.append((name, tp_str, comment))
             return args_wash
         # end get_args_wash
 
-        args_in_wash = get_args_wash(args_in, args_in_index, False)
-
-        fw(".. function:: %s(bm, %s)\n\n" % (b[0], ", ".join([print_arg_in(arg) for arg in args_in_wash])))
-
-        # -- wash the comment
-        comment_washed = []
-        comment = [] if comment is None else comment
-        for i, l in enumerate(comment):
-            assert ((l.strip() == "") or
-                    (l in {"/*", " *"}) or
-                    (l.startswith(("/* ", " * "))))
-
-            l = l[3:]
-            if i == 0 and not l.strip():
-                continue
-            if l.strip():
-                l = "   " + l
-            comment_washed.append(l)
-
-        fw("\n".join(comment_washed))
-        fw("\n")
-        # -- done
-
         # all ops get this arg
         fw("   :arg bm: The bmesh to operate on.\n")
         fw("   :type bm: :class:`bmesh.types.BMesh`\n")
 
+        args_in_wash = get_args_wash(args_in, args_in_index, False)
         args_out_wash = get_args_wash(args_out, args_out_index, True)
 
-        for (name, _, tp, comment) in args_in_wash:
+        for (name, tp, comment) in args_in_wash:
             if comment == "":
                 comment = "Undocumented."
 
@@ -407,7 +393,7 @@ def main():
         if args_out_wash:
             fw("   :return:\n\n")
 
-            for (name, _, tp, comment) in args_out_wash:
+            for (name, tp, comment) in args_out_wash:
                 assert name.endswith(".out")
                 name = name[:-4]
                 fw("      - ``%s``: %s\n\n" % (name, comment))
@@ -423,12 +409,5 @@ def main():
     print(OUT_RST)
 
 
-def print_arg_in(arg):
-    (name, default_value, _, _) = arg
-    if default_value is None:
-        return name
-    return name + '=' + default_value
-
-
 if __name__ == "__main__":
     main()

extern/mantaflow/helper/util/vectorbase.h

@@ -31,6 +31,13 @@
 #  undef max
 #endif
 
+// redefine usage of some windows functions
+#if defined(WIN32) || defined(_WIN32)
+#  ifndef snprintf
+#    define snprintf _snprintf
+#  endif
+#endif
+
 // use which fp-precision? 1=float, 2=double
 #ifndef FLOATINGPOINT_PRECISION
 #  define FLOATINGPOINT_PRECISION 1

intern/cycles/app/oiio_output_driver.cpp

@@ -3,11 +3,6 @@
 
 #include "app/oiio_output_driver.h"
 
-#include "scene/colorspace.h"
-
-#include <OpenImageIO/imagebuf.h>
-#include <OpenImageIO/imagebufalgo.h>
-
 CCL_NAMESPACE_BEGIN
 
 OIIOOutputDriver::OIIOOutputDriver(const string_view filepath,
@@ -52,23 +47,11 @@ void OIIOOutputDriver::write_render_tile(const Tile &tile)
   }
 
   /* Manipulate offset and stride to convert from bottom-up to top-down convention. */
-  ImageBuf image_buffer(spec,
+  image_output->write_image(TypeDesc::FLOAT,
-                        pixels.data() + (height - 1) * width * 4,
+                            pixels.data() + (height - 1) * width * 4,
-                        AutoStride,
+                            AutoStride,
-                        -width * 4 * sizeof(float),
+                            -width * 4 * sizeof(float),
-                        AutoStride);
+                            AutoStride);
-
-  /* Apply gamma correction for (some) non-linear file formats.
-   * TODO: use OpenColorIO view transform if available. */
-  if (ColorSpaceManager::detect_known_colorspace(
-          u_colorspace_auto, "", image_output->format_name(), true) == u_colorspace_srgb) {
-    const float g = 1.0f / 2.2f;
-    ImageBufAlgo::pow(image_buffer, image_buffer, {g, g, g, 1.0f});
-  }
-
-  /* Write to disk and close */
-  image_buffer.set_write_format(TypeDesc::FLOAT);
-  image_buffer.write(image_output.get());
   image_output->close();
 }
 

intern/cycles/blender/addon/properties.py

@@ -1206,7 +1206,7 @@ class CyclesWorldSettings(bpy.types.PropertyGroup):
     )
     homogeneous_volume: BoolProperty(
         name="Homogeneous Volume",
-        description="When using volume rendering, assume volume has the same density everywhere "
+        description="When using volume rendering, assume volume has the same density everywhere"
         "(not using any textures), for faster rendering",
         default=False,
     )

intern/cycles/blender/addon/ui.py

@@ -193,7 +193,7 @@ class CYCLES_RENDER_PT_sampling_viewport(CyclesButtonsPanel, Panel):
 
         if cscene.use_preview_adaptive_sampling:
             col = layout.column(align=True)
-            col.prop(cscene, "preview_samples", text="Max Samples")
+            col.prop(cscene, "preview_samples", text=" Max Samples")
             col.prop(cscene, "preview_adaptive_min_samples", text="Min Samples")
         else:
             layout.prop(cscene, "preview_samples", text="Samples")
@@ -255,7 +255,7 @@ class CYCLES_RENDER_PT_sampling_render(CyclesButtonsPanel, Panel):
 
         col = layout.column(align=True)
         if cscene.use_adaptive_sampling:
-            col.prop(cscene, "samples", text="Max Samples")
+            col.prop(cscene, "samples", text=" Max Samples")
             col.prop(cscene, "adaptive_min_samples", text="Min Samples")
         else:
             col.prop(cscene, "samples", text="Samples")

intern/cycles/blender/display_driver.cpp

@@ -809,11 +809,6 @@ void BlenderDisplayDriver::draw(const Params &params)
    * is bound externally. */
   immBindShader(active_shader);
 
-  if (tiles_->current_tile.need_update_texture_pixels) {
-    update_tile_texture_pixels(tiles_->current_tile);
-    tiles_->current_tile.need_update_texture_pixels = false;
-  }
-
   draw_tile(zoom_, texcoord_attribute, position_attribute, tiles_->current_tile.tile);
 
   for (const DrawTile &tile : tiles_->finished_tiles.tiles) {

intern/cycles/blender/light.cpp

@@ -75,19 +75,19 @@ void BlenderSync::sync_light(BL::Object &b_parent,
       switch (b_area_light.shape()) {
         case BL::AreaLight::shape_SQUARE:
           light->set_sizev(light->get_sizeu());
-          light->set_ellipse(false);
+          light->set_round(false);
           break;
         case BL::AreaLight::shape_RECTANGLE:
           light->set_sizev(b_area_light.size_y());
-          light->set_ellipse(false);
+          light->set_round(false);
           break;
         case BL::AreaLight::shape_DISK:
           light->set_sizev(light->get_sizeu());
-          light->set_ellipse(true);
+          light->set_round(true);
           break;
         case BL::AreaLight::shape_ELLIPSE:
           light->set_sizev(b_area_light.size_y());
-          light->set_ellipse(true);
+          light->set_round(true);
           break;
       }
       light->set_light_type(LIGHT_AREA);

intern/cycles/cmake/macros.cmake

@@ -133,7 +133,6 @@ macro(cycles_external_libraries_append libraries)
     ${OPENEXR_LIBRARIES} # For circular dependencies between libs.
     ${PUGIXML_LIBRARIES}
     ${BOOST_LIBRARIES}
-    ${PYTHON_LIBRARIES}
     ${ZLIB_LIBRARIES}
     ${CMAKE_DL_LIBS}
     ${PTHREADS_LIBRARIES}

intern/cycles/hydra/display_driver.cpp

@@ -64,6 +64,10 @@ void HdCyclesDisplayDriver::gl_context_create()
 #endif
 
   if (!gl_pbo_id_) {
+    if (glewInit() != GLEW_OK) {
+      return;
+    }
+
     glGenBuffers(1, &gl_pbo_id_);
   }
 }

intern/cycles/hydra/light.cpp

@@ -382,12 +382,12 @@ void HdCyclesLight::Initialize(HdRenderParam *renderParam)
   }
   else if (_lightType == HdPrimTypeTokens->diskLight) {
     _light->set_light_type(LIGHT_AREA);
-    _light->set_ellipse(true);
+    _light->set_round(true);
     _light->set_size(1.0f);
   }
   else if (_lightType == HdPrimTypeTokens->rectLight) {
     _light->set_light_type(LIGHT_AREA);
-    _light->set_ellipse(false);
+    _light->set_round(false);
     _light->set_size(1.0f);
   }
   else if (_lightType == HdPrimTypeTokens->sphereLight) {

intern/cycles/hydra/material.cpp

@@ -235,11 +235,7 @@ void HdCyclesMaterial::Sync(HdSceneDelegate *sceneDelegate,
       }
       else {
         networkConverted = std::make_unique<HdMaterialNetwork2>();
-#  if PXR_VERSION >= 2205
-        *networkConverted = HdConvertToHdMaterialNetwork2(networkOld);
-#  else
         HdMaterialNetwork2ConvertFromHdMaterialNetworkMap(networkOld, networkConverted.get());
-#  endif
         network = networkConverted.get();
       }
     }

intern/cycles/hydra/output_driver.cpp

@@ -55,13 +55,12 @@ bool HdCyclesOutputDriver::update_render_tile(const Tile &tile)
           const bool isId = aovBinding.aovName == HdAovTokens->primId ||
                             aovBinding.aovName == HdAovTokens->elementId ||
                             aovBinding.aovName == HdAovTokens->instanceId;
-          renderBuffer->Map();
+
           renderBuffer->WritePixels(pixels.data(),
                                     GfVec2i(tile.offset.x, tile.offset.y),
                                     GfVec2i(tile.size.x, tile.size.y),
                                     channels,
                                     isId);
-          renderBuffer->Unmap();
         }
         else {
           // Do not warn on missing elementId, which is a standard AOV but is not implememted

intern/cycles/kernel/light/area.h

@@ -91,138 +91,60 @@ ccl_device_inline float area_light_rect_sample(float3 P,
 
 ccl_device float area_light_spread_attenuation(const float3 D,
                                                const float3 lightNg,
-                                               const float tan_half_spread,
+                                               const float cot_half_spread,
                                                const float normalize_spread)
 {
   /* Model a soft-box grid, computing the ratio of light not hidden by the
    * slats of the grid at a given angle. (see D10594). */
   const float cos_a = -dot(D, lightNg);
-  if (tan_half_spread == 0.0f) {
-    /* cos(0.05°) ≈ 0.9999997 */
-    /* The factor M_PI_F comes from integrating the radiance over the hemisphere */
-    return (cos_a > 0.9999997f) ? M_PI_F : 0.0f;
-  }
   const float sin_a = safe_sqrtf(1.0f - sqr(cos_a));
   const float tan_a = sin_a / cos_a;
-  return max((tan_half_spread - tan_a) * normalize_spread, 0.0f);
+  return max((1.0f - (cot_half_spread * tan_a)) * normalize_spread, 0.0f);
 }
 
-/* Compute the minimal rectangle, circle or ellipse that covers the valid sample region, to reduce
+/* Compute subset of area light that actually has an influence on the shading point, to
- * noise with low spread. */
+ * reduce noise with low spread. */
-ccl_device bool area_light_spread_clamp_light(const float3 P,
+ccl_device bool area_light_spread_clamp_area_light(const float3 P,
-                                              const float3 lightNg,
+                                                   const float3 lightNg,
-                                              ccl_private float3 *lightP,
+                                                   ccl_private float3 *lightP,
-                                              ccl_private float3 *axis_u,
+                                                   const float3 axis_u,
-                                              ccl_private float *len_u,
+                                                   ccl_private float *len_u,
-                                              ccl_private float3 *axis_v,
+                                                   const float3 axis_v,
-                                              ccl_private float *len_v,
+                                                   ccl_private float *len_v,
-                                              const float tan_half_spread,
+                                                   const float cot_half_spread)
-                                              ccl_private bool *sample_rectangle)
 {
   /* Closest point in area light plane and distance to that plane. */
   const float3 closest_P = P - dot(lightNg, P - *lightP) * lightNg;
   const float t = len(closest_P - P);
 
   /* Radius of circle on area light that actually affects the shading point. */
-  const float r_spread = t * tan_half_spread;
+  const float radius = t / cot_half_spread;
 
   /* Local uv coordinates of closest point. */
-  const float spread_u = dot(*axis_u, closest_P - *lightP);
+  const float closest_u = dot(axis_u, closest_P - *lightP);
-  const float spread_v = dot(*axis_v, closest_P - *lightP);
+  const float closest_v = dot(axis_v, closest_P - *lightP);
 
-  const bool is_round = !(*sample_rectangle) && (*len_u == *len_v);
+  /* Compute rectangle encompassing the circle that affects the shading point,
+   * clamped to the bounds of the area light. */
+  const float min_u = max(closest_u - radius, -*len_u * 0.5f);
+  const float max_u = min(closest_u + radius, *len_u * 0.5f);
+  const float min_v = max(closest_v - radius, -*len_v * 0.5f);
+  const float max_v = min(closest_v + radius, *len_v * 0.5f);
 
-  /* Whether we should sample the spread circle. */
+  /* Skip if rectangle is empty. */
-  bool sample_spread = (r_spread == 0.0f);
+  if (min_u >= max_u || min_v >= max_v) {
-  if (is_round && !sample_spread) {
+    return false;
-    /* Distance between the centers of the disk light and the valid region circle. */
-    const float dist = len(make_float2(spread_u, spread_v));
-
-    /* Radius of the disk light. */
-    const float r = *len_u * 0.5f;
-
-    if (dist >= r + r_spread) {
-      /* Two circles are outside each other or touch externally. */
-      return false;
-    }
-
-    sample_spread = (dist <= fabsf(r - r_spread)) && (r_spread < r);
-    if (dist > fabsf(r - r_spread)) {
-      /* Two circles intersect. Find the smallest rectangle that covers the intersection */
-      const float len_u_ = r + r_spread - dist;
-      const float len_v_ = (fabsf(sqr(r) - sqr(r_spread)) >= sqr(dist)) ?
-                               2.0f * fminf(r, r_spread) :
-                               sqrtf(sqr(2.0f * r_spread) -
-                                     sqr(dist + (sqr(r_spread) - sqr(r)) / dist));
-
-      const float rect_area = len_u_ * len_v_;
-      const float circle_area = M_PI_F * sqr(r);
-      const float spread_area = M_PI_F * sqr(r_spread);
-
-      /* Sample the shape with minimal area. */
-      if (rect_area < fminf(circle_area, spread_area)) {
-        *sample_rectangle = true;
-        *axis_u = normalize(*lightP - closest_P);
-        *axis_v = rotate_around_axis(*axis_u, lightNg, M_PI_2_F);
-        *len_u = len_u_;
-        *len_v = len_v_;
-        *lightP = 0.5f * (*lightP + closest_P + *axis_u * (r_spread - r));
-        return true;
-      }
-
-      sample_spread = (spread_area < circle_area);
-    }
-  }
-  else if (!is_round && !sample_spread) {
-    /* Compute rectangle encompassing the circle that affects the shading point,
-     * clamped to the bounds of the area light. */
-    const float min_u = max(spread_u - r_spread, -*len_u * 0.5f);
-    const float max_u = min(spread_u + r_spread, *len_u * 0.5f);
-    const float min_v = max(spread_v - r_spread, -*len_v * 0.5f);
-    const float max_v = min(spread_v + r_spread, *len_v * 0.5f);
-
-    /* Skip if rectangle is empty. */
-    if (min_u >= max_u || min_v >= max_v) {
-      return false;
-    }
-
-    const float rect_len_u = max_u - min_u;
-    const float rect_len_v = max_v - min_v;
-
-    const float rect_area = rect_len_u * rect_len_v;
-    const float ellipse_area = (*sample_rectangle) ? FLT_MAX : M_PI_4_F * (*len_u) * (*len_v);
-    const float spread_area = M_PI_F * sqr(r_spread);
-
-    /* Sample the shape with minimal area. */
-    /* NOTE: we don't switch to spread circle sampling for rectangle light because rectangle light
-     * supports solid angle sampling, which has less variance than sampling the area. If ellipse
-     * area light also supports solid angle sampling, `*sample_rectangle ||` could be deleted. */
-    if (*sample_rectangle || rect_area < fminf(ellipse_area, spread_area)) {
-      *sample_rectangle = true;
-
-      /* Compute new area light center position and axes from rectangle in local
-       * uv coordinates. */
-      const float new_center_u = 0.5f * (min_u + max_u);
-      const float new_center_v = 0.5f * (min_v + max_v);
-
-      *len_u = rect_len_u;
-      *len_v = rect_len_v;
-      *lightP = *lightP + *axis_u * new_center_u + *axis_v * new_center_v;
-      return true;
-    }
-    *sample_rectangle = false;
-    sample_spread = (spread_area < ellipse_area);
   }
 
-  if (sample_spread) {
+  /* Compute new area light center position and axes from rectangle in local
-    *sample_rectangle = false;
+   * uv coordinates. */
-    *lightP = *lightP + *axis_u * spread_u + *axis_v * spread_v;
+  const float new_center_u = 0.5f * (min_u + max_u);
-    *len_u = r_spread * 2.0f;
+  const float new_center_v = 0.5f * (min_v + max_v);
-    *len_v = r_spread * 2.0f;
+  *len_u = max_u - min_u;
-    return true;
+  *len_v = max_v - min_v;
-  }
+
+  *lightP = *lightP + new_center_u * axis_u + new_center_v * axis_v;
 
-  /* Don't clamp. */
   return true;
 }
 
@@ -237,7 +159,13 @@ ccl_device_inline bool area_light_sample(const ccl_global KernelLight *klight,
 {
   ls->P = klight->co;
 
+  const float3 axis_u = klight->area.axis_u;
+  const float3 axis_v = klight->area.axis_v;
+  const float len_u = klight->area.len_u;
+  const float len_v = klight->area.len_v;
   float3 Ng = klight->area.dir;
+  float invarea = fabsf(klight->area.invarea);
+  bool is_round = (klight->area.invarea < 0.0f);
 
   if (!in_volume_segment) {
     if (dot(ls->P - P, Ng) > 0.0f) {
@@ -245,72 +173,40 @@ ccl_device_inline bool area_light_sample(const ccl_global KernelLight *klight,
     }
   }
 
-  const float3 axis_u = klight->area.axis_u;
-  const float3 axis_v = klight->area.axis_v;
-  const float len_u = klight->area.len_u;
-  const float len_v = klight->area.len_v;
-  float invarea = fabsf(klight->area.invarea);
-  bool is_ellipse = (klight->area.invarea < 0.0f);
-  bool sample_rectangle = !is_ellipse;
   float3 inplane;
 
-  if (in_volume_segment) {
+  if (is_round || in_volume_segment) {
-    /* FIXME: handle rectangular light. */
     inplane = ellipse_sample(axis_u * len_u * 0.5f, axis_v * len_v * 0.5f, randu, randv);
     ls->P += inplane;
     ls->pdf = invarea;
   }
   else {
-    float3 old_P = ls->P;
+    inplane = ls->P;
-    float3 sample_axis_u = axis_u;
+
-    float3 sample_axis_v = axis_v;
     float sample_len_u = len_u;
     float sample_len_v = len_v;
 
-    if (klight->area.normalize_spread > 0) {
+    if (!in_volume_segment && klight->area.cot_half_spread > 0.0f) {
-      if (!area_light_spread_clamp_light(P,
+      if (!area_light_spread_clamp_area_light(P,
-                                         Ng,
+                                              Ng,
-                                         &ls->P,
+                                              &ls->P,
-                                         &sample_axis_u,
+                                              axis_u,
-                                         &sample_len_u,
+                                              &sample_len_u,
-                                         &sample_axis_v,
+                                              axis_v,
-                                         &sample_len_v,
+                                              &sample_len_v,
-                                         klight->area.tan_half_spread,
+                                              klight->area.cot_half_spread)) {
-                                         &sample_rectangle)) {
         return false;
       }
     }
 
-    if (sample_rectangle) {
+    ls->pdf = area_light_rect_sample(
-      ls->pdf = area_light_rect_sample(
+        P, &ls->P, axis_u, sample_len_u, axis_v, sample_len_v, randu, randv, true);
-          P, &ls->P, sample_axis_u, sample_len_u, sample_axis_v, sample_len_v, randu, randv, true);
+    inplane = ls->P - inplane;
-    }
-    else {
-      if (klight->area.tan_half_spread == 0.0f) {
-        ls->pdf = 1.0f;
-      }
-      else {
-        ls->P += ellipse_sample(sample_axis_u * sample_len_u * 0.5f,
-                                sample_axis_v * sample_len_v * 0.5f,
-                                randu,
-                                randv);
-        ls->pdf = 4.0f * M_1_PI_F / (sample_len_u * sample_len_v);
-      }
-    }
-    inplane = ls->P - old_P;
   }
 
   const float light_u = dot(inplane, axis_u) / len_u;
   const float light_v = dot(inplane, axis_v) / len_v;
 
-  /* Sampled point lies outside of the area light. */
-  if (is_ellipse && (sqr(light_u) + sqr(light_v) > 0.25f)) {
-    return false;
-  }
-  if (!is_ellipse && (fabsf(light_u) > 0.5f || fabsf(light_v) > 0.5f)) {
-    return false;
-  }
-
   /* NOTE: Return barycentric coordinates in the same notation as Embree and OptiX. */
   ls->u = light_v + 0.5f;
   ls->v = -light_u - light_v;
@@ -320,13 +216,13 @@ ccl_device_inline bool area_light_sample(const ccl_global KernelLight *klight,
 
   ls->eval_fac = 0.25f * invarea;
 
-  if (klight->area.normalize_spread > 0) {
+  if (klight->area.cot_half_spread > 0.0f) {
     /* Area Light spread angle attenuation */
     ls->eval_fac *= area_light_spread_attenuation(
-        ls->D, ls->Ng, klight->area.tan_half_spread, klight->area.normalize_spread);
+        ls->D, ls->Ng, klight->area.cot_half_spread, klight->area.normalize_spread);
   }
 
-  if (!sample_rectangle && klight->area.tan_half_spread > 0) {
+  if (is_round) {
     ls->pdf *= lamp_light_pdf(Ng, -ls->D, ls->t);
   }
 
@@ -341,10 +237,10 @@ ccl_device_forceinline void area_light_update_position(const ccl_global KernelLi
   ls->D = normalize_len(ls->P - P, &ls->t);
   ls->pdf = invarea;
 
-  if (klight->area.tan_half_spread > 0) {
+  if (klight->area.cot_half_spread > 0.f) {
     ls->eval_fac = 0.25f * invarea;
     ls->eval_fac *= area_light_spread_attenuation(
-        ls->D, ls->Ng, klight->area.tan_half_spread, klight->area.normalize_spread);
+        ls->D, ls->Ng, klight->area.cot_half_spread, klight->area.normalize_spread);
   }
 }
 
@@ -356,7 +252,7 @@ ccl_device_inline bool area_light_intersect(const ccl_global KernelLight *klight
 {
   /* Area light. */
   const float invarea = fabsf(klight->area.invarea);
-  const bool is_ellipse = (klight->area.invarea < 0.0f);
+  const bool is_round = (klight->area.invarea < 0.0f);
   if (invarea == 0.0f) {
     return false;
   }
@@ -385,7 +281,7 @@ ccl_device_inline bool area_light_intersect(const ccl_global KernelLight *klight
                             t,
                             u,
                             v,
-                            is_ellipse);
+                            is_round);
 }
 
 ccl_device_inline bool area_light_sample_from_intersection(
@@ -407,47 +303,44 @@ ccl_device_inline bool area_light_sample_from_intersection(
   ls->D = ray_D;
   ls->Ng = Ng;
 
-  float3 sample_axis_u = klight->area.axis_u;
+  const bool is_round = (klight->area.invarea < 0.0f);
-  float3 sample_axis_v = klight->area.axis_v;
+  if (is_round) {
-  float sample_len_u = klight->area.len_u;
+    ls->pdf = invarea * lamp_light_pdf(Ng, -ray_D, ls->t);
-  float sample_len_v = klight->area.len_v;
+  }
-  bool is_ellipse = (klight->area.invarea < 0.0f);
+  else {
-  bool sample_rectangle = !is_ellipse;
+    const float3 axis_u = klight->area.axis_u;
+    const float3 axis_v = klight->area.axis_v;
+    float sample_len_u = klight->area.len_u;
+    float sample_len_v = klight->area.len_v;
 
-  if (klight->area.normalize_spread > 0) {
+    if (klight->area.cot_half_spread > 0.0f) {
-    if (!area_light_spread_clamp_light(ray_P,
+      if (!area_light_spread_clamp_area_light(ray_P,
-                                       Ng,
+                                              Ng,
-                                       &light_P,
+                                              &light_P,
-                                       &sample_axis_u,
+                                              axis_u,
-                                       &sample_len_u,
+                                              &sample_len_u,
-                                       &sample_axis_v,
+                                              axis_v,
-                                       &sample_len_v,
+                                              &sample_len_v,
-                                       klight->area.tan_half_spread,
+                                              klight->area.cot_half_spread)) {
-                                       &sample_rectangle)) {
+        return false;
+      }
+    }
+
+    ls->pdf = area_light_rect_sample(
+        ray_P, &light_P, axis_u, sample_len_u, axis_v, sample_len_v, 0, 0, false);
+  }
+  ls->eval_fac = 0.25f * invarea;
+
+  if (klight->area.cot_half_spread > 0.0f) {
+    /* Area Light spread angle attenuation */
+    ls->eval_fac *= area_light_spread_attenuation(
+        ls->D, ls->Ng, klight->area.cot_half_spread, klight->area.normalize_spread);
+    if (ls->eval_fac == 0.0f) {
       return false;
     }
   }
 
-  if (sample_rectangle) {
+  return true;
-    ls->pdf = area_light_rect_sample(
-        ray_P, &light_P, sample_axis_u, sample_len_u, sample_axis_v, sample_len_v, 0, 0, false);
-  }
-  else {
-    ls->pdf = klight->area.tan_half_spread == 0.0f ?
-                  1.0f :
-                  4.0f * M_1_PI_F / (sample_len_u * sample_len_v) *
-                      lamp_light_pdf(Ng, -ray_D, ls->t);
-  }
-
-  ls->eval_fac = 0.25f * invarea;
-
-  if (klight->area.normalize_spread > 0) {
-    /* Area Light spread angle attenuation */
-    ls->eval_fac *= area_light_spread_attenuation(
-        ls->D, ls->Ng, klight->area.tan_half_spread, klight->area.normalize_spread);
-  }
-
-  return ls->eval_fac > 0;
 }
 
 template<bool in_volume_segment>

intern/cycles/kernel/light/distribution.h

@@ -11,7 +11,7 @@ CCL_NAMESPACE_BEGIN
 /* Simple CDF based sampling over all lights in the scene, without taking into
  * account shading position or normal. */
 
-ccl_device int light_distribution_sample(KernelGlobals kg, ccl_private float *randu)
+ccl_device int light_distribution_sample(KernelGlobals kg, ccl_private float &randu)
 {
   /* This is basically std::upper_bound as used by PBRT, to find a point light or
    * triangle to emit from, proportional to area. a good improvement would be to
@@ -19,7 +19,7 @@ ccl_device int light_distribution_sample(KernelGlobals kg, ccl_private float *ra
    * arbitrary shaders. */
   int first = 0;
   int len = kernel_data.integrator.num_distribution + 1;
-  float r = *randu;
+  float r = randu;
 
   do {
     int half_len = len >> 1;
@@ -42,58 +42,34 @@ ccl_device int light_distribution_sample(KernelGlobals kg, ccl_private float *ra
    * each area light be stratified as well. */
   float distr_min = kernel_data_fetch(light_distribution, index).totarea;
   float distr_max = kernel_data_fetch(light_distribution, index + 1).totarea;
-  *randu = (r - distr_min) / (distr_max - distr_min);
+  randu = (r - distr_min) / (distr_max - distr_min);
 
   return index;
 }
 
-template<bool in_volume_segment>
 ccl_device_noinline bool light_distribution_sample(KernelGlobals kg,
-                                                   float randu,
+                                                   ccl_private float &randu,
                                                    const float randv,
                                                    const float time,
                                                    const float3 P,
                                                    const int bounce,
                                                    const uint32_t path_flag,
-                                                   ccl_private LightSample *ls)
+                                                   ccl_private int &emitter_object,
+                                                   ccl_private int &emitter_prim,
+                                                   ccl_private int &emitter_shader_flag,
+                                                   ccl_private float &emitter_pdf_selection)
 {
   /* Sample light index from distribution. */
-  const int index = light_distribution_sample(kg, &randu);
+  const int index = light_distribution_sample(kg, randu);
   ccl_global const KernelLightDistribution *kdistribution = &kernel_data_fetch(light_distribution,
                                                                                index);
-  const int prim = kdistribution->prim;
 
-  if (prim >= 0) {
+  emitter_object = kdistribution->mesh_light.object_id;
-    /* Mesh light. */
+  emitter_prim = kdistribution->prim;
-    const int object = kdistribution->mesh_light.object_id;
+  emitter_shader_flag = kdistribution->mesh_light.shader_flag;
+  emitter_pdf_selection = kernel_data.integrator.distribution_pdf_lights;
 
-    /* Exclude synthetic meshes from shadow catcher pass. */
+  return true;
-    if ((path_flag & PATH_RAY_SHADOW_CATCHER_PASS) &&
-        !(kernel_data_fetch(object_flag, object) & SD_OBJECT_SHADOW_CATCHER)) {
-      return false;
-    }
-
-    const int shader_flag = kdistribution->mesh_light.shader_flag;
-    if (!triangle_light_sample<in_volume_segment>(kg, prim, object, randu, randv, time, ls, P)) {
-      return false;
-    }
-    ls->shader |= shader_flag;
-  }
-  else {
-    const int lamp = -prim - 1;
-
-    if (UNLIKELY(light_select_reached_max_bounces(kg, lamp, bounce))) {
-      return false;
-    }
-
-    if (!light_sample<in_volume_segment>(kg, lamp, randu, randv, P, path_flag, ls)) {
-      return false;
-    }
-    ls->pdf_selection = kernel_data.integrator.distribution_pdf_lights;
-  }
-
-  ls->pdf *= ls->pdf_selection;
-  return (ls->pdf > 0.0f);
 }
 
 ccl_device_inline float light_distribution_pdf_lamp(KernelGlobals kg)

intern/cycles/kernel/light/sample.h

@@ -325,7 +325,7 @@ ccl_device_inline float light_sample_mis_weight_nee(KernelGlobals kg,
 
 ccl_device_inline bool light_sample_from_volume_segment(KernelGlobals kg,
                                                         float randu,
-                                                        const float randv,
+                                                        float randv,
                                                         const float time,
                                                         const float3 P,
                                                         const float3 D,
@@ -334,22 +334,89 @@ ccl_device_inline bool light_sample_from_volume_segment(KernelGlobals kg,
                                                         const uint32_t path_flag,
                                                         ccl_private LightSample *ls)
 {
+  /* Select an emitter. */
+  int emitter_object = 0;
+  int emitter_prim = 0;
+  int emitter_shader_flag = 0;
+  float emitter_pdf_selection = 0.0f;
+
 #ifdef __LIGHT_TREE__
   if (kernel_data.integrator.use_light_tree) {
-    return light_tree_sample<true>(
+    if (!light_tree_sample<true>(kg,
-        kg, randu, randv, time, P, D, t, SD_BSDF_HAS_TRANSMISSION, bounce, path_flag, ls);
+                                 randu,
+                                 randv,
+                                 time,
+                                 P,
+                                 D,
+                                 t,
+                                 SD_BSDF_HAS_TRANSMISSION,
+                                 bounce,
+                                 path_flag,
+                                 emitter_object,
+                                 emitter_prim,
+                                 emitter_shader_flag,
+                                 emitter_pdf_selection)) {
+      return false;
+    }
   }
   else
 #endif
   {
-    return light_distribution_sample<true>(kg, randu, randv, time, P, bounce, path_flag, ls);
+    if (!light_distribution_sample(kg,
+                                   randu,
+                                   randv,
+                                   time,
+                                   P,
+                                   bounce,
+                                   path_flag,
+                                   emitter_object,
+                                   emitter_prim,
+                                   emitter_shader_flag,
+                                   emitter_pdf_selection)) {
+      return false;
+    }
   }
+
+  /* Set first, triangle light sampling from flat distribution will override. */
+  ls->pdf_selection = emitter_pdf_selection;
+
+  /* Sample a point on the chosen emitter. */
+  if (emitter_prim >= 0) {
+    /* Mesh light. */
+    /* Exclude synthetic meshes from shadow catcher pass. */
+    if ((path_flag & PATH_RAY_SHADOW_CATCHER_PASS) &&
+        !(kernel_data_fetch(object_flag, emitter_object) & SD_OBJECT_SHADOW_CATCHER)) {
+      return false;
+    }
+
+    if (!triangle_light_sample<true>(
+            kg, emitter_prim, emitter_object, randu, randv, time, ls, P)) {
+      return false;
+    }
+  }
+  else {
+    /* Light object. */
+    const int lamp = ~emitter_prim;
+
+    if (UNLIKELY(light_select_reached_max_bounces(kg, lamp, bounce))) {
+      return false;
+    }
+
+    if (!light_sample<true>(kg, lamp, randu, randv, P, path_flag, ls)) {
+      return false;
+    }
+  }
+
+  ls->pdf *= ls->pdf_selection;
+  ls->shader |= emitter_shader_flag;
+
+  return (ls->pdf > 0);
 }
 
 ccl_device bool light_sample_from_position(KernelGlobals kg,
                                            ccl_private const RNGState *rng_state,
-                                           const float randu,
+                                           float randu,
-                                           const float randv,
+                                           float randv,
                                            const float time,
                                            const float3 P,
                                            const float3 N,
@@ -358,16 +425,84 @@ ccl_device bool light_sample_from_position(KernelGlobals kg,
                                            const uint32_t path_flag,
                                            ccl_private LightSample *ls)
 {
+  /* Select an emitter. */
+  int emitter_object = 0;
+  int emitter_prim = 0;
+  int emitter_shader_flag = 0;
+  float emitter_pdf_selection = 0.0f;
+
 #ifdef __LIGHT_TREE__
   if (kernel_data.integrator.use_light_tree) {
-    return light_tree_sample<false>(
+    if (!light_tree_sample<false>(kg,
-        kg, randu, randv, time, P, N, 0, shader_flags, bounce, path_flag, ls);
+                                  randu,
+                                  randv,
+                                  time,
+                                  P,
+                                  N,
+                                  0,
+                                  shader_flags,
+                                  bounce,
+                                  path_flag,
+                                  emitter_object,
+                                  emitter_prim,
+                                  emitter_shader_flag,
+                                  emitter_pdf_selection)) {
+      return false;
+    }
   }
   else
 #endif
   {
-    return light_distribution_sample<false>(kg, randu, randv, time, P, bounce, path_flag, ls);
+    if (!light_distribution_sample(kg,
+                                   randu,
+                                   randv,
+                                   time,
+                                   P,
+                                   bounce,
+                                   path_flag,
+                                   emitter_object,
+                                   emitter_prim,
+                                   emitter_shader_flag,
+                                   emitter_pdf_selection)) {
+      return false;
+    }
   }
+
+  /* Set first, triangle light sampling from flat distribution will override. */
+  ls->pdf_selection = emitter_pdf_selection;
+
+  /* Sample a point on the chosen emitter.
+   * TODO: deduplicate code with light_sample_from_volume_segment? */
+  if (emitter_prim >= 0) {
+    /* Mesh light. */
+    /* Exclude synthetic meshes from shadow catcher pass. */
+    if ((path_flag & PATH_RAY_SHADOW_CATCHER_PASS) &&
+        !(kernel_data_fetch(object_flag, emitter_object) & SD_OBJECT_SHADOW_CATCHER)) {
+      return false;
+    }
+
+    if (!triangle_light_sample<false>(
+            kg, emitter_prim, emitter_object, randu, randv, time, ls, P)) {
+      return false;
+    }
+  }
+  else {
+    /* Light object. */
+    const int lamp = ~emitter_prim;
+
+    if (UNLIKELY(light_select_reached_max_bounces(kg, lamp, bounce))) {
+      return false;
+    }
+
+    if (!light_sample<false>(kg, lamp, randu, randv, P, path_flag, ls)) {
+      return false;
+    }
+  }
+
+  ls->pdf *= ls->pdf_selection;
+  ls->shader |= emitter_shader_flag;
+
+  return (ls->pdf > 0);
 }
 
 ccl_device_inline bool light_sample_new_position(KernelGlobals kg,

intern/cycles/kernel/light/tree.h

@@ -1,17 +1,6 @@
 /* SPDX-License-Identifier: Apache-2.0
  * Copyright 2011-2022 Blender Foundation */
 
-/* This code implements a modified version of the paper [Importance Sampling of Many Lights with
- * Adaptive Tree Splitting](http://www.aconty.com/pdf/many-lights-hpg2018.pdf) by Alejandro Conty
- * Estevez, Christopher Kulla.
- * The original paper traverses both children when the variance of a node is too high (called
- * splitting). However, Cycles does not support multiple lights per shading point. Therefore, we
- * adjust the importance computation: instead of using a conservative measure (i.e., the maximal
- * possible contribution a node could make to a shading point) as in the paper, we additionally
- * compute the minimal possible contribution and choose uniformly between these two measures. Also,
- * support for distant lights is added, which is not included in the paper.
- */
-
 #pragma once
 
 #include "kernel/light/area.h"
@@ -22,15 +11,16 @@
 
 CCL_NAMESPACE_BEGIN
 
-/* TODO: this seems like a relative expensive computation. We can make it a lot cheaper by using a
+/* TODO: this seems like a relative expensive computation, and we can make it a lot cheaper
- * bounding sphere instead of a bounding box, but this will reduce the accuracy sometimes. */
+ * by using a bounding sphere instead of a bounding box. This will be more inaccurate, but it
+ * might be fine when used along with the adaptive splitting. */
 ccl_device float light_tree_cos_bounding_box_angle(const BoundingBox bbox,
                                                    const float3 P,
                                                    const float3 point_to_centroid)
 {
   if (P.x > bbox.min.x && P.y > bbox.min.y && P.z > bbox.min.z && P.x < bbox.max.x &&
       P.y < bbox.max.y && P.z < bbox.max.z) {
-    /* If P is inside the bbox, `theta_u` covers the whole sphere. */
+    /* If P is inside the bbox, `theta_u` covers the whole sphere */
     return -1.0f;
   }
   float cos_theta_u = 1.0f;
@@ -40,7 +30,7 @@ ccl_device float light_tree_cos_bounding_box_angle(const BoundingBox bbox,
                                       (i & 2) ? bbox.max.y : bbox.min.y,
                                       (i & 4) ? bbox.max.z : bbox.min.z);
 
-    /* Calculate the bounding box angle. */
+    /* Caculate the bounding box angle. */
     float3 point_to_corner = normalize(corner - P);
     cos_theta_u = fminf(cos_theta_u, dot(point_to_centroid, point_to_corner));
   }
@@ -52,13 +42,14 @@ ccl_device_forceinline float sin_from_cos(const float c)
   return safe_sqrtf(1.0f - sqr(c));
 }
 
-/* Compute vector v as in Fig .8. P_v is the corresponding point along the ray. */
+/* Compute vector v as in Fig .8. P_v is the corresponding point along the ray ccl_device float3 */
 ccl_device float3 compute_v(
     const float3 centroid, const float3 P, const float3 D, const float3 bcone_axis, const float t)
 {
   const float3 unnormalized_v0 = P - centroid;
+  float len_v0;
   const float3 unnormalized_v1 = unnormalized_v0 + D * fminf(t, 1e12f);
-  const float3 v0 = normalize(unnormalized_v0);
+  const float3 v0 = normalize_len(unnormalized_v0, &len_v0);
   const float3 v1 = normalize(unnormalized_v1);
 
   const float3 o0 = v0;
@@ -67,11 +58,10 @@ ccl_device float3 compute_v(
 
   const float dot_o0_a = dot(o0, bcone_axis);
   const float dot_o1_a = dot(o1, bcone_axis);
-  const float inv_len = inversesqrtf(sqr(dot_o0_a) + sqr(dot_o1_a));
+  const float cos_phi0 = dot_o0_a / sqrtf(sqr(dot_o0_a) + sqr(dot_o1_a));
-  const float cos_phi0 = dot_o0_a * inv_len;
 
   return (dot_o1_a < 0 || dot(v0, v1) > cos_phi0) ? (dot_o0_a > dot(v1, bcone_axis) ? v0 : v1) :
-                                                    cos_phi0 * o0 + dot_o1_a * inv_len * o1;
+                                                    cos_phi0 * o0 + sin_from_cos(cos_phi0) * o1;
 }
 
 /* This is the general function for calculating the importance of either a cluster or an emitter.
@@ -94,12 +84,12 @@ ccl_device void light_tree_importance(const float3 N_or_D,
 
   const float sin_theta_u = sin_from_cos(cos_theta_u);
 
-  /* cos(theta_i') in the paper, omitted for volume. */
+  /* cos(theta_i') in the paper, omitted for volume */
   float cos_min_incidence_angle = 1.0f;
   float cos_max_incidence_angle = 1.0f;
 
-  /* When sampling the light tree for the second time in `shade_volume.h` and when query the pdf in
+  /* when sampling the light tree for the second time in `shade_volume.h` and when query the pdf in
-   * `sample.h`. */
+   * `sample.h` */
   const bool in_volume = is_zero(N_or_D);
   if (!in_volume_segment && !in_volume) {
     const float3 N = N_or_D;
@@ -115,7 +105,7 @@ ccl_device void light_tree_importance(const float3 N_or_D,
     /* If the node is guaranteed to be behind the surface we're sampling, and the surface is
      * opaque, then we can give the node an importance of 0 as it contributes nothing to the
      * surface. This is more accurate than the bbox test if we are calculating the importance of
-     * an emitter with radius. */
+     * an emitter with radius */
     if (!has_transmission && cos_min_incidence_angle < 0) {
       return;
     }
@@ -132,8 +122,8 @@ ccl_device void light_tree_importance(const float3 N_or_D,
   float cos_theta_o, sin_theta_o;
   fast_sincosf(bcone.theta_o, &sin_theta_o, &cos_theta_o);
 
-  /* Minimum angle an emitter’s axis would form with the direction to the shading point,
+  /* minimum angle an emitter’s axis would form with the direction to the shading point,
-   * cos(theta') in the paper. */
+   * cos(theta') in the paper */
   float cos_min_outgoing_angle;
   if ((cos_theta >= cos_theta_u) || (cos_theta_minus_theta_u >= cos_theta_o)) {
     /* theta - theta_o - theta_u <= 0 */
@@ -150,7 +140,7 @@ ccl_device void light_tree_importance(const float3 N_or_D,
                              sin_theta_minus_theta_u * sin_theta_o;
   }
   else {
-    /* Cluster is invisible. */
+    /* cluster invisible */
     return;
   }
 
@@ -199,14 +189,14 @@ ccl_device bool compute_emitter_centroid_and_dir(KernelGlobals kg,
         dir = klight->spot.dir;
         break;
       case LIGHT_POINT:
-        /* Disk-oriented normal. */
+        /* Disk-oriented normal */
         dir = safe_normalize(P - centroid);
         break;
       case LIGHT_AREA:
         dir = klight->area.dir;
         break;
       case LIGHT_BACKGROUND:
-        /* Arbitrary centroid and direction. */
+        /* Aarbitrary centroid and direction */
         centroid = make_float3(0.0f, 0.0f, 1.0f);
         dir = make_float3(0.0f, 0.0f, -1.0f);
         return !in_volume_segment;
@@ -230,7 +220,7 @@ ccl_device bool compute_emitter_centroid_and_dir(KernelGlobals kg,
       dir = -safe_normalize(cross(vertices[1] - vertices[0], vertices[2] - vertices[0]));
     }
     else {
-      /* Double-sided: any vector in the plane. */
+      /* Double sided: any vector in the plane. */
       dir = safe_normalize(vertices[0] - vertices[1]);
     }
   }
@@ -268,9 +258,9 @@ ccl_device void light_tree_emitter_importance(KernelGlobals kg,
 
   if (in_volume_segment) {
     const float3 D = N_or_D;
-    /* Closest point. */
+    /* Closest point */
     P_c = P + dot(centroid - P, D) * D;
-    /* Minimal distance of the ray to the cluster. */
+    /* minimal distance of the ray to the cluster */
     distance.x = len(centroid - P_c);
     distance.y = distance.x;
     point_to_centroid = -compute_v(centroid, P, D, bcone.axis, t);
@@ -283,7 +273,7 @@ ccl_device void light_tree_emitter_importance(KernelGlobals kg,
   if (prim_id < 0) {
     const ccl_global KernelLight *klight = &kernel_data_fetch(lights, ~prim_id);
     switch (klight->type) {
-      /* Function templates only modifies cos_theta_u when in_volume_segment = true. */
+      /* Function templates only modifies cos_theta_u when in_volume_segment = true */
       case LIGHT_SPOT:
         is_visible = spot_light_tree_parameters<in_volume_segment>(
             klight, centroid, P_c, cos_theta_u, distance, point_to_centroid);
@@ -309,7 +299,7 @@ ccl_device void light_tree_emitter_importance(KernelGlobals kg,
         return;
     }
   }
-  else { /* Mesh light. */
+  else { /* mesh light */
     is_visible = triangle_light_tree_parameters<in_volume_segment>(
         kg, kemitter, centroid, P_c, N_or_D, bcone, cos_theta_u, distance, point_to_centroid);
   }
@@ -345,7 +335,7 @@ ccl_device void light_tree_node_importance(KernelGlobals kg,
   max_importance = 0.0f;
   min_importance = 0.0f;
   if (knode->num_prims == 1) {
-    /* At a leaf node with only one emitter. */
+    /* At a leaf node with only one emitter */
     light_tree_emitter_importance<in_volume_segment>(
         kg, P, N_or_D, t, has_transmission, -knode->child_index, max_importance, min_importance);
   }
@@ -357,7 +347,7 @@ ccl_device void light_tree_node_importance(KernelGlobals kg,
     float cos_theta_u;
     float distance;
     if (knode->bit_trail == 1) {
-      /* Distant light node. */
+      /* distant light node */
       if (in_volume_segment) {
         return;
       }
@@ -371,7 +361,7 @@ ccl_device void light_tree_node_importance(KernelGlobals kg,
       if (in_volume_segment) {
         const float3 D = N_or_D;
         const float3 closest_point = P + dot(centroid - P, D) * D;
-        /* Minimal distance of the ray to the cluster. */
+        /* minimal distance of the ray to the cluster */
         distance = len(centroid - closest_point);
         point_to_centroid = -compute_v(centroid, P, D, bcone.axis, t);
         cos_theta_u = light_tree_cos_bounding_box_angle(bbox, closest_point, point_to_centroid);
@@ -392,7 +382,7 @@ ccl_device void light_tree_node_importance(KernelGlobals kg,
         point_to_centroid = normalize_len(centroid - P, &distance);
         cos_theta_u = light_tree_cos_bounding_box_angle(bbox, P, point_to_centroid);
       }
-      /* Clamp distance to half the radius of the cluster when splitting is disabled. */
+      /* clamp distance to half the radius of the cluster when splitting is disabled */
       distance = fmaxf(0.5f * len(centroid - bbox.max), distance);
     }
     /* TODO: currently max_distance = min_distance, max_importance = min_importance for the
@@ -435,8 +425,8 @@ ccl_device void sample_resevoir(const int current_index,
   return;
 }
 
-/* Pick an emitter from a leaf node using resevoir sampling, keep two reservoirs for upper and
+/* pick an emitter from a leaf node using resevoir sampling, keep two reservoirs for upper and
- * lower bounds. */
+ * lower bounds */
 template<bool in_volume_segment>
 ccl_device int light_tree_cluster_select_emitter(KernelGlobals kg,
                                                  ccl_private float &rand,
@@ -451,16 +441,16 @@ ccl_device int light_tree_cluster_select_emitter(KernelGlobals kg,
   float total_importance[2] = {0.0f, 0.0f};
   int selected_index = -1;
 
-  /* Mark emitters with zero importance. Used for resevoir when total minimum importance = 0. */
+  /* Mark emitters with zero importance. Used for resevoir when total minimum importance = 0 */
   kernel_assert(knode->num_prims <= sizeof(uint) * 8);
   uint has_importance = 0;
 
-  const bool sample_max = (rand > 0.5f); /* Sampling using the maximum importance. */
+  const bool sample_max = (rand > 0.5f); /* sampling using the maximum importance */
   rand = rand * 2.0f - float(sample_max);
 
   for (int i = 0; i < knode->num_prims; i++) {
     int current_index = -knode->child_index + i;
-    /* maximum importance = importance[0], minimum importance = importance[1] */
+    /* maximum importance = importance[0], mininum importance = importance[1] */
     float importance[2];
     light_tree_emitter_importance<in_volume_segment>(
         kg, P, N_or_D, t, has_transmission, current_index, importance[0], importance[1]);
@@ -484,7 +474,7 @@ ccl_device int light_tree_cluster_select_emitter(KernelGlobals kg,
   }
 
   if (total_importance[1] == 0.0f) {
-    /* Uniformly sample emitters with positive maximum importance. */
+    /* uniformly sample emitters with positive maximum importance */
     if (sample_max) {
       selected_importance[1] = 1.0f;
       total_importance[1] = float(popcount(has_importance));
@@ -539,7 +529,7 @@ ccl_device bool get_left_probability(KernelGlobals kg,
   }
   const float total_min_importance = min_left_importance + min_right_importance;
 
-  /* Average two probabilities of picking the left child node using lower and upper bounds. */
+  /* average two probabilities of picking the left child node using lower and upper bounds */
   const float probability_max = max_left_importance / total_max_importance;
   const float probability_min = total_min_importance > 0 ?
                                     min_left_importance / total_min_importance :
@@ -551,8 +541,8 @@ ccl_device bool get_left_probability(KernelGlobals kg,
 
 template<bool in_volume_segment>
 ccl_device_noinline bool light_tree_sample(KernelGlobals kg,
-                                           float randu,
+                                           ccl_private float &randu,
-                                           float randv,
+                                           ccl_private float &randv,
                                            const float time,
                                            const float3 P,
                                            const float3 N_or_D,
@@ -560,7 +550,10 @@ ccl_device_noinline bool light_tree_sample(KernelGlobals kg,
                                            const int shader_flags,
                                            const int bounce,
                                            const uint32_t path_flag,
-                                           ccl_private LightSample *ls)
+                                           ccl_private int &emitter_object,
+                                           ccl_private int &emitter_prim,
+                                           ccl_private int &emitter_shader_flag,
+                                           ccl_private float &emitter_pdf_selection)
 {
   if (!kernel_data.integrator.use_direct_light) {
     return false;
@@ -571,28 +564,28 @@ ccl_device_noinline bool light_tree_sample(KernelGlobals kg,
   float pdf_emitter_from_leaf = 1.0f;
   int selected_light = -1;
 
-  int node_index = 0; /* Root node. */
+  int node_index = 0; /* root node */
 
   /* Traverse the light tree until a leaf node is reached. */
   while (true) {
     const ccl_global KernelLightTreeNode *knode = &kernel_data_fetch(light_tree_nodes, node_index);
 
     if (knode->child_index <= 0) {
-      /* At a leaf node, we pick an emitter. */
+      /* At a leaf node, we pick an emitter */
       selected_light = light_tree_cluster_select_emitter<in_volume_segment>(
           kg, randv, P, N_or_D, t, has_transmission, knode, &pdf_emitter_from_leaf);
       break;
     }
 
-    /* At an interior node, the left child is directly after the parent, while the right child is
+    /* At an interior node, the left child is directly after the parent,
-     * stored as the child index. */
+     * while the right child is stored as the child index. */
     const int left_index = node_index + 1;
     const int right_index = knode->child_index;
 
     float left_prob;
     if (!get_left_probability<in_volume_segment>(
             kg, P, N_or_D, t, has_transmission, left_index, right_index, left_prob)) {
-      return false; /* Both child nodes have zero importance. */
+      return false; /* both child nodes have zero importance */
     }
 
     float discard;
@@ -606,42 +599,16 @@ ccl_device_noinline bool light_tree_sample(KernelGlobals kg,
     return false;
   }
 
-  /* Sample a point on the chosen emitter. */
+  /* Return info about chosen emitter. */
   ccl_global const KernelLightTreeEmitter *kemitter = &kernel_data_fetch(light_tree_emitters,
                                                                          selected_light);
 
-  /* TODO: this is the same code as light_distribution_sample, except the index is determined
+  emitter_object = kemitter->mesh_light.object_id;
-   * differently. Would it be better to refactor this into a separate function? */
+  emitter_prim = kemitter->prim_id;
-  const int prim = kemitter->prim_id;
+  emitter_shader_flag = kemitter->mesh_light.shader_flag;
-  if (prim >= 0) {
+  emitter_pdf_selection = pdf_leaf * pdf_emitter_from_leaf;
-    /* Mesh light. */
-    const int object = kemitter->mesh_light.object_id;
 
-    /* Exclude synthetic meshes from shadow catcher pass. */
+  return true;
-    if ((path_flag & PATH_RAY_SHADOW_CATCHER_PASS) &&
-        !(kernel_data_fetch(object_flag, object) & SD_OBJECT_SHADOW_CATCHER)) {
-      return false;
-    }
-
-    const int mesh_shader_flag = kemitter->mesh_light.shader_flag;
-    if (!triangle_light_sample<in_volume_segment>(kg, prim, object, randu, randv, time, ls, P)) {
-      return false;
-    }
-    ls->shader |= mesh_shader_flag;
-  }
-  else {
-    if (UNLIKELY(light_select_reached_max_bounces(kg, ~prim, bounce))) {
-      return false;
-    }
-
-    if (!light_sample<in_volume_segment>(kg, ~prim, randu, randv, P, path_flag, ls)) {
-      return false;
-    }
-  }
-
-  ls->pdf_selection = pdf_leaf * pdf_emitter_from_leaf;
-  ls->pdf *= ls->pdf_selection;
-  return (ls->pdf > 0);
 }
 
 /* We need to be able to find the probability of selecting a given light for MIS. */
@@ -649,7 +616,7 @@ ccl_device float light_tree_pdf(
     KernelGlobals kg, const float3 P, const float3 N, const int path_flag, const int prim)
 {
   const bool has_transmission = (path_flag & PATH_RAY_MIS_HAD_TRANSMISSION);
-  /* Target emitter info. */
+  /* Target emitter info */
   const int target_emitter = (prim >= 0) ? kernel_data_fetch(triangle_to_tree, prim) :
                                            kernel_data_fetch(light_to_tree, ~prim);
   ccl_global const KernelLightTreeEmitter *kemitter = &kernel_data_fetch(light_tree_emitters,
@@ -658,11 +625,11 @@ ccl_device float light_tree_pdf(
   ccl_global const KernelLightTreeNode *kleaf = &kernel_data_fetch(light_tree_nodes, target_leaf);
   uint bit_trail = kleaf->bit_trail;
 
-  int node_index = 0; /* Root node. */
+  int node_index = 0; /* root node */
 
   float pdf = 1.0f;
 
-  /* Traverse the light tree until we reach the target leaf node. */
+  /* Traverse the light tree until we reach the target leaf node */
   while (true) {
     const ccl_global KernelLightTreeNode *knode = &kernel_data_fetch(light_tree_nodes, node_index);
 
@@ -670,7 +637,7 @@ ccl_device float light_tree_pdf(
       break;
     }
 
-    /* Interior node. */
+    /* Interior node */
     const int left_index = node_index + 1;
     const int right_index = knode->child_index;
 

intern/cycles/kernel/osl/shaders/CMakeLists.txt

@@ -135,9 +135,8 @@ foreach(_file ${SRC_OSL})
   string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} _OSO_FILE ${_OSO_FILE})
   add_custom_command(
     OUTPUT ${_OSO_FILE}
-    COMMAND ${CMAKE_COMMAND} -E env ${PLATFORM_ENV_BUILD} ${OSL_COMPILER} -q -O2  -I"${CMAKE_CURRENT_SOURCE_DIR}" -I"${OSL_SHADER_DIR}" -o ${_OSO_FILE} ${_OSL_FILE}
+    COMMAND ${OSL_COMPILER} -q -O2  -I"${CMAKE_CURRENT_SOURCE_DIR}" -I"${OSL_SHADER_DIR}" -o ${_OSO_FILE} ${_OSL_FILE}
-    DEPENDS ${_OSL_FILE} ${SRC_OSL_HEADERS} ${OSL_COMPILER}
+    DEPENDS ${_OSL_FILE} ${SRC_OSL_HEADERS} ${OSL_COMPILER})
-  )
   list(APPEND SRC_OSO
     ${_OSO_FILE}
   )

intern/cycles/kernel/types.h

@@ -1307,7 +1307,7 @@ typedef struct KernelAreaLight {
   float len_v;
   packed_float3 dir;
   float invarea;
-  float tan_half_spread;
+  float cot_half_spread;
   float normalize_spread;
   float pad[2];
 } KernelAreaLight;

intern/cycles/scene/colorspace.cpp

@@ -95,19 +95,16 @@ bool ColorSpaceManager::colorspace_is_data(ustring colorspace)
 }
 
 ustring ColorSpaceManager::detect_known_colorspace(ustring colorspace,
-                                                   const char *file_colorspace,
                                                    const char *file_format,
                                                    bool is_float)
 {
   if (colorspace == u_colorspace_auto) {
     /* Auto detect sRGB or raw if none specified. */
     if (is_float) {
-      bool srgb = (strcmp(file_colorspace, "sRGB") == 0 ||
+      bool srgb = (colorspace == "sRGB" || colorspace == "GammaCorrected" ||
-                   strcmp(file_colorspace, "GammaCorrected") == 0 ||
+                   (colorspace.empty() &&
-                   (file_colorspace[0] == '\0' &&
+                    (strcmp(file_format, "png") == 0 || strcmp(file_format, "tiff") == 0 ||
-                    (strcmp(file_format, "png") == 0 || strcmp(file_format, "jpeg") == 0 ||
+                     strcmp(file_format, "dpx") == 0 || strcmp(file_format, "jpeg2000") == 0)));
-                     strcmp(file_format, "tiff") == 0 || strcmp(file_format, "dpx") == 0 ||
-                     strcmp(file_format, "jpeg2000") == 0)));
       return srgb ? u_colorspace_srgb : u_colorspace_raw;
     }
     else {

intern/cycles/scene/colorspace.h

@@ -21,7 +21,6 @@ class ColorSpaceManager {
    * convert to and from. If the colorspace is u_colorspace_auto, we auto
    * detect a colospace. */
   static ustring detect_known_colorspace(ustring colorspace,
-                                         const char *file_colorspace,
                                          const char *file_format,
                                          bool is_float);
 

intern/cycles/scene/image.cpp

@@ -261,7 +261,7 @@ void ImageMetaData::detect_colorspace()
 {
   /* Convert used specified color spaces to one we know how to handle. */
   colorspace = ColorSpaceManager::detect_known_colorspace(
-      colorspace, colorspace_file_hint.c_str(), colorspace_file_format, is_float());
+      colorspace, colorspace_file_format, is_float());
 
   if (colorspace == u_colorspace_raw) {
     /* Nothing to do. */

intern/cycles/scene/image.h

@@ -69,7 +69,6 @@ class ImageMetaData {
 
   /* Optional color space, defaults to raw. */
   ustring colorspace;
-  string colorspace_file_hint;
   const char *colorspace_file_format;
 
   /* Optional transform for 3D images. */

intern/cycles/scene/image_oiio.cpp

@@ -85,7 +85,6 @@ bool OIIOImageLoader::load_metadata(const ImageDeviceFeatures & /*features*/,
   }
 
   metadata.colorspace_file_format = in->format_name();
-  metadata.colorspace_file_hint = spec.get_string_attribute("oiio:ColorSpace");
 
   in->close();
 

intern/cycles/scene/light.cpp

@@ -106,7 +106,7 @@ NODE_DEFINE(Light)
   SOCKET_FLOAT(sizeu, "Size U", 1.0f);
   SOCKET_VECTOR(axisv, "Axis V", zero_float3());
   SOCKET_FLOAT(sizev, "Size V", 1.0f);
-  SOCKET_BOOLEAN(ellipse, "Ellipse", false);
+  SOCKET_BOOLEAN(round, "Round", false);
   SOCKET_FLOAT(spread, "Spread", M_PI_F);
 
   SOCKET_INT(map_resolution, "Map Resolution", 0);
@@ -911,7 +911,7 @@ void LightManager::device_update_lights(Device *device, DeviceScene *dscene, Sce
       float3 axis_u = normalize_len(extentu, &len_u);
       float3 axis_v = normalize_len(extentv, &len_v);
       float area = len_u * len_v;
-      if (light->ellipse) {
+      if (light->round) {
         area *= -M_PI_4_F;
       }
       float invarea = (area != 0.0f) ? 1.0f / area : 1.0f;
@@ -1032,21 +1032,20 @@ void LightManager::device_update_lights(Device *device, DeviceScene *dscene, Sce
       float3 axis_u = normalize_len(extentu, &len_u);
       float3 axis_v = normalize_len(extentv, &len_v);
       float area = len_u * len_v;
-      if (light->ellipse) {
+      if (light->round) {
         area *= -M_PI_4_F;
       }
       float invarea = (area != 0.0f) ? 1.0f / area : 1.0f;
       float3 dir = light->dir;
 
-      /* Clamp angles in (0, 0.1) to 0.1 to prevent zero intensity due to floating-point precision
+      /* Clamping to a minimum angle to avoid excessive noise. */
-       * issues, but still handles spread = 0 */
+      const float min_spread = 1.0f * M_PI_F / 180.0f;
-      const float min_spread = 0.1f * M_PI_F / 180.0f;
+      const float half_spread = 0.5f * max(light->spread, min_spread);
-      const float half_spread = light->spread == 0 ? 0.0f : 0.5f * max(light->spread, min_spread);
+      /* cot_half_spread is h in D10594#269626 */
-      const float tan_half_spread = light->spread == M_PI_F ? FLT_MAX : tanf(half_spread);
+      const float cot_half_spread = tanf(M_PI_2_F - half_spread);
       /* Normalization computed using:
-       * integrate cos(x) * (1 - tan(x) / tan(a)) * sin(x) from x = 0 to a, a being half_spread.
+       * integrate cos(x) * (1 - tan(x) / tan(a)) * sin(x) from x = 0 to a, a being half_spread */
-       * Divided by tan_half_spread to simplify the attenuation computation in `area.h`. */
+      const float normalize_spread = 1.0f / (1.0f - half_spread * cot_half_spread);
-      const float normalize_spread = 1.0f / (tan_half_spread - half_spread);
 
       dir = safe_normalize(dir);
 
@@ -1060,7 +1059,7 @@ void LightManager::device_update_lights(Device *device, DeviceScene *dscene, Sce
       klights[light_index].area.len_v = len_v;
       klights[light_index].area.invarea = invarea;
       klights[light_index].area.dir = dir;
-      klights[light_index].area.tan_half_spread = tan_half_spread;
+      klights[light_index].area.cot_half_spread = cot_half_spread;
       klights[light_index].area.normalize_spread = normalize_spread;
     }
     else if (light->light_type == LIGHT_SPOT) {

intern/cycles/scene/light.h

@@ -45,7 +45,7 @@ class Light : public Node {
   NODE_SOCKET_API(float, sizeu)
   NODE_SOCKET_API(float3, axisv)
   NODE_SOCKET_API(float, sizev)
-  NODE_SOCKET_API(bool, ellipse)
+  NODE_SOCKET_API(bool, round)
   NODE_SOCKET_API(float, spread)
 
   NODE_SOCKET_API(Transform, tfm)

intern/cycles/scene/light_tree.h

@@ -33,7 +33,7 @@ struct OrientationBounds {
 
   enum empty_t { empty = 0 };
 
-  /* If the orientation bound is set to empty, the values are set to minimums
+  /* If the orientation bound is set to empty, the values are set to minumums
    * so that merging it with another non-empty orientation bound guarantees that
    * the return value is equal to non-empty orientation bound. */
   __forceinline OrientationBounds(empty_t)

intern/cycles/util/math.h

@@ -860,7 +860,7 @@ ccl_device_inline uint find_first_set(uint x)
   return (x != 0) ? ctz(x) + 1 : 0;
 #else
 #  ifdef _MSC_VER
-  return (x != 0) ? (32 - count_leading_zeros(x & (~x + 1))) : 0;
+  return (x != 0) ? (32 - count_leading_zeros(x & (-x))) : 0;
 #  else
   return __builtin_ffs(x);
 #  endif

intern/ffmpeg/CMakeLists.txt

@@ -22,5 +22,5 @@ if(WITH_GTESTS)
     set(TEST_LIB ${TEST_LIB} ${OPENJPEG_LIBRARIES})
   endif()
   include(GTestTesting)
-  blender_add_test_lib(ffmpeg_codecs "${TEST_SRC}" "${TEST_INC}" "${TEST_INC_SYS}" "${TEST_LIB}")
+  blender_add_test_executable(ffmpeg "${TEST_SRC}" "${TEST_INC}" "${TEST_INC_SYS}" "${TEST_LIB}")
 endif()