Merge branch 'master' into refactor-idprop-ui-data

End comments with period
2021-08-26 23:41:41 -05:00 · 2021-08-24 17:40:18 -05:00 · 2021-08-09 15:08:59 -05:00 · 2021-08-09 15:08:29 -05:00 · 2021-08-09 15:06:35 -05:00 · 2021-08-06 12:12:04 -05:00
5005 changed files with 203977 additions and 356093 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -180,7 +180,6 @@ ForEachMacros:
  - CTX_DATA_BEGIN_WITH_ID
  - DEG_OBJECT_ITER_BEGIN
  - DEG_OBJECT_ITER_FOR_RENDER_ENGINE_BEGIN
-  - DRW_ENABLED_ENGINE_ITER
  - DRIVER_TARGETS_LOOPER_BEGIN
  - DRIVER_TARGETS_USED_LOOPER_BEGIN
  - FOREACH_BASE_IN_EDIT_MODE_BEGIN
@@ -268,6 +267,3 @@ ForEachMacros:
 StatementMacros:
  - PyObject_HEAD
  - PyObject_VAR_HEAD
-
-MacroBlockBegin: "^BSDF_CLOSURE_CLASS_BEGIN$"
-MacroBlockEnd: "^BSDF_CLOSURE_CLASS_END$"
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -12,8 +12,6 @@ Checks:  >
  -readability-avoid-const-params-in-decls,
  -readability-simplify-boolean-expr,
  -readability-make-member-function-const,
-  -readability-suspicious-call-argument,
-  -readability-redundant-member-init,

  -readability-misleading-indentation,

@@ -27,8 +25,6 @@ Checks:  >
  -bugprone-branch-clone,
  -bugprone-macro-parentheses,
  -bugprone-reserved-identifier,
-  -bugprone-easily-swappable-parameters,
-  -bugprone-implicit-widening-of-multiplication-result,

  -bugprone-sizeof-expression,
  -bugprone-integer-division,
@@ -44,8 +40,7 @@ Checks:  >
  -modernize-pass-by-value,
  # Cannot be enabled yet, because using raw string literals in tests breaks
  # the windows compiler currently.
-  -modernize-raw-string-literal,
-  -modernize-return-braced-init-list
+  -modernize-raw-string-literal

 CheckOptions:
  - key: modernize-use-default-member-init.UseAssignment
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,5 +0,0 @@
-This repository is only used as a mirror of git.blender.org. Blender development happens on
-https://developer.blender.org.
-
-To get started with contributing code, please see:
-https://wiki.blender.org/wiki/Process/Contributing_Code
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
      "CMake generation for blender is not allowed within the source directory!"
      "\n Remove \"${CMAKE_SOURCE_DIR}/CMakeCache.txt\" and try again from another folder, e.g.:"
      "\n "
-      "\n rm -rf CMakeCache.txt CMakeFiles"
+      "\n rm CMakeCache.txt"
      "\n cd .."
      "\n mkdir cmake-make"
      "\n cd cmake-make"
@@ -156,15 +156,6 @@ get_blender_version()
 option(WITH_BLENDER "Build blender (disable to build only the blender player)" ON)
 mark_as_advanced(WITH_BLENDER)

-if(APPLE)
-  # Currently this causes a build error linking, disable.
-  set(WITH_BLENDER_THUMBNAILER OFF)
-elseif(WIN32)
-  option(WITH_BLENDER_THUMBNAILER "Build \"BlendThumb.dll\" helper for Windows explorer integration" ON)
-else()
-  option(WITH_BLENDER_THUMBNAILER "Build \"blender-thumbnailer\" thumbnail extraction utility" ON)
-endif()
-
 option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)

 option(WITH_PYTHON        "Enable Embedded Python API  (only disable for development)" ON)
@@ -187,13 +178,6 @@ mark_as_advanced(CPACK_OVERRIDE_PACKAGENAME)
 mark_as_advanced(BUILDINFO_OVERRIDE_DATE)
 mark_as_advanced(BUILDINFO_OVERRIDE_TIME)

-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16")
-  option(WITH_UNITY_BUILD   "Enable unity build for modules that support it to improve compile times" ON)
-  mark_as_advanced(WITH_UNITY_BUILD)
-else()
-  set(WITH_UNITY_BUILD OFF)
-endif()
-
 option(WITH_IK_ITASC      "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
 option(WITH_IK_SOLVER     "Enable Legacy IK solver (only disable for development)" ON)
 option(WITH_FFTW3         "Enable FFTW3 support (Used for smoke, ocean sim, and audio effects)" ON)
@@ -273,13 +257,11 @@ endif()

 if(UNIX AND NOT APPLE)
  option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by the operating system" OFF)
-  option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by the operating system" OFF)
-  option(WITH_SYSTEM_FREETYPE "Use the freetype library provided by the operating system" OFF)
+  option(WITH_SYSTEM_GLES "Use OpenGL ES library provided by the operating system"           ON)
 else()
  # not an option for other OS's
  set(WITH_SYSTEM_GLEW OFF)
  set(WITH_SYSTEM_GLES OFF)
-  set(WITH_SYSTEM_FREETYPE OFF)
 endif()


@@ -406,69 +388,45 @@ if(WITH_PYTHON_INSTALL)
    set(PYTHON_REQUESTS_PATH "" CACHE PATH "Path to python site-packages or dist-packages containing 'requests' module")
    mark_as_advanced(PYTHON_REQUESTS_PATH)
  endif()
-
-  option(WITH_PYTHON_INSTALL_ZSTANDARD "Copy zstandard into the blender install folder" ON)
-  set(PYTHON_ZSTANDARD_PATH "" CACHE PATH "Path to python site-packages or dist-packages containing 'zstandard' module")
-  mark_as_advanced(PYTHON_ZSTANDARD_PATH)
 endif()

 option(WITH_CPU_SIMD              "Enable SIMD instruction if they're detected on the host machine" ON)
 mark_as_advanced(WITH_CPU_SIMD)

 # Cycles
-option(WITH_CYCLES                   "Enable Cycles Render Engine" ON)
-option(WITH_CYCLES_OSL               "Build Cycles with OpenShadingLanguage support" ON)
-option(WITH_CYCLES_EMBREE            "Build Cycles with Embree support" ON)
-option(WITH_CYCLES_LOGGING           "Build Cycles with logging support" ON)
-option(WITH_CYCLES_DEBUG             "Build Cycles with options useful for debugging (e.g., MIS)" OFF)
-
-option(WITH_CYCLES_STANDALONE        "Build Cycles standalone application" OFF)
-option(WITH_CYCLES_STANDALONE_GUI    "Build Cycles standalone with GUI" OFF)
-
-option(WITH_CYCLES_DEBUG_NAN         "Build Cycles with additional asserts for detecting NaNs and invalid values" OFF)
-option(WITH_CYCLES_NATIVE_ONLY       "Build Cycles with native kernel only (which fits current CPU, use for development only)" OFF)
-option(WITH_CYCLES_KERNEL_ASAN       "Build Cycles kernels with address sanitizer when WITH_COMPILER_ASAN is on, even if it's very slow" OFF)
-set(CYCLES_TEST_DEVICES CPU CACHE STRING "Run regression tests on the specified device types (CPU CUDA OPTIX HIP)" )
+option(WITH_CYCLES                  "Enable Cycles Render Engine" ON)
+option(WITH_CYCLES_STANDALONE       "Build Cycles standalone application" OFF)
+option(WITH_CYCLES_STANDALONE_GUI   "Build Cycles standalone with GUI" OFF)
+option(WITH_CYCLES_OSL              "Build Cycles with OSL support" ON)
+option(WITH_CYCLES_EMBREE           "Build Cycles with Embree support" ON)
+option(WITH_CYCLES_CUDA_BINARIES    "Build Cycles CUDA binaries" OFF)
+option(WITH_CYCLES_CUBIN_COMPILER   "Build cubins with nvrtc based compiler instead of nvcc" OFF)
+option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF)
+mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
+set(CYCLES_TEST_DEVICES CPU CACHE STRING "Run regression tests on the specified device types (CPU CUDA OPTIX OPENCL)" )
+set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 sm_86 compute_75 CACHE STRING "CUDA architectures to build binaries for")
+mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
+unset(PLATFORM_DEFAULT)
+option(WITH_CYCLES_LOGGING      "Build Cycles with logging support" ON)
+option(WITH_CYCLES_DEBUG_NAN    "Build Cycles with additional asserts for detecting NaNs and invalid values" OFF)
+option(WITH_CYCLES_NATIVE_ONLY  "Build Cycles with native kernel only (which fits current CPU, use for development only)" OFF)
+option(WITH_CYCLES_KERNEL_ASAN  "Build Cycles kernels with address sanitizer when WITH_COMPILER_ASAN is on, even if it's very slow" OFF)
 mark_as_advanced(WITH_CYCLES_KERNEL_ASAN)
+mark_as_advanced(WITH_CYCLES_CUBIN_COMPILER)
 mark_as_advanced(WITH_CYCLES_LOGGING)
 mark_as_advanced(WITH_CYCLES_DEBUG_NAN)
 mark_as_advanced(WITH_CYCLES_NATIVE_ONLY)

-# NVIDIA CUDA & OptiX
-if(NOT APPLE)
-  option(WITH_CYCLES_DEVICE_CUDA       "Enable Cycles NVIDIA CUDA compute support" ON)
-  option(WITH_CYCLES_DEVICE_OPTIX      "Enable Cycles NVIDIA OptiX support" ON)
-  mark_as_advanced(WITH_CYCLES_DEVICE_CUDA)
+option(WITH_CYCLES_DEVICE_CUDA              "Enable Cycles CUDA compute support" ON)
+option(WITH_CYCLES_DEVICE_OPTIX             "Enable Cycles OptiX support" OFF)
+option(WITH_CYCLES_DEVICE_OPENCL            "Enable Cycles OpenCL compute support" ON)
+option(WITH_CYCLES_NETWORK              "Enable Cycles compute over network support (EXPERIMENTAL and unfinished)" OFF)
+mark_as_advanced(WITH_CYCLES_DEVICE_CUDA)
+mark_as_advanced(WITH_CYCLES_DEVICE_OPENCL)
+mark_as_advanced(WITH_CYCLES_NETWORK)

-  option(WITH_CYCLES_CUDA_BINARIES     "Build Cycles NVIDIA CUDA binaries" OFF)
-  set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 sm_86 compute_75 CACHE STRING "CUDA architectures to build binaries for")
-  option(WITH_CYCLES_CUBIN_COMPILER    "Build cubins with nvrtc based compiler instead of nvcc" OFF)
-  option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF)
-  option(WITH_CUDA_DYNLOAD             "Dynamically load CUDA libraries at runtime (for developers, makes cuda-gdb work)" ON)
-  mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
-  mark_as_advanced(WITH_CYCLES_CUBIN_COMPILER)
-  mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
-  mark_as_advanced(WITH_CUDA_DYNLOAD)
-endif()
-
-# AMD HIP
-if(NOT APPLE)
-  if(WIN32)
-    option(WITH_CYCLES_DEVICE_HIP        "Enable Cycles AMD HIP support" ON)
-  else()
-    option(WITH_CYCLES_DEVICE_HIP        "Enable Cycles AMD HIP support" OFF)
-  endif()
-
-  option(WITH_CYCLES_HIP_BINARIES      "Build Cycles AMD HIP binaries" OFF)
-  set(CYCLES_HIP_BINARIES_ARCH gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 CACHE STRING "AMD HIP architectures to build binaries for")
-  mark_as_advanced(WITH_CYCLES_DEVICE_HIP)
-  mark_as_advanced(CYCLES_HIP_BINARIES_ARCH)
-endif()
-
-# Apple Metal
-if(APPLE)
-  option(WITH_CYCLES_DEVICE_METAL       "Enable Cycles Apple Metal compute support" ON)
-endif()
+option(WITH_CUDA_DYNLOAD "Dynamically load CUDA libraries at runtime" ON)
+mark_as_advanced(WITH_CUDA_DYNLOAD)

 # Draw Manager
 option(WITH_DRAW_DEBUG "Add extra debug capabilities to Draw Manager" OFF)
@@ -513,10 +471,11 @@ if(WIN32)
 endif()

 # This should be turned off when Blender enter beta/rc/release
-if("${BLENDER_VERSION_CYCLE}" STREQUAL "alpha")
-  set(WITH_EXPERIMENTAL_FEATURES ON)
-else()
+if("${BLENDER_VERSION_CYCLE}" STREQUAL "release" OR
+   "${BLENDER_VERSION_CYCLE}" STREQUAL "rc")
  set(WITH_EXPERIMENTAL_FEATURES OFF)
+else()
+  set(WITH_EXPERIMENTAL_FEATURES ON)
 endif()

 # Unit testsing
@@ -538,14 +497,12 @@ option(WITH_OPENGL              "When off limits visibility of the opengl header
 option(WITH_GLEW_ES             "Switches to experimental copy of GLEW that has support for OpenGL ES. (temporary option for development purposes)" OFF)
 option(WITH_GL_EGL              "Use the EGL OpenGL system library instead of the platform specific OpenGL system library (CGL, glX, or WGL)"       OFF)
 option(WITH_GL_PROFILE_ES20     "Support using OpenGL ES 2.0. (through either EGL or the AGL/WGL/XGL 'es20' profile)"                               OFF)
-option(WITH_GPU_SHADER_BUILDER  "Shader builder is a developer option enabling linting on GLSL during compilation"                                  OFF)

 mark_as_advanced(
  WITH_OPENGL
  WITH_GLEW_ES
  WITH_GL_EGL
  WITH_GL_PROFILE_ES20
-  WITH_GPU_SHADER_BUILDER
 )

 if(WIN32)
@@ -563,18 +520,12 @@ if(WIN32)
  set(CPACK_INSTALL_PREFIX ${CMAKE_GENERIC_PROGRAM_FILES}/${})
 endif()

-# Compiler tool-chain.
-if(UNIX AND NOT APPLE)
-  if(CMAKE_COMPILER_IS_GNUCC)
-    option(WITH_LINKER_GOLD "Use ld.gold linker which is usually faster than ld.bfd" ON)
-    mark_as_advanced(WITH_LINKER_GOLD)
-    option(WITH_LINKER_LLD "Use ld.lld linker which is usually faster than ld.gold" OFF)
-    mark_as_advanced(WITH_LINKER_LLD)
-  endif()
-  if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-    option(WITH_LINKER_MOLD "Use ld.mold linker which is usually faster than ld.gold & ld.lld." OFF)
-    mark_as_advanced(WITH_LINKER_MOLD)
-  endif()
+# Compiler toolchain
+if(CMAKE_COMPILER_IS_GNUCC)
+  option(WITH_LINKER_GOLD "Use ld.gold linker which is usually faster than ld.bfd" ON)
+  mark_as_advanced(WITH_LINKER_GOLD)
+  option(WITH_LINKER_LLD "Use ld.lld linker which is usually faster than ld.gold" OFF)
+  mark_as_advanced(WITH_LINKER_LLD)
 endif()

 option(WITH_COMPILER_ASAN "Build and link against address sanitizer (only for Debug & RelWithDebInfo targets)." OFF)
@@ -673,7 +624,7 @@ if(WIN32)
  option(WITH_WINDOWS_PDB "Generate a pdb file for client side stacktraces" ON)
  mark_as_advanced(WITH_WINDOWS_PDB)

-  option(WITH_WINDOWS_STRIPPED_PDB "Use a stripped PDB file" ON)
+  option(WITH_WINDOWS_STRIPPED_PDB "Use a stripped PDB file" On)
  mark_as_advanced(WITH_WINDOWS_STRIPPED_PDB)

 endif()
@@ -710,12 +661,9 @@ if(UNIX AND NOT APPLE)
 endif()

 # Installation process.
-set(POSTINSTALL_SCRIPT "" CACHE FILEPATH "Run given CMake script after installation process")
+option(POSTINSTALL_SCRIPT "Run given CMake script after installation process" OFF)
 mark_as_advanced(POSTINSTALL_SCRIPT)

-set(POSTCONFIGURE_SCRIPT "" CACHE FILEPATH "Run given CMake script as the last step of CMake configuration")
-mark_as_advanced(POSTCONFIGURE_SCRIPT)
-
 # end option(...)


@@ -869,7 +817,7 @@ if(WITH_AUDASPACE)
 endif()

 # Auto-enable CUDA dynload if toolkit is not found.
-if(WITH_CYCLES AND WITH_CYCLES_DEVICE_CUDA AND NOT WITH_CUDA_DYNLOAD)
+if(NOT WITH_CUDA_DYNLOAD)
  find_package(CUDA)
  if(NOT CUDA_FOUND)
    message(STATUS "CUDA toolkit not found, using dynamic runtime loading of libraries (WITH_CUDA_DYNLOAD) instead")
@@ -877,11 +825,6 @@ if(WITH_CYCLES AND WITH_CYCLES_DEVICE_CUDA AND NOT WITH_CUDA_DYNLOAD)
  endif()
 endif()

-if(WITH_CYCLES_DEVICE_HIP)
-  # Currently HIP must be dynamically loaded, this may change in future toolkits
-  set(WITH_HIP_DYNLOAD ON)
-endif()
-
 #-----------------------------------------------------------------------------
 # Check check if submodules are cloned

@@ -1099,7 +1042,7 @@ if(MSVC)
  add_definitions(-D__LITTLE_ENDIAN__)

  # OSX-Note: as we do cross-compiling with specific set architecture,
-  # endianness-detection and auto-setting is counterproductive
+  # endianess-detection and auto-setting is counterproductive
  # so we just set endianness according CMAKE_OSX_ARCHITECTURES

 elseif(CMAKE_OSX_ARCHITECTURES MATCHES i386 OR CMAKE_OSX_ARCHITECTURES MATCHES x86_64 OR CMAKE_OSX_ARCHITECTURES MATCHES arm64)
@@ -1777,19 +1720,13 @@ if(WITH_PYTHON)
  elseif(WITH_PYTHON_INSTALL_REQUESTS)
    find_python_package(requests "")
  endif()
-
-  if(WIN32 OR APPLE)
-    # pass, we have this in lib/python/site-packages
-  elseif(WITH_PYTHON_INSTALL_ZSTANDARD)
-    find_python_package(zstandard "")
-  endif()
 endif()

 # Select C++17 as the standard for C++ projects.
 set(CMAKE_CXX_STANDARD 17)
 # If C++17 is not available, downgrading to an earlier standard is NOT OK.
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-# Do not enable compiler specific language extensions.
+# Do not enable compiler specific language extentions.
 set(CMAKE_CXX_EXTENSIONS OFF)

 # Make MSVC properly report the value of the __cplusplus preprocessor macro
@@ -1917,9 +1854,6 @@ elseif(WITH_CYCLES_STANDALONE)
  if(WITH_CUDA_DYNLOAD)
    add_subdirectory(extern/cuew)
  endif()
-  if(WITH_HIP_DYNLOAD)
-    add_subdirectory(extern/hipew)
-  endif()
  if(NOT WITH_SYSTEM_GLEW)
    add_subdirectory(extern/glew)
  endif()
@@ -2054,7 +1988,6 @@ if(FIRST_RUN)
  endif()
  info_cfg_option(WITH_PYTHON_INSTALL)
  info_cfg_option(WITH_PYTHON_INSTALL_NUMPY)
-  info_cfg_option(WITH_PYTHON_INSTALL_ZSTANDARD)
  info_cfg_option(WITH_PYTHON_MODULE)
  info_cfg_option(WITH_PYTHON_SAFETY)

@@ -2079,8 +2012,3 @@ endif()
 if(0)
  print_all_vars()
 endif()
-
-# Should be the last step of configuration.
-if(POSTCONFIGURE_SCRIPT)
-  include(${POSTCONFIGURE_SCRIPT})
-endif()
--- a/6
+++ b/6
@@ -27,7 +27,7 @@
 define HELP_TEXT

 Blender Convenience Targets
-   Provided for building Blender (multiple targets can be used at once).
+   Provided for building Blender, (multiple at once can be used).

   * debug:         Build a debug binary.
   * full:          Enable all supported dependencies & options.
@@ -40,8 +40,6 @@ Blender Convenience Targets
   * ninja:         Use ninja build tool for faster builds.
   * ccache:        Use ccache for faster rebuilds.

-   Note: when passing in multiple targets their order is not important.
-   So for a fast build you can for e.g. run 'make lite ccache ninja'.
   Note: passing the argument 'BUILD_DIR=path' when calling make will override the default build dir.
   Note: passing the argument 'BUILD_CMAKE_ARGS=args' lets you add cmake arguments.

@@ -51,7 +49,7 @@ Other Convenience Targets
   * config:        Run cmake configuration tool to set build options.
   * deps:          Build library dependencies (intended only for platform maintainers).

-                    The existance of locally build dependencies overrides the pre-built dependencies from subversion.
+                    The existance of locally build dependancies overrides the pre-built dependencies from subversion.
                    These must be manually removed from '../lib/' to go back to using the pre-compiled libraries.

 Project Files
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -63,7 +63,6 @@ include(cmake/jpeg.cmake)
 include(cmake/blosc.cmake)
 include(cmake/pthreads.cmake)
 include(cmake/openexr.cmake)
-include(cmake/brotli.cmake)
 include(cmake/freetype.cmake)
 include(cmake/freeglut.cmake)
 include(cmake/glew.cmake)
--- a/build_files/build_environment/cmake/boost.cmake
+++ b/build_files/build_environment/cmake/boost.cmake
@@ -25,13 +25,8 @@ else()
 endif()

 if(WIN32)
-  if(MSVC_VERSION GREATER_EQUAL 1920) # 2019
-    set(BOOST_TOOLSET toolset=msvc-14.2)
-    set(BOOST_COMPILER_STRING -vc142)
-  else() # 2017
-    set(BOOST_TOOLSET toolset=msvc-14.1)
-    set(BOOST_COMPILER_STRING -vc141)
-  endif()
+  set(BOOST_TOOLSET toolset=msvc-14.1)
+  set(BOOST_COMPILER_STRING -vc141)

  set(BOOST_CONFIGURE_COMMAND bootstrap.bat)
  set(BOOST_BUILD_COMMAND b2)
--- a/build_files/build_environment/cmake/brotli.cmake
+++ b/build_files/build_environment/cmake/brotli.cmake
@@ -1,38 +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(BROTLI_EXTRA_ARGS
-)
-
-ExternalProject_Add(external_brotli
-  URL file://${PACKAGE_DIR}/${BROTLI_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${BROTLI_HASH_TYPE}=${BROTLI_HASH}
-  PREFIX ${BUILD_DIR}/brotli
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/brotli ${DEFAULT_CMAKE_FLAGS} ${BROTLI_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/brotli
-)
-
-if(BUILD_MODE STREQUAL Release AND WIN32)
-  ExternalProject_Add_Step(external_brotli after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/brotli/include ${HARVEST_TARGET}/brotli/include
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/brotli/lib/brotlidec-static${LIBEXT} ${HARVEST_TARGET}/brotli/lib/brotlidec-static${LIBEXT}
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/brotli/lib/brotlicommon-static${LIBEXT} ${HARVEST_TARGET}/brotli/lib/brotlicommon-static${LIBEXT}
-    DEPENDEES install
-  )
-endif()
--- a/build_files/build_environment/cmake/download.cmake
+++ b/build_files/build_environment/cmake/download.cmake
@@ -94,4 +94,3 @@ download_source(POTRACE)
 download_source(HARU)
 download_source(ZSTD)
 download_source(FLEX)
-download_source(BROTLI)
--- a/build_files/build_environment/cmake/freetype.cmake
+++ b/build_files/build_environment/cmake/freetype.cmake
@@ -23,12 +23,9 @@ set(FREETYPE_EXTRA_ARGS
  -DWITH_HarfBuzz=OFF
  -DFT_WITH_HARFBUZZ=OFF
  -DFT_WITH_BZIP2=OFF
-  -DFT_WITH_BROTLI=ON
  -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE
  -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE
-  -DPC_BROTLIDEC_INCLUDEDIR=${LIBDIR}/brotli/include
-  -DPC_BROTLIDEC_LIBDIR=${LIBDIR}/brotli/lib
-  )
+  -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE)

 ExternalProject_Add(external_freetype
  URL file://${PACKAGE_DIR}/${FREETYPE_FILE}
@@ -39,11 +36,6 @@ ExternalProject_Add(external_freetype
  INSTALL_DIR ${LIBDIR}/freetype
 )

-add_dependencies(
-  external_freetype
-  external_brotli
-)
-
 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
--- a/build_files/build_environment/cmake/gmp.cmake
+++ b/build_files/build_environment/cmake/gmp.cmake
@@ -38,6 +38,13 @@ elseif(UNIX AND NOT APPLE)
  )
 endif()

+if(BLENDER_PLATFORM_ARM)
+  set(GMP_OPTIONS
+    ${GMP_OPTIONS}
+    --disable-assembly
+  )
+endif()
+
 ExternalProject_Add(external_gmp
  URL file://${PACKAGE_DIR}/${GMP_FILE}
  DOWNLOAD_DIR ${DOWNLOAD_DIR}
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -17,7 +17,7 @@
 # ***** END GPL LICENSE BLOCK *****

 ########################################################################
-# Copy all generated files to the proper structure as blender prefers
+# Copy all generated files to the proper strucure as blender prefers
 ########################################################################

 if(NOT DEFINED HARVEST_TARGET)
@@ -79,8 +79,6 @@ endfunction()
 harvest(alembic/include alembic/include "*.h")
 harvest(alembic/lib/libAlembic.a alembic/lib/libAlembic.a)
 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(ffmpeg/include ffmpeg/include "*.h")
--- a/build_files/build_environment/cmake/nanovdb.cmake
+++ b/build_files/build_environment/cmake/nanovdb.cmake
@@ -42,7 +42,6 @@ ExternalProject_Add(nanovdb
  URL_HASH ${NANOVDB_HASH_TYPE}=${NANOVDB_HASH}
  PREFIX ${BUILD_DIR}/nanovdb
  SOURCE_SUBDIR nanovdb
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/nanovdb/src/nanovdb < ${PATCH_DIR}/nanovdb.diff
  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/nanovdb ${DEFAULT_CMAKE_FLAGS} ${NANOVDB_EXTRA_ARGS}
  INSTALL_DIR ${LIBDIR}/nanovdb
 )
--- a/build_files/build_environment/cmake/numpy.cmake
+++ b/build_files/build_environment/cmake/numpy.cmake
@@ -38,6 +38,7 @@ ExternalProject_Add(external_numpy
  PREFIX ${BUILD_DIR}/numpy
  PATCH_COMMAND ${NUMPY_PATCH}
  CONFIGURE_COMMAND ""
+  PATCH_COMMAND COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/numpy/src/external_numpy < ${PATCH_DIR}/numpy.diff
  LOG_BUILD 1
  BUILD_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/numpy/src/external_numpy/setup.py build ${NUMPY_BUILD_OPTION} install --old-and-unmanageable
  INSTALL_COMMAND ""
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -39,7 +39,7 @@ endif()
 set(DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/downloads" CACHE STRING "Path for downloaded files")
 # This path must be hard-coded like this, so that the GNUmakefile knows where it is and can pass it to make_source_archive.py:
 set(PACKAGE_DIR "${CMAKE_CURRENT_BINARY_DIR}/packages")
-option(PACKAGE_USE_UPSTREAM_SOURCES "Use sources upstream to download the package sources, when OFF the blender mirror will be used" ON)
+option(PACKAGE_USE_UPSTREAM_SOURCES "Use soures upstream to download the package sources, when OFF the blender mirror will be used" ON)

 file(TO_CMAKE_PATH ${DOWNLOAD_DIR} DOWNLOAD_DIR)
 file(TO_CMAKE_PATH ${PACKAGE_DIR} PACKAGE_DIR)
--- a/build_files/build_environment/cmake/package_python.cmake
+++ b/build_files/build_environment/cmake/package_python.cmake
@@ -24,7 +24,7 @@ if(MSVC)
    add_custom_command(
      OUTPUT ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
      COMMAND echo packaging python
-      COMMAND echo this should output at ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
+      COMMAND echo this should ouput at ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
      COMMAND ${CMAKE_COMMAND} -E make_directory ${PYTARGET}/libs
      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib
      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python.exe ${PYTARGET}/bin/python.exe
@@ -43,7 +43,7 @@ if(MSVC)
    add_custom_command(
      OUTPUT ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
      COMMAND echo packaging python
-      COMMAND echo this should output at ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
+      COMMAND echo this should ouput at ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
      COMMAND ${CMAKE_COMMAND} -E make_directory ${PYTARGET}/libs
      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib
      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_POSTFIX}.exe ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
--- a/build_files/build_environment/cmake/python_site_packages.cmake
+++ b/build_files/build_environment/cmake/python_site_packages.cmake
@@ -18,20 +18,14 @@

 if(WIN32 AND BUILD_MODE STREQUAL Debug)
  set(SITE_PACKAGES_EXTRA --global-option build --global-option --debug)
-  # zstandard is determined to build and link release mode libs in a debug
-  # configuration, the only way to make it happy is to bend to its will
-  # and give it a library to link with.
-  set(PIP_CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/python/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}_d.lib ${LIBDIR}/python/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib)
-else()
-  set(PIP_CONFIGURE_COMMAND echo ".")
 endif()

 ExternalProject_Add(external_python_site_packages
  DOWNLOAD_COMMAND ""
-  CONFIGURE_COMMAND ${PIP_CONFIGURE_COMMAND}
+  CONFIGURE_COMMAND ""
  BUILD_COMMAND ""
  PREFIX ${BUILD_DIR}/site_packages
-  INSTALL_COMMAND ${PYTHON_BINARY} -m pip install ${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} --no-binary :all:
+  INSTALL_COMMAND ${PYTHON_BINARY} -m pip install ${SITE_PACKAGES_EXTRA} cython==${CYTHON_VERSION} idna==${IDNA_VERSION} chardet==${CHARDET_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} --no-binary :all:
 )

 if(USE_PIP_NUMPY)
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -83,9 +83,9 @@ else()
  set(OPENEXR_VERSION_POSTFIX)
 endif()

-set(FREETYPE_VERSION 2.11.0)
+set(FREETYPE_VERSION 2.10.2)
 set(FREETYPE_URI http://prdownloads.sourceforge.net/freetype/freetype-${FREETYPE_VERSION}.tar.gz)
-set(FREETYPE_HASH cf09172322f6b50cf8f568bf8fe14bde)
+set(FREETYPE_HASH b1cb620e4c875cd4d1bfa04945400945)
 set(FREETYPE_HASH_TYPE MD5)
 set(FREETYPE_FILE freetype-${FREETYPE_VERSION}.tar.gz)

@@ -189,11 +189,11 @@ set(OSL_HASH 1abd7ce40481771a9fa937f19595d2f2)
 set(OSL_HASH_TYPE MD5)
 set(OSL_FILE OpenShadingLanguage-${OSL_VERSION}.tar.gz)

-set(PYTHON_VERSION 3.9.7)
+set(PYTHON_VERSION 3.9.2)
 set(PYTHON_SHORT_VERSION 3.9)
 set(PYTHON_SHORT_VERSION_NO_DOTS 39)
 set(PYTHON_URI https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz)
-set(PYTHON_HASH fddb060b483bc01850a3f412eea1d954)
+set(PYTHON_HASH f0dc9000312abeb16de4eccce9a870ab)
 set(PYTHON_HASH_TYPE MD5)
 set(PYTHON_FILE Python-${PYTHON_VERSION}.tar.xz)

@@ -215,18 +215,17 @@ set(NANOVDB_HASH e7b9e863ec2f3b04ead171dec2322807)
 set(NANOVDB_HASH_TYPE MD5)
 set(NANOVDB_FILE nano-vdb-${NANOVDB_GIT_UID}.tar.gz)

-set(IDNA_VERSION 3.2)
-set(CHARSET_NORMALIZER_VERSION 2.0.6)
-set(URLLIB3_VERSION 1.26.7)
-set(CERTIFI_VERSION 2021.10.8)
-set(REQUESTS_VERSION 2.26.0)
-set(CYTHON_VERSION 0.29.24)
-set(ZSTANDARD_VERSION 0.15.2 )
+set(IDNA_VERSION 2.10)
+set(CHARDET_VERSION 4.0.0)
+set(URLLIB3_VERSION 1.26.3)
+set(CERTIFI_VERSION 2020.12.5)
+set(REQUESTS_VERSION 2.25.1)
+set(CYTHON_VERSION 0.29.21)

-set(NUMPY_VERSION 1.21.2)
-set(NUMPY_SHORT_VERSION 1.21)
+set(NUMPY_VERSION 1.19.5)
+set(NUMPY_SHORT_VERSION 1.19)
 set(NUMPY_URI https://github.com/numpy/numpy/releases/download/v${NUMPY_VERSION}/numpy-${NUMPY_VERSION}.zip)
-set(NUMPY_HASH 5638d5dae3ca387be562912312db842e)
+set(NUMPY_HASH f6a1b48717c552bbc18f1adc3cc1fe0e)
 set(NUMPY_HASH_TYPE MD5)
 set(NUMPY_FILE numpy-${NUMPY_VERSION}.zip)

@@ -474,9 +473,9 @@ set(ISPC_HASH 2e3abedbc0ea9aaec17d6562c632454d)
 set(ISPC_HASH_TYPE MD5)
 set(ISPC_FILE ispc-${ISPC_VERSION}.tar.gz)

-set(GMP_VERSION 6.2.1)
+set(GMP_VERSION 6.2.0)
 set(GMP_URI https://gmplib.org/download/gmp/gmp-${GMP_VERSION}.tar.xz)
-set(GMP_HASH 0b82665c4a92fd2ade7440c13fcaa42b)
+set(GMP_HASH a325e3f09e6d91e62101e59f9bda3ec1)
 set(GMP_HASH_TYPE MD5)
 set(GMP_FILE gmp-${GMP_VERSION}.tar.xz)

@@ -500,9 +499,3 @@ set(ZSTD_FILE zstd-${ZSTD_VERSION}.tar.gz)

 set(SSE2NEON_GIT https://github.com/DLTcollab/sse2neon.git)
 set(SSE2NEON_GIT_HASH fe5ff00bb8d19b327714a3c290f3e2ce81ba3525)
-
-set(BROTLI_VERSION v1.0.9)
-set(BROTLI_URI https://github.com/google/brotli/archive/refs/tags/${BROTLI_VERSION}.tar.gz)
-set(BROTLI_HASH f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46)
-set(BROTLI_HASH_TYPE SHA256)
-set(BROTLI_FILE brotli-${BROTLI_VERSION}.tar.gz)
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -371,78 +371,71 @@ NO_BUILD=false
 NO_CONFIRM=false
 USE_CXX11=true

-# Note about versions: Min is inclusive, Mex is 'minimum exclusive' (i.e. XXX_VERSION_MIN <= ACTUAL_VERSION < XXX_VERSION_MEX)
+# Note about versions: Min is inclusive, Max is exclusive (i.e. XXX_VERSION_MIN <= ACTUAL_VERSION < XXX_VERSION_MAX)
 # XXX_VERSION is officially supported/used version in official builds.
 # XXX_VERSION_SHORT is used for various things, like preferred version (when distribution provides several of them),
 #                   and to name shortcuts to built libraries' installation directories...

 CLANG_FORMAT_VERSION_MIN="6.0"
-CLANG_FORMAT_VERSION_MEX="10.0"
+CLANG_FORMAT_VERSION_MAX="10.0"

-PYTHON_VERSION="3.9.7"
+PYTHON_VERSION="3.9.2"
 PYTHON_VERSION_SHORT="3.9"
 PYTHON_VERSION_MIN="3.7"
-PYTHON_VERSION_MEX="3.11"
+PYTHON_VERSION_MAX="3.11"
 PYTHON_VERSION_INSTALLED=$PYTHON_VERSION_SHORT
 PYTHON_FORCE_BUILD=false
 PYTHON_FORCE_REBUILD=false
 PYTHON_SKIP=false

 # Additional Python modules.
-PYTHON_IDNA_VERSION="3.2"
+PYTHON_IDNA_VERSION="2.9"
 PYTHON_IDNA_VERSION_MIN="2.0"
-PYTHON_IDNA_VERSION_MEX="4.0"
+PYTHON_IDNA_VERSION_MAX="3.0"
 PYTHON_IDNA_NAME="idna"

-PYTHON_CHARSET_NORMALIZER_VERSION="2.0.6"
-PYTHON_CHARSET_NORMALIZER_VERSION_MIN="2.0.6"
-PYTHON_CHARSET_NORMALIZER_VERSION_MEX="2.1.0"  # requests uses `charset_normalizer~=2.0.0`
-PYTHON_CHARSET_NORMALIZER_NAME="charset-normalizer"
+PYTHON_CHARDET_VERSION="3.0.4"
+PYTHON_CHARDET_VERSION_MIN="3.0"
+PYTHON_CHARDET_VERSION_MAX="5.0"
+PYTHON_CHARDET_NAME="chardet"

-PYTHON_URLLIB3_VERSION="1.26.7"
+PYTHON_URLLIB3_VERSION="1.25.9"
 PYTHON_URLLIB3_VERSION_MIN="1.0"
-PYTHON_URLLIB3_VERSION_MEX="2.0"
+PYTHON_URLLIB3_VERSION_MAX="2.0"
 PYTHON_URLLIB3_NAME="urllib3"

-PYTHON_CERTIFI_VERSION="2021.10.8"
-PYTHON_CERTIFI_VERSION_MIN="2021.0"
-PYTHON_CERTIFI_VERSION_MEX="2023.0"
+PYTHON_CERTIFI_VERSION="2020.4.5.2"
+PYTHON_CERTIFI_VERSION_MIN="2020.0"
+PYTHON_CERTIFI_VERSION_MAX="2021.0"
 PYTHON_CERTIFI_NAME="certifi"

 PYTHON_REQUESTS_VERSION="2.23.0"
 PYTHON_REQUESTS_VERSION_MIN="2.0"
-PYTHON_REQUESTS_VERSION_MEX="3.0"
+PYTHON_REQUESTS_VERSION_MAX="3.0"
 PYTHON_REQUESTS_NAME="requests"

-PYTHON_ZSTANDARD_VERSION="0.15.2"
-PYTHON_ZSTANDARD_VERSION_MIN="0.15.2"
-PYTHON_ZSTANDARD_VERSION_MEX="0.16.0"
-PYTHON_ZSTANDARD_NAME="zstandard"
-
-PYTHON_NUMPY_VERSION="1.21.2"
+PYTHON_NUMPY_VERSION="1.19.5"
 PYTHON_NUMPY_VERSION_MIN="1.14"
-PYTHON_NUMPY_VERSION_MEX="2.0"
+PYTHON_NUMPY_VERSION_MAX="2.0"
 PYTHON_NUMPY_NAME="numpy"

 # As package-ready parameters (only used with distro packages).
 PYTHON_MODULES_PACKAGES=(
-  "$PYTHON_IDNA_NAME $PYTHON_IDNA_VERSION_MIN $PYTHON_IDNA_VERSION_MEX"
-  "$PYTHON_CHARSET_NORMALIZER_NAME $PYTHON_CHARSET_NORMALIZER_VERSION_MIN $PYTHON_CHARSET_NORMALIZER_VERSION_MEX"
-  "$PYTHON_URLLIB3_NAME $PYTHON_URLLIB3_VERSION_MIN $PYTHON_URLLIB3_VERSION_MEX"
-  "$PYTHON_CERTIFI_NAME $PYTHON_CERTIFI_VERSION_MIN $PYTHON_CERTIFI_VERSION_MEX"
-  "$PYTHON_REQUESTS_NAME $PYTHON_REQUESTS_VERSION_MIN $PYTHON_REQUESTS_VERSION_MEX"
-  "$PYTHON_ZSTANDARD_NAME $PYTHON_ZSTANDARD_VERSION_MIN $PYTHON_ZSTANDARD_VERSION_MEX"
-  "$PYTHON_NUMPY_NAME $PYTHON_NUMPY_VERSION_MIN $PYTHON_NUMPY_VERSION_MEX"
+  "$PYTHON_IDNA_NAME $PYTHON_IDNA_VERSION_MIN $PYTHON_IDNA_VERSION_MAX"
+  "$PYTHON_CHARDET_NAME $PYTHON_CHARDET_VERSION_MIN $PYTHON_CHARDET_VERSION_MAX"
+  "$PYTHON_URLLIB3_NAME $PYTHON_URLLIB3_VERSION_MIN $PYTHON_URLLIB3_VERSION_MAX"
+  "$PYTHON_CERTIFI_NAME $PYTHON_CERTIFI_VERSION_MIN $PYTHON_CERTIFI_VERSION_MAX"
+  "$PYTHON_REQUESTS_NAME $PYTHON_REQUESTS_VERSION_MIN $PYTHON_REQUESTS_VERSION_MAX"
+  "$PYTHON_NUMPY_NAME $PYTHON_NUMPY_VERSION_MIN $PYTHON_NUMPY_VERSION_MAX"
 )

 # As pip-ready parameters (only used when building python).
 PYTHON_MODULES_PIP=(
  "$PYTHON_IDNA_NAME==$PYTHON_IDNA_VERSION"
-  "$PYTHON_CHARSET_NORMALIZER_NAME==$PYTHON_CHARSET_NORMALIZER_VERSION"
+  "$PYTHON_CHARDET_NAME==$PYTHON_CHARDET_VERSION"
  "$PYTHON_URLLIB3_NAME==$PYTHON_URLLIB3_VERSION"
  "$PYTHON_CERTIFI_NAME==$PYTHON_CERTIFI_VERSION"
  "$PYTHON_REQUESTS_NAME==$PYTHON_REQUESTS_VERSION"
-  "$PYTHON_ZSTANDARD_NAME==$PYTHON_ZSTANDARD_VERSION"
  "$PYTHON_NUMPY_NAME==$PYTHON_NUMPY_VERSION"
 )

@@ -450,7 +443,7 @@ PYTHON_MODULES_PIP=(
 BOOST_VERSION="1.73.0"
 BOOST_VERSION_SHORT="1.73"
 BOOST_VERSION_MIN="1.49"
-BOOST_VERSION_MEX="2.0"
+BOOST_VERSION_MAX="2.0"
 BOOST_FORCE_BUILD=false
 BOOST_FORCE_REBUILD=false
 BOOST_SKIP=false
@@ -459,7 +452,7 @@ TBB_VERSION="2020"
 TBB_VERSION_SHORT="2020"
 TBB_VERSION_UPDATE="_U2"  # Used for source packages...
 TBB_VERSION_MIN="2018"
-TBB_VERSION_MEX="2022"
+TBB_VERSION_MAX="2022"
 TBB_FORCE_BUILD=false
 TBB_FORCE_REBUILD=false
 TBB_SKIP=false
@@ -467,7 +460,7 @@ TBB_SKIP=false
 OCIO_VERSION="2.0.0"
 OCIO_VERSION_SHORT="2.0"
 OCIO_VERSION_MIN="2.0"
-OCIO_VERSION_MEX="3.0"
+OCIO_VERSION_MAX="3.0"
 OCIO_FORCE_BUILD=false
 OCIO_FORCE_REBUILD=false
 OCIO_SKIP=false
@@ -475,7 +468,7 @@ OCIO_SKIP=false
 OPENEXR_VERSION="2.5.5"
 OPENEXR_VERSION_SHORT="2.5"
 OPENEXR_VERSION_MIN="2.4"
-OPENEXR_VERSION_MEX="3.0"
+OPENEXR_VERSION_MAX="3.0"
 OPENEXR_FORCE_BUILD=false
 OPENEXR_FORCE_REBUILD=false
 OPENEXR_SKIP=false
@@ -484,7 +477,7 @@ _with_built_openexr=false
 OIIO_VERSION="2.2.15.1"
 OIIO_VERSION_SHORT="2.2"
 OIIO_VERSION_MIN="2.1.12"
-OIIO_VERSION_MEX="2.3.0"
+OIIO_VERSION_MAX="2.3.0"
 OIIO_FORCE_BUILD=false
 OIIO_FORCE_REBUILD=false
 OIIO_SKIP=false
@@ -492,7 +485,7 @@ OIIO_SKIP=false
 LLVM_VERSION="12.0.0"
 LLVM_VERSION_SHORT="12.0"
 LLVM_VERSION_MIN="11.0"
-LLVM_VERSION_MEX="14.0"
+LLVM_VERSION_MAX="13.0"
 LLVM_VERSION_FOUND=""
 LLVM_FORCE_BUILD=false
 LLVM_FORCE_REBUILD=false
@@ -502,7 +495,7 @@ LLVM_SKIP=false
 OSL_VERSION="1.11.14.1"
 OSL_VERSION_SHORT="1.11"
 OSL_VERSION_MIN="1.11"
-OSL_VERSION_MEX="2.0"
+OSL_VERSION_MAX="2.0"
 OSL_FORCE_BUILD=false
 OSL_FORCE_REBUILD=false
 OSL_SKIP=false
@@ -511,7 +504,7 @@ OSL_SKIP=false
 OSD_VERSION="3.4.3"
 OSD_VERSION_SHORT="3.4"
 OSD_VERSION_MIN="3.4"
-OSD_VERSION_MEX="4.0"
+OSD_VERSION_MAX="4.0"
 OSD_FORCE_BUILD=false
 OSD_FORCE_REBUILD=false
 OSD_SKIP=false
@@ -522,7 +515,7 @@ OPENVDB_BLOSC_VERSION="1.5.0"
 OPENVDB_VERSION="8.0.1"
 OPENVDB_VERSION_SHORT="8.0"
 OPENVDB_VERSION_MIN="8.0"
-OPENVDB_VERSION_MEX="8.1"
+OPENVDB_VERSION_MAX="8.1"
 OPENVDB_FORCE_BUILD=false
 OPENVDB_FORCE_REBUILD=false
 OPENVDB_SKIP=false
@@ -531,7 +524,7 @@ OPENVDB_SKIP=false
 ALEMBIC_VERSION="1.7.16"
 ALEMBIC_VERSION_SHORT="1.7"
 ALEMBIC_VERSION_MIN="1.7"
-ALEMBIC_VERSION_MEX="2.0"
+ALEMBIC_VERSION_MAX="2.0"
 ALEMBIC_FORCE_BUILD=false
 ALEMBIC_FORCE_REBUILD=false
 ALEMBIC_SKIP=false
@@ -539,7 +532,7 @@ ALEMBIC_SKIP=false
 USD_VERSION="21.02"
 USD_VERSION_SHORT="21.02"
 USD_VERSION_MIN="20.05"
-USD_VERSION_MEX="22.00"
+USD_VERSION_MAX="22.00"
 USD_FORCE_BUILD=false
 USD_FORCE_REBUILD=false
 USD_SKIP=false
@@ -547,7 +540,7 @@ USD_SKIP=false
 OPENCOLLADA_VERSION="1.6.68"
 OPENCOLLADA_VERSION_SHORT="1.6"
 OPENCOLLADA_VERSION_MIN="1.6.68"
-OPENCOLLADA_VERSION_MEX="1.7"
+OPENCOLLADA_VERSION_MAX="1.7"
 OPENCOLLADA_FORCE_BUILD=false
 OPENCOLLADA_FORCE_REBUILD=false
 OPENCOLLADA_SKIP=false
@@ -555,7 +548,7 @@ OPENCOLLADA_SKIP=false
 EMBREE_VERSION="3.10.0"
 EMBREE_VERSION_SHORT="3.10"
 EMBREE_VERSION_MIN="3.10"
-EMBREE_VERSION_MEX="4.0"
+EMBREE_VERSION_MAX="4.0"
 EMBREE_FORCE_BUILD=false
 EMBREE_FORCE_REBUILD=false
 EMBREE_SKIP=false
@@ -563,7 +556,7 @@ EMBREE_SKIP=false
 OIDN_VERSION="1.4.1"
 OIDN_VERSION_SHORT="1.4"
 OIDN_VERSION_MIN="1.4.0"
-OIDN_VERSION_MEX="1.5"
+OIDN_VERSION_MAX="1.5"
 OIDN_FORCE_BUILD=false
 OIDN_FORCE_REBUILD=false
 OIDN_SKIP=false
@@ -573,7 +566,7 @@ ISPC_VERSION="1.16.0"
 FFMPEG_VERSION="4.4"
 FFMPEG_VERSION_SHORT="4.4"
 FFMPEG_VERSION_MIN="3.0"
-FFMPEG_VERSION_MEX="5.0"
+FFMPEG_VERSION_MAX="5.0"
 FFMPEG_FORCE_BUILD=false
 FFMPEG_FORCE_REBUILD=false
 FFMPEG_SKIP=false
@@ -582,7 +575,7 @@ _ffmpeg_list_sep=";"
 XR_OPENXR_VERSION="1.0.17"
 XR_OPENXR_VERSION_SHORT="1.0"
 XR_OPENXR_VERSION_MIN="1.0.8"
-XR_OPENXR_VERSION_MEX="2.0"
+XR_OPENXR_VERSION_MAX="2.0"
 XR_OPENXR_FORCE_BUILD=false
 XR_OPENXR_FORCE_REBUILD=false
 XR_OPENXR_SKIP=false
@@ -1148,11 +1141,10 @@ You may also want to build them yourself (optional ones are [between brackets]):

    * Python $PYTHON_VERSION (from $PYTHON_SOURCE).
    ** [IDNA $PYTHON_IDNA_VERSION] (use pip).
-    ** [Charset Normalizer $PYTHON_CHARSET_NORMALIZER_VERSION] (use pip).
+    ** [Chardet $PYTHON_CHARDET_VERSION] (use pip).
    ** [Urllib3 $PYTHON_URLLIB3_VERSION] (use pip).
    ** [Certifi $PYTHON_CERTIFI_VERSION] (use pip).
    ** [Requests $PYTHON_REQUESTS_VERSION] (use pip).
-    ** [ZStandard $PYTHON_ZSTANDARD_VERSION] (use pip).
    ** [NumPy $PYTHON_NUMPY_VERSION] (use pip).
    * Boost $BOOST_VERSION (from $BOOST_SOURCE, modules: $BOOST_BUILD_MODULES).
    * TBB $TBB_VERSION (from $TBB_SOURCE).
@@ -1826,7 +1818,7 @@ compile_OCIO() {
    # Force linking against static libs
    #rm -f $_inst/lib/*.so*

-    # Additional dependencies
+    # Additional depencencies
    #cp ext/dist/lib/libtinyxml.a $_inst/lib
    #cp ext/dist/lib/libyaml-cpp.a $_inst/lib

@@ -2021,7 +2013,7 @@ compile_OIIO() {
  fi

  # To be changed each time we make edits that would modify the compiled result!
-  oiio_magic=18
+  oiio_magic=17
  _init_oiio

  # Force having own builds for the dependencies.
@@ -2083,9 +2075,9 @@ compile_OIIO() {
    cmake_d="$cmake_d -D OPENEXR_VERSION=$OPENEXR_VERSION"

    if [ "$_with_built_openexr" = true ]; then
-      cmake_d="$cmake_d -D ILMBASE_ROOT=$INST/openexr"
-      cmake_d="$cmake_d -D OPENEXR_ROOT=$INST/openexr"
-      INFO "Ilmbase_ROOT=$INST/openexr"
+      cmake_d="$cmake_d -D ILMBASE_HOME=$INST/openexr"
+      cmake_d="$cmake_d -D OPENEXR_HOME=$INST/openexr"
+      INFO "ILMBASE_HOME=$INST/openexr"
    fi

    # ptex is only needed when nicholas bishop is ready
@@ -2096,7 +2088,6 @@ compile_OIIO() {
    cmake_d="$cmake_d -D USE_PYTHON=OFF"
    cmake_d="$cmake_d -D USE_FFMPEG=OFF"
    cmake_d="$cmake_d -D USE_OPENCV=OFF"
-    cmake_d="$cmake_d -D USE_OPENVDB=OFF"
    cmake_d="$cmake_d -D BUILD_TESTING=OFF"
    cmake_d="$cmake_d -D OIIO_BUILD_TESTS=OFF"
    cmake_d="$cmake_d -D OIIO_BUILD_TOOLS=OFF"
@@ -2374,9 +2365,9 @@ compile_OSL() {
    #~ cmake_d="$cmake_d -D ILMBASE_VERSION=$ILMBASE_VERSION"

    if [ "$_with_built_openexr" = true ]; then
-      cmake_d="$cmake_d -D ILMBASE_ROOT=$INST/openexr"
-      cmake_d="$cmake_d -D OPENEXR_ROOT=$INST/openexr"
-      INFO "Ilmbase_ROOT=$INST/openexr"
+      INFO "ILMBASE_HOME=$INST/openexr"
+      cmake_d="$cmake_d -D OPENEXR_ROOT_DIR=$INST/openexr"
+      cmake_d="$cmake_d -D ILMBASE_ROOT_DIR=$INST/openexr"
      # XXX Temp workaround... sigh, ILMBase really messed the things up by defining their custom names ON by default :(
    fi

@@ -3620,8 +3611,8 @@ compile_FFmpeg() {
    fi

    ./configure --cc="gcc -Wl,--as-needed" \
-        --extra-ldflags="-pthread" \
-        --prefix=$_inst --enable-shared \
+        --extra-ldflags="-pthread -static-libgcc" \
+        --prefix=$_inst --enable-static \
        --disable-ffplay --disable-doc \
        --enable-gray \
        --enable-avfilter --disable-vdpau \
@@ -4036,7 +4027,7 @@ install_DEB() {
    INFO "Forced Python building, as requested..."
    _do_compile_python=true
  else
-    check_package_version_ge_lt_DEB python3-dev $PYTHON_VERSION_MIN $PYTHON_VERSION_MEX
+    check_package_version_ge_lt_DEB python3-dev $PYTHON_VERSION_MIN $PYTHON_VERSION_MAX
    if [ $? -eq 0 ]; then
      PYTHON_VERSION_INSTALLED=$(echo `get_package_version_DEB python3-dev` | sed -r 's/^([0-9]+\.[0-9]+).*/\1/')

@@ -4049,8 +4040,8 @@ install_DEB() {
        module=($module)
        package="python3-${module[0]}"
        package_vmin=${module[1]}
-        package_vmex=${module[2]}
-        check_package_version_ge_lt_DEB "$package" $package_vmin $package_vmex
+        package_vmax=${module[2]}
+        check_package_version_ge_lt_DEB "$package" $package_vmin $package_vmax
        if [ $? -eq 0 ]; then
          install_packages_DEB "$package"
        else
@@ -4076,7 +4067,7 @@ install_DEB() {
    INFO "Forced Boost building, as requested..."
    compile_Boost
  else
-    check_package_version_ge_lt_DEB libboost-dev $BOOST_VERSION_MIN $BOOST_VERSION_MEX
+    check_package_version_ge_lt_DEB libboost-dev $BOOST_VERSION_MIN $BOOST_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_DEB libboost-dev

@@ -4097,7 +4088,7 @@ install_DEB() {
    INFO "Forced TBB building, as requested..."
    compile_TBB
  else
-    check_package_version_ge_lt_DEB libtbb-dev $TBB_VERSION_MIN $TBB_VERSION_MEX
+    check_package_version_ge_lt_DEB libtbb-dev $TBB_VERSION_MIN $TBB_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_DEB libtbb-dev
      clean_TBB
@@ -4114,7 +4105,7 @@ install_DEB() {
    INFO "Forced OpenColorIO building, as requested..."
    compile_OCIO
  else
-    check_package_version_ge_lt_DEB libopencolorio-dev $OCIO_VERSION_MIN $OCIO_VERSION_MEX
+    check_package_version_ge_lt_DEB libopencolorio-dev $OCIO_VERSION_MIN $OCIO_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_DEB libopencolorio-dev
      clean_OCIO
@@ -4131,7 +4122,7 @@ install_DEB() {
    INFO "Forced ILMBase/OpenEXR building, as requested..."
    compile_OPENEXR
  else
-    check_package_version_ge_lt_DEB libopenexr-dev $OPENEXR_VERSION_MIN $OPENEXR_VERSION_MEX
+    check_package_version_ge_lt_DEB libopenexr-dev $OPENEXR_VERSION_MIN $OPENEXR_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_DEB libopenexr-dev
      OPENEXR_VERSION=`get_package_version_DEB libopenexr-dev`
@@ -4152,7 +4143,7 @@ install_DEB() {
    INFO "Forced OpenImageIO building, as requested..."
    compile_OIIO
  else
-    check_package_version_ge_lt_DEB libopenimageio-dev $OIIO_VERSION_MIN $OIIO_VERSION_MEX
+    check_package_version_ge_lt_DEB libopenimageio-dev $OIIO_VERSION_MIN $OIIO_VERSION_MAX
    if [ $? -eq 0 -a "$_with_built_openexr" = false ]; then
      install_packages_DEB libopenimageio-dev openimageio-tools
      clean_OIIO
@@ -4172,7 +4163,7 @@ install_DEB() {
    INFO "Forced LLVM building, as requested..."
    _do_compile_llvm=true
  else
-    check_package_version_ge_lt_DEB llvm-dev $LLVM_VERSION_MIN $LLVM_VERSION_MEX
+    check_package_version_ge_lt_DEB llvm-dev $LLVM_VERSION_MIN $LLVM_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_DEB llvm-dev clang libclang-dev
      have_llvm=true
@@ -4203,7 +4194,7 @@ install_DEB() {
    INFO "Forced OpenShadingLanguage building, as requested..."
    _do_compile_osl=true
  else
-    check_package_version_ge_lt_DEB  libopenshadinglanguage-dev $OSL_VERSION_MIN $OSL_VERSION_MEX
+    check_package_version_ge_lt_DEB  libopenshadinglanguage-dev $OSL_VERSION_MIN $OSL_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_DEB libopenshadinglanguage-dev
      clean_OSL
@@ -4241,7 +4232,7 @@ install_DEB() {
    INFO "Forced OpenVDB building, as requested..."
    compile_OPENVDB
  else
-    check_package_version_ge_lt_DEB libopenvdb-dev $OPENVDB_VERSION_MIN $OPENVDB_VERSION_MEX
+    check_package_version_ge_lt_DEB libopenvdb-dev $OPENVDB_VERSION_MIN $OPENVDB_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_DEB libopenvdb-dev libblosc-dev
      clean_OPENVDB
@@ -4303,7 +4294,7 @@ install_DEB() {
      _do_compile_embree=true
    else
      # There is a package, but it does not provide everything that Blender needs...
-      #~ check_package_version_ge_lt_DEB libembree-dev $EMBREE_VERSION_MIN $EMBREE_VERSION_MEX
+      #~ check_package_version_ge_lt_DEB libembree-dev $EMBREE_VERSION_MIN $EMBREE_VERSION_MAX
      #~ if [ $? -eq 0 ]; then
        #~ install_packages_DEB libembree-dev
        #~ clean_Embree
@@ -4345,7 +4336,7 @@ install_DEB() {
    # XXX Debian Testing / Ubuntu 16.04 finally includes FFmpeg, so check as usual
    check_package_DEB ffmpeg
    if [ $? -eq 0 ]; then
-      check_package_version_ge_lt_DEB ffmpeg $FFMPEG_VERSION_MIN $FFMPEG_VERSION_MEX
+      check_package_version_ge_lt_DEB ffmpeg $FFMPEG_VERSION_MIN $FFMPEG_VERSION_MAX
      if [ $? -eq 0 ]; then
        install_packages_DEB libavdevice-dev
        clean_FFmpeg
@@ -4679,7 +4670,7 @@ install_RPM() {
    INFO "Forced Python building, as requested..."
    _do_compile_python=true
  else
-    check_package_version_ge_lt_RPM python3-devel $PYTHON_VERSION_MIN $PYTHON_VERSION_MEX
+    check_package_version_ge_lt_RPM python3-devel $PYTHON_VERSION_MIN $PYTHON_VERSION_MAX
    if [ $? -eq 0 ]; then
      PYTHON_VERSION_INSTALLED=$(echo `get_package_version_RPM python3-devel` | sed -r 's/^([0-9]+\.[0-9]+).*/\1/')

@@ -4691,8 +4682,8 @@ install_RPM() {
        module=($module)
        package="python3-${module[0]}"
        package_vmin=${module[1]}
-        package_vmex=${module[2]}
-        check_package_version_ge_lt_RPM "$package" $package_vmin $package_vmex
+        package_vmax=${module[2]}
+        check_package_version_ge_lt_RPM "$package" $package_vmin $package_vmax
        if [ $? -eq 0 ]; then
          install_packages_RPM "$package"
        else
@@ -4719,7 +4710,7 @@ install_RPM() {
    INFO "Forced Boost building, as requested..."
    _do_compile_boost=true
  else
-    check_package_version_ge_lt_RPM boost-devel $BOOST_VERSION_MIN $BOOST_VERSION_MEX
+    check_package_version_ge_lt_RPM boost-devel $BOOST_VERSION_MIN $BOOST_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_RPM boost-devel
      clean_Boost
@@ -4746,7 +4737,7 @@ install_RPM() {
    INFO "Forced TBB building, as requested..."
    compile_TBB
  else
-    check_package_version_ge_lt_RPM tbb-devel $TBB_VERSION_MIN $TBB_VERSION_MEX
+    check_package_version_ge_lt_RPM tbb-devel $TBB_VERSION_MIN $TBB_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_RPM tbb-devel
      clean_TBB
@@ -4764,7 +4755,7 @@ install_RPM() {
    compile_OCIO
  else
    if [ "$RPM" = "SUSE" ]; then
-      check_package_version_ge_lt_RPM OpenColorIO-devel $OCIO_VERSION_MIN $OCIO_VERSION_MEX
+      check_package_version_ge_lt_RPM OpenColorIO-devel $OCIO_VERSION_MIN $OCIO_VERSION_MAX
      if [ $? -eq 0 ]; then
        install_packages_RPM OpenColorIO-devel
        clean_OCIO
@@ -4784,7 +4775,7 @@ install_RPM() {
    INFO "Forced ILMBase/OpenEXR building, as requested..."
    compile_OPENEXR
  else
-    check_package_version_ge_lt_RPM openexr-devel $OPENEXR_VERSION_MIN $OPENEXR_VERSION_MEX
+    check_package_version_ge_lt_RPM openexr-devel $OPENEXR_VERSION_MIN $OPENEXR_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_RPM openexr-devel
      OPENEXR_VERSION=`get_package_version_RPM openexr-devel`
@@ -4802,7 +4793,7 @@ install_RPM() {
    INFO "Forced OpenImageIO building, as requested..."
    compile_OIIO
  else
-    check_package_version_ge_lt_RPM OpenImageIO-devel $OIIO_VERSION_MIN $OIIO_VERSION_MEX
+    check_package_version_ge_lt_RPM OpenImageIO-devel $OIIO_VERSION_MIN $OIIO_VERSION_MAX
    if [ $? -eq 0 -a $_with_built_openexr == false ]; then
      install_packages_RPM OpenImageIO-devel OpenImageIO-utils
      clean_OIIO
@@ -4827,7 +4818,7 @@ install_RPM() {
    else
      CLANG_DEV="clang-devel"
    fi
-    check_package_version_ge_lt_RPM llvm-devel $LLVM_VERSION_MIN $LLVM_VERSION_MEX
+    check_package_version_ge_lt_RPM llvm-devel $LLVM_VERSION_MIN $LLVM_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_RPM llvm-devel $CLANG_DEV
      have_llvm=true
@@ -4863,7 +4854,7 @@ install_RPM() {
    else
      OSL_DEV="openshadinglanguage-devel"
    fi
-    check_package_version_ge_lt_RPM $OSL_DEV $OSL_VERSION_MIN $OSL_VERSION_MEX
+    check_package_version_ge_lt_RPM $OSL_DEV $OSL_VERSION_MIN $OSL_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_RPM $OSL_DEV
      clean_OSL
@@ -4958,7 +4949,7 @@ install_RPM() {
      _do_compile_embree=true
    else
      # There is a package, but it does not provide everything that Blender needs...
-      #~ check_package_version_ge_lt_RPM embree-devel $EMBREE_VERSION_MIN $EMBREE_VERSION_MEX
+      #~ check_package_version_ge_lt_RPM embree-devel $EMBREE_VERSION_MIN $EMBREE_VERSION_MAX
      #~ if [ $? -eq 0 ]; then
        #~ install_packages_RPM embree-devel
        #~ clean_Embree
@@ -4997,7 +4988,7 @@ install_RPM() {
    INFO "Forced FFMpeg building, as requested..."
    compile_FFmpeg
  else
-    check_package_version_ge_lt_RPM ffmpeg-devel $FFMPEG_VERSION_MIN $FFMPEG_VERSION_MEX
+    check_package_version_ge_lt_RPM ffmpeg-devel $FFMPEG_VERSION_MIN $FFMPEG_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_RPM ffmpeg ffmpeg-devel
      clean_FFmpeg
@@ -5222,7 +5213,7 @@ install_ARCH() {
    INFO "Forced Python building, as requested..."
    _do_compile_python=true
  else
-    check_package_version_ge_lt_ARCH python $PYTHON_VERSION_MIN $PYTHON_VERSION_MEX
+    check_package_version_ge_lt_ARCH python $PYTHON_VERSION_MIN $PYTHON_VERSION_MAX
    if [ $? -eq 0 ]; then
      PYTHON_VERSION_INSTALLED=$(echo `get_package_version_ARCH python` | sed -r 's/^([0-9]+\.[0-9]+).*/\1/')

@@ -5235,8 +5226,8 @@ install_ARCH() {
        module=($module)
        package="python-${module[0]}"
        package_vmin=${module[1]}
-        package_vmex=${module[2]}
-        check_package_version_ge_lt_ARCH "$package" $package_vmin $package_vmex
+        package_vmax=${module[2]}
+        check_package_version_ge_lt_ARCH "$package" $package_vmin $package_vmax
        if [ $? -eq 0 ]; then
          install_packages_ARCH "$package"
        else
@@ -5262,7 +5253,7 @@ install_ARCH() {
    INFO "Forced Boost building, as requested..."
    compile_Boost
  else
-    check_package_version_ge_lt_ARCH boost $BOOST_VERSION_MIN $BOOST_VERSION_MEX
+    check_package_version_ge_lt_ARCH boost $BOOST_VERSION_MIN $BOOST_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_ARCH boost
      clean_Boost
@@ -5279,7 +5270,7 @@ install_ARCH() {
    INFO "Forced TBB building, as requested..."
    compile_TBB
  else
-    check_package_version_ge_lt_ARCH intel-tbb $TBB_VERSION_MIN $TBB_VERSION_MEX
+    check_package_version_ge_lt_ARCH intel-tbb $TBB_VERSION_MIN $TBB_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_ARCH intel-tbb
      clean_TBB
@@ -5296,7 +5287,7 @@ install_ARCH() {
    INFO "Forced OpenColorIO building, as requested..."
    compile_OCIO
  else
-    check_package_version_ge_lt_ARCH opencolorio $OCIO_VERSION_MIN $OCIO_VERSION_MEX
+    check_package_version_ge_lt_ARCH opencolorio $OCIO_VERSION_MIN $OCIO_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_ARCH opencolorio
      clean_OCIO
@@ -5313,7 +5304,7 @@ install_ARCH() {
    INFO "Forced ILMBase/OpenEXR building, as requested..."
    compile_OPENEXR
  else
-    check_package_version_ge_lt_ARCH openexr $OPENEXR_VERSION_MIN $OPENEXR_VERSION_MEX
+    check_package_version_ge_lt_ARCH openexr $OPENEXR_VERSION_MIN $OPENEXR_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_ARCH openexr
      OPENEXR_VERSION=`get_package_version_ARCH openexr`
@@ -5332,7 +5323,7 @@ install_ARCH() {
    INFO "Forced OpenImageIO building, as requested..."
    compile_OIIO
  else
-    check_package_version_ge_lt_ARCH openimageio $OIIO_VERSION_MIN $OIIO_VERSION_MEX
+    check_package_version_ge_lt_ARCH openimageio $OIIO_VERSION_MIN $OIIO_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_ARCH openimageio
      clean_OIIO
@@ -5352,7 +5343,7 @@ install_ARCH() {
    INFO "Forced LLVM building, as requested..."
    _do_compile_llvm=true
  else
-    check_package_version_ge_lt_ARCH llvm $LLVM_VERSION_MIN $LLVM_VERSION_MEX
+    check_package_version_ge_lt_ARCH llvm $LLVM_VERSION_MIN $LLVM_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_ARCH llvm clang
      have_llvm=true
@@ -5383,7 +5374,7 @@ install_ARCH() {
    INFO "Forced OpenShadingLanguage building, as requested..."
    _do_compile_osl=true
  else
-    check_package_version_ge_lt_ARCH openshadinglanguage $OSL_VERSION_MIN $OSL_VERSION_MEX
+    check_package_version_ge_lt_ARCH openshadinglanguage $OSL_VERSION_MIN $OSL_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_ARCH openshadinglanguage
      clean_OSL
@@ -5409,7 +5400,7 @@ install_ARCH() {
    INFO "Forced OpenSubdiv building, as requested..."
    compile_OSD
  else
-    check_package_version_ge_lt_ARCH opensubdiv $OSD_VERSION_MIN $OSD_VERSION_MEX
+    check_package_version_ge_lt_ARCH opensubdiv $OSD_VERSION_MIN $OSD_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_ARCH opensubdiv
      clean_OSD
@@ -5426,7 +5417,7 @@ install_ARCH() {
    INFO "Forced OpenVDB building, as requested..."
    compile_OPENVDB
  else
-    check_package_version_ge_lt_ARCH openvdb $OPENVDB_VERSION_MIN $OPENVDB_VERSION_MEX
+    check_package_version_ge_lt_ARCH openvdb $OPENVDB_VERSION_MIN $OPENVDB_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_ARCH openvdb
      clean_OPENVDB
@@ -5492,7 +5483,7 @@ install_ARCH() {
      _do_compile_embree=true
    else
      # There is a package, but it does not provide everything that Blender needs...
-      #~ check_package_version_ge_lt_ARCH embree $EMBREE_VERSION_MIN $EMBREE_VERSION_MEX
+      #~ check_package_version_ge_lt_ARCH embree $EMBREE_VERSION_MIN $EMBREE_VERSION_MAX
      #~ if [ $? -eq 0 ]; then
        #~ install_packages_ARCH embree
        #~ clean_Embree
@@ -5531,7 +5522,7 @@ install_ARCH() {
    INFO "Forced FFMpeg building, as requested..."
    compile_FFmpeg
  else
-    check_package_version_ge_lt_ARCH ffmpeg $FFMPEG_VERSION_MIN $FFMPEG_VERSION_MEX
+    check_package_version_ge_lt_ARCH ffmpeg $FFMPEG_VERSION_MIN $FFMPEG_VERSION_MAX
    if [ $? -eq 0 ]; then
      install_packages_ARCH ffmpeg
      clean_FFmpeg
@@ -5721,6 +5712,76 @@ install_OTHER() {
 # ----------------------------------------------------------------------------
 # Printing User Info

+print_info_ffmpeglink_DEB() {
+  dpkg -L $_packages | grep -e ".*\/lib[^\/]\+\.so" | gawk '{ printf(nlines ? "'"$_ffmpeg_list_sep"'%s" : "%s", gensub(/.*lib([^\/]+)\.so/, "\\1", "g", $0)); nlines++ }'
+}
+
+print_info_ffmpeglink_RPM() {
+  rpm -ql $_packages | grep -e ".*\/lib[^\/]\+\.so" | gawk '{ printf(nlines ? "'"$_ffmpeg_list_sep"'%s" : "%s", gensub(/.*lib([^\/]+)\.so/, "\\1", "g", $0)); nlines++ }'
+}
+
+print_info_ffmpeglink_ARCH() {
+  pacman -Ql $_packages | grep -e ".*\/lib[^\/]\+\.so$" | gawk '{ printf(nlines ? "'"$_ffmpeg_list_sep"'%s" : "%s", gensub(/.*lib([^\/]+)\.so/, "\\1", "g", $0)); nlines++ }'
+}
+
+print_info_ffmpeglink() {
+  # This func must only print a ';'-separated list of libs...
+  if [ -z "$DISTRO" ]; then
+    ERROR "Failed to detect distribution type"
+    exit 1
+  fi
+
+  # Create list of packages from which to get libs names...
+  _packages=""
+
+  if [ "$THEORA_USE" = true ]; then
+    _packages="$_packages $THEORA_DEV"
+  fi
+
+  if [ "$VORBIS_USE" = true ]; then
+    _packages="$_packages $VORBIS_DEV"
+  fi
+
+  if [ "$OGG_USE" = true ]; then
+    _packages="$_packages $OGG_DEV"
+  fi
+
+  if [ "$XVID_USE" = true ]; then
+    _packages="$_packages $XVID_DEV"
+  fi
+
+  if [ "$VPX_USE" = true ]; then
+    _packages="$_packages $VPX_DEV"
+  fi
+
+  if [ "$OPUS_USE" = true ]; then
+    _packages="$_packages $OPUS_DEV"
+  fi
+
+  if [ "$MP3LAME_USE" = true ]; then
+    _packages="$_packages $MP3LAME_DEV"
+  fi
+
+  if [ "$X264_USE" = true ]; then
+    _packages="$_packages $X264_DEV"
+  fi
+
+  if [ "$OPENJPEG_USE" = true ]; then
+    _packages="$_packages $OPENJPEG_DEV"
+  fi
+
+  if [ "$DISTRO" = "DEB" ]; then
+    print_info_ffmpeglink_DEB
+  elif [ "$DISTRO" = "RPM" ]; then
+    print_info_ffmpeglink_RPM
+  elif [ "$DISTRO" = "ARCH" ]; then
+    print_info_ffmpeglink_ARCH
+  # XXX TODO!
+  else
+    PRINT "<Could not determine additional link libraries needed for ffmpeg, replace this by valid list of libs...>"
+  fi
+}
+
 print_info() {
  PRINT ""
  PRINT ""
@@ -5731,7 +5792,7 @@ print_info() {
  PRINT "If you're using CMake add this to your configuration flags:"

  _buildargs="-U *SNDFILE* -U PYTHON* -U *BOOST* -U *Boost* -U *TBB*"
-  _buildargs="$_buildargs -U *OPENCOLORIO* -U *OPENEXR* -U *OPENIMAGEIO* -U *LLVM* -U *CLANG* -U *CYCLES*"
+  _buildargs="$_buildargs -U *OPENCOLORIO* -U *OPENEXR* -U *OPENIMAGEIO* -U *LLVM* -U *CYCLES*"
  _buildargs="$_buildargs -U *OPENSUBDIV* -U *OPENVDB*  -U *BLOSC* -U *COLLADA* -U *FFMPEG* -U *ALEMBIC* -U *USD*"
  _buildargs="$_buildargs -U *EMBREE* -U *OPENIMAGEDENOISE* -U *OPENXR*"

@@ -5932,10 +5993,12 @@ print_info() {

  if [ "$FFMPEG_SKIP" = false ]; then
    _1="-D WITH_CODEC_FFMPEG=ON"
+    _2="-D FFMPEG_LIBRARIES='avformat;avcodec;avutil;avdevice;swscale;swresample;lzma;rt;`print_info_ffmpeglink`'"
    PRINT "  $_1"
-    _buildargs="$_buildargs $_1"
+    PRINT "  $_2"
+    _buildargs="$_buildargs $_1 $_2"
    if [ -d $INST/ffmpeg ]; then
-      _1="-D FFMPEG_ROOT_DIR=$INST/ffmpeg"
+      _1="-D FFMPEG=$INST/ffmpeg"
      PRINT "  $_1"
      _buildargs="$_buildargs $_1"
    fi
--- a/build_files/build_environment/patches/ffmpeg.diff
+++ b/build_files/build_environment/patches/ffmpeg.diff
@@ -70,18 +70,16 @@
 }
 --- a/libavcodec/rl.c
 +++ b/libavcodec/rl.c
-@@ -71,17 +71,19 @@
+@@ -71,7 +71,7 @@ av_cold void ff_rl_init(RLTable *rl,
 av_cold void ff_rl_init_vlc(RLTable *rl, unsigned static_size)
 {
     int i, q;
 -    VLC_TYPE table[1500][2] = {{0}};
 +    VLC_TYPE (*table)[2] = av_calloc(sizeof(VLC_TYPE), 1500 * 2);
     VLC vlc = { .table = table, .table_allocated = static_size };
-    av_assert0(static_size <= FF_ARRAY_ELEMS(table));
-+    av_assert0(static_size < 1500);
+     av_assert0(static_size <= FF_ARRAY_ELEMS(table));
     init_vlc(&vlc, 9, rl->n + 1, &rl->table_vlc[0][1], 4, 2, &rl->table_vlc[0][0], 4, 2, INIT_VLC_USE_NEW_STATIC);
- 
-     for (q = 0; q < 32; q++) {
+@@ -80,8 +80,10 @@ av_cold void ff_rl_init_vlc(RLTable *rl, unsigned static_size)
         int qmul = q * 2;
         int qadd = (q - 1) | 1;
 
@@ -93,7 +91,7 @@
 
         if (q == 0) {
             qmul = 1;
-@@ -113,4 +115,5 @@
+@@ -113,4 +115,5 @@ av_cold void ff_rl_init_vlc(RLTable *rl, unsigned static_size)
             rl->rl_vlc[q][i].run   = run;
         }
     }
--- a/build_files/build_environment/patches/nanovdb.diff
+++ b/build_files/build_environment/patches/nanovdb.diff
@@ -1,374 +0,0 @@
-Index: nanovdb/nanovdb/NanoVDB.h
-===================================================================
--- a/nanovdb/nanovdb/NanoVDB.h	(revision 62751)
-+++ b/nanovdb/nanovdb/NanoVDB.h	(working copy)
-@@ -152,8 +152,8 @@
- 
- #endif // __CUDACC_RTC__
- 
-#ifdef __CUDACC__
-// 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__
-@@ -461,7 +461,7 @@
- /// Maximum floating-point values
- template<typename T>
- struct Maximum;
-#ifdef __CUDA_ARCH__
-+#if defined(__CUDA_ARCH__) || defined(__HIP__)
- template<>
- struct Maximum<int>
- {
-@@ -1006,10 +1006,10 @@
- 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])); }
-+inline __hostdev__ 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])); }
-+inline __hostdev__ Vec3d Coord::asVec3d() const { return Vec3d(double(mVec[0]), double(mVec[1]), double(mVec[2])); }
- 
- // ----------------------------> Vec4 <--------------------------------------
- 
-@@ -1820,7 +1820,7 @@
- }; // 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;
-@@ -2170,7 +2170,7 @@
- }; // 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 = blindDataCount(); i < n; ++i)
-         if (blindMetaData(i).mSemantic == semantic)
-@@ -2328,7 +2328,7 @@
- }; // 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().valueMin();
-     max = this->root().valueMax();
-@@ -2336,7 +2336,7 @@
- 
- template<typename RootT>
- template<typename NodeT>
-const NodeT* Tree<RootT>::getNode(uint32_t i) const
-+__hostdev__ const NodeT* Tree<RootT>::getNode(uint32_t i) const
- {
-     static_assert(is_same<TreeNodeT<NodeT::LEVEL>, NodeT>::value, "Tree::getNode: unvalid node type");
-     NANOVDB_ASSERT(i < DataType::mCount[NodeT::LEVEL]);
-@@ -2345,7 +2345,7 @@
- 
- template<typename RootT>
- template<int LEVEL>
-const typename TreeNode<Tree<RootT>, LEVEL>::type* Tree<RootT>::getNode(uint32_t i) const
-+__hostdev__ const typename TreeNode<Tree<RootT>, LEVEL>::type* Tree<RootT>::getNode(uint32_t i) const
- {
-     NANOVDB_ASSERT(i < DataType::mCount[LEVEL]);
-     return reinterpret_cast<const TreeNodeT<LEVEL>*>(reinterpret_cast<const uint8_t*>(this) + DataType::mBytes[LEVEL]) + i;
-@@ -2353,7 +2353,7 @@
- 
- template<typename RootT>
- template<typename NodeT>
-NodeT* Tree<RootT>::getNode(uint32_t i)
-+__hostdev__ NodeT* Tree<RootT>::getNode(uint32_t i)
- {
-     static_assert(is_same<TreeNodeT<NodeT::LEVEL>, NodeT>::value, "Tree::getNode: invalid node type");
-     NANOVDB_ASSERT(i < DataType::mCount[NodeT::LEVEL]);
-@@ -2362,7 +2362,7 @@
- 
- template<typename RootT>
- template<int LEVEL>
-typename TreeNode<Tree<RootT>, LEVEL>::type* Tree<RootT>::getNode(uint32_t i)
-+__hostdev__ typename TreeNode<Tree<RootT>, LEVEL>::type* Tree<RootT>::getNode(uint32_t i)
- {
-     NANOVDB_ASSERT(i < DataType::mCount[LEVEL]);
-     return reinterpret_cast<TreeNodeT<LEVEL>*>(reinterpret_cast<uint8_t*>(this) + DataType::mBytes[LEVEL]) + i;
-@@ -2370,7 +2370,7 @@
- 
- template<typename RootT>
- template<typename NodeT>
-uint32_t Tree<RootT>::getNodeID(const NodeT& node) const
-+__hostdev__ uint32_t Tree<RootT>::getNodeID(const NodeT& node) const
- {
-     static_assert(is_same<TreeNodeT<NodeT::LEVEL>, NodeT>::value, "Tree::getNodeID: invalid node type");
-     const NodeT* first = reinterpret_cast<const NodeT*>(reinterpret_cast<const uint8_t*>(this) + DataType::mBytes[NodeT::LEVEL]);
-@@ -2380,7 +2380,7 @@
- 
- template<typename RootT>
- template<typename NodeT>
-uint32_t Tree<RootT>::getLinearOffset(const NodeT& node) const
-+__hostdev__ uint32_t Tree<RootT>::getLinearOffset(const NodeT& node) const
- {
-     return this->getNodeID(node) + DataType::mPFSum[NodeT::LEVEL];
- }
-@@ -3366,7 +3366,7 @@
- }; // LeafNode class
- 
- template<typename ValueT, typename CoordT, template<uint32_t> class MaskT, uint32_t LOG2DIM>
-inline void LeafNode<ValueT, CoordT, MaskT, LOG2DIM>::updateBBox()
-+inline __hostdev__ void LeafNode<ValueT, CoordT, MaskT, LOG2DIM>::updateBBox()
- {
-     static_assert(LOG2DIM == 3, "LeafNode::updateBBox: only supports LOGDIM = 3!");
-     if (!this->isActive()) return;
-Index: nanovdb/nanovdb/util/SampleFromVoxels.h
-===================================================================
--- a/nanovdb/nanovdb/util/SampleFromVoxels.h	(revision 62751)
-+++ b/nanovdb/nanovdb/util/SampleFromVoxels.h	(working copy)
-@@ -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 @@
- 
- 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 @@
- }
- 
- 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 @@
- 
- 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 @@
- }; // 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 @@
- 
- 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 @@
- 
- 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(std::is_floating_point<ValueT>::value, "TrilinearSampler::gradient requires a floating-point type");
- #if 0
-@@ -270,7 +270,7 @@
- }
- 
- 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(std::is_floating_point<ValueT>::value, "TrilinearSampler::zeroCrossing requires a floating-point type");
-     const bool less = v[0][0][0] < ValueT(0);
-@@ -363,7 +363,7 @@
- 
- 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);
-@@ -370,7 +370,7 @@
- }
- 
- 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);
- }
-@@ -377,7 +377,7 @@
- 
- 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 @@
- 
- 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 @@
- 
- 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 @@
- 
- 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 @@
- 
- template<typename TreeOrAccT>
- template<typename RealT, template<typename...> class Vec3T>
-inline Vec3T<typename TreeOrAccT::ValueType> SampleFromVoxels<TreeOrAccT, 1, false>::gradient(Vec3T<RealT> xyz) const
-+inline __hostdev__ 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 @@
- 
- 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 @@
- }; // 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 @@
- 
- 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 @@
- }
- 
- 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(std::is_floating_point<ValueT>::value, "TrilinearSampler::zeroCrossing requires a floating-point type");
-     const bool less = v[0][0][0] < ValueT(0);
-@@ -624,7 +624,7 @@
- 
- 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);
-@@ -631,7 +631,7 @@
- }
- 
- 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 @@
- 
- 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 @@
- 
- 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 @@
- 
- 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 @@
- }; // 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 @@
- 
- 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 @@
- 
- 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) {
--- a/build_files/build_environment/patches/numpy.diff
+++ b/build_files/build_environment/patches/numpy.diff
@@ -0,0 +1,27 @@
+diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
+index ba2b1f4..b10f7df 100644
+--- a/numpy/distutils/system_info.py
+++ b/numpy/distutils/system_info.py
+@@ -2164,8 +2164,8 @@ class accelerate_info(system_info):
+                     'accelerate' in libraries):
+                 if intel:
+                     args.extend(['-msse3'])
+-                else:
+-                    args.extend(['-faltivec'])
+#                else:
+#                    args.extend(['-faltivec'])
+                 args.extend([
+                     '-I/System/Library/Frameworks/vecLib.framework/Headers'])
+                 link_args.extend(['-Wl,-framework', '-Wl,Accelerate'])
+@@ -2174,8 +2174,8 @@ class accelerate_info(system_info):
+                       'veclib' in libraries):
+                 if intel:
+                     args.extend(['-msse3'])
+-                else:
+-                    args.extend(['-faltivec'])
+#                else:
+#                    args.extend(['-faltivec'])
+                 args.extend([
+                     '-I/System/Library/Frameworks/vecLib.framework/Headers'])
+                 link_args.extend(['-Wl,-framework', '-Wl,vecLib'])
+
--- a/build_files/build_environment/patches/usd.diff
+++ b/build_files/build_environment/patches/usd.diff
@@ -197,38 +197,3 @@ index 67ec0d15f..6dc3e85a0 100644
 #else
 #error Unknown architecture.
 #endif
-
-diff --git a/pxr/base/arch/demangle.cpp b/pxr/base/arch/demangle.cpp
-index 67ec0d15f..6dc3e85a0 100644
--- a/pxr/base/arch/demangle.cpp
-+++ b/pxr/base/arch/demangle.cpp
-@@ -36,6 +36,7 @@
- #if (ARCH_COMPILER_GCC_MAJOR == 3 && ARCH_COMPILER_GCC_MINOR >= 1) || \
-     ARCH_COMPILER_GCC_MAJOR > 3 || defined(ARCH_COMPILER_CLANG)
- #define _AT_LEAST_GCC_THREE_ONE_OR_CLANG
-+#include <cxxabi.h>
- #endif
- 
- PXR_NAMESPACE_OPEN_SCOPE
-@@ -138,7 +139,6 @@
- #endif
- 
- #if defined(_AT_LEAST_GCC_THREE_ONE_OR_CLANG)
-#include <cxxabi.h>
- 
- /*
-  * This routine doesn't work when you get to gcc3.4.
-
-diff --git a/pxr/base/work/singularTask.h b/pxr/base/work/singularTask.h
-index 67ec0d15f..6dc3e85a0 100644
--- a/pxr/base/work/singularTask.h
-+++ 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));
-                 });
--- a/build_files/build_environment/windows/build_deps.cmd
+++ b/build_files/build_environment/windows/build_deps.cmd
@@ -1,14 +1,21 @@
@echo off
 if NOT "%1" == "" (
-	if "%1" == "2017" (
-    echo "Building for VS2017"
-    set VSVER=15.0
-    set VSVER_SHORT=15
-    set BuildDir=VS15
+	if "%1" == "2013" (
+    echo "Building for VS2013"
+    set VSVER=12.0
+    set VSVER_SHORT=12
+    set BuildDir=VS12
    goto par2
  )
-	if "%1" == "2019" (
-    echo "Building for VS2019"
+	if "%1" == "2015" (
+    echo "Building for VS2015"
+    set VSVER=14.0
+    set VSVER_SHORT=14
+    set BuildDir=VS14
+    goto par2
+  )
+	if "%1" == "2017" (
+    echo "Building for VS2017"
    set VSVER=15.0
    set VSVER_SHORT=15
    set BuildDir=VS15
@@ -18,22 +25,40 @@ if NOT "%1" == "" (
 )
 :usage

-Echo Usage build_deps 2017/2019 x64
+Echo Usage build_deps 2013/2015/2017 x64/x86
 goto exit
 :par2
 if NOT "%2" == "" (
+	if "%2" == "x86" (
+    echo "Building for x86"
+    set HARVESTROOT=Windows_vc
+    set ARCH=86
+		if "%1" == "2013" (
+			set CMAKE_BUILDER=Visual Studio 12 2013
+		)
+		if "%1" == "2015" (
+			set CMAKE_BUILDER=Visual Studio 14 2015
+		)
+		if "%1" == "2017" (
+			set CMAKE_BUILDER=Visual Studio 15 2017
+		)
+		
+    goto start
+  )
 	if "%2" == "x64" (
    echo "Building for x64"
    set HARVESTROOT=Win64_vc
    set ARCH=64
-		if "%1" == "2019" (
-			set CMAKE_BUILDER=Visual Studio 16 2019
-			set CMAKE_BUILD_ARCH=-A x64
+		if "%1" == "2013" (
+			set CMAKE_BUILDER=Visual Studio 12 2013 Win64
+		)
+		if "%1" == "2015" (
+			set CMAKE_BUILDER=Visual Studio 14 2015 Win64
 		)
 		if "%1" == "2017" (
 			set CMAKE_BUILDER=Visual Studio 15 2017 Win64
-            set CMAKE_BUILD_ARCH=
 		)
+		
    goto start
  )
 )
@@ -54,9 +79,6 @@ set STAGING=%BUILD_DIR%\S
 rem for python module build
 set MSSdk=1 
 set DISTUTILS_USE_SDK=1  
-rem if you let pip pick its own build dirs, it'll stick it somewhere deep inside the user profile
-rem and cython will refuse to link due to a path that gets too long.
-set TMPDIR=c:\t\
 rem for python externals source to be shared between the various archs and compilers
 mkdir %BUILD_DIR%\downloads\externals

@@ -95,7 +117,7 @@ set path=%BUILD_DIR%\downloads\mingw\mingw64\msys\1.0\bin\;%BUILD_DIR%\downloads
 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%/
+cmake -G "%CMAKE_BUILDER%" -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 /m "ll.vcxproj" /p:Configuration=Release /fl /flp:logfile=BlenderDeps_llvm.log;Verbosity=normal
@@ -108,7 +130,7 @@ if "%NODEBUG%" == "1" goto exit
 cd %BUILD_DIR%
 mkdir %STAGING%\%BuildDir%%ARCH%D
 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%
+cmake -G "%CMAKE_BUILDER%" -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 /m "ll.vcxproj" /p:Configuration=Debug /fl /flp:logfile=BlenderDeps_llvm.log;;Verbosity=normal 
--- a/build_files/cmake/Modules/FindBrotli.cmake
+++ b/build_files/cmake/Modules/FindBrotli.cmake
@@ -1,83 +0,0 @@
-# - Find Brotli library (compression for freetype/woff2).
-# This module defines
-#  BROTLI_INCLUDE_DIRS, where to find Brotli headers, Set when
-#                       BROTLI_INCLUDE_DIR is found.
-#  BROTLI_LIBRARIES, libraries to link against to use Brotli.
-#  BROTLI_ROOT_DIR, The base directory to search for Brotli.
-#                   This can also be an environment variable.
-#  BROTLI_FOUND, If false, do not try to use Brotli.
-#
-
-#=============================================================================
-# Copyright 2022 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
-#=============================================================================
-
-# If BROTLI_ROOT_DIR was defined in the environment, use it.
-IF(NOT BROTLI_ROOT_DIR AND NOT $ENV{BROTLI_ROOT_DIR} STREQUAL "")
-  SET(BROTLI_ROOT_DIR $ENV{BROTLI_ROOT_DIR})
-ENDIF()
-
-SET(_BROTLI_SEARCH_DIRS
-  ${BROTLI_ROOT_DIR}
-)
-
-FIND_PATH(BROTLI_INCLUDE_DIR
-  NAMES
-    brotli/decode.h
-  HINTS
-    ${_BROTLI_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-  DOC "Brotli header files"
-)
-
-FIND_LIBRARY(BROTLI_LIBRARY_COMMON
-  NAMES
-    # Some builds use a special `-static` postfix in their static libraries names.
-    brotlicommon-static
-    brotlicommon
-  HINTS
-    ${_BROTLI_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib lib/static
-  DOC "Brotli static common library"
-)
-FIND_LIBRARY(BROTLI_LIBRARY_DEC
-  NAMES
-    # Some builds use a special `-static` postfix in their static libraries names.
-    brotlidec-static
-    brotlidec
-  HINTS
-    ${_BROTLI_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib lib/static
-  DOC "Brotli static decode library"
-)
-
-
-IF(${BROTLI_LIBRARY_COMMON_NOTFOUND} or ${BROTLI_LIBRARY_DEC_NOTFOUND})
-  set(BROTLI_FOUND FALSE)
-ELSE()
-  # handle the QUIETLY and REQUIRED arguments and set BROTLI_FOUND to TRUE if
-  # all listed variables are TRUE
-  INCLUDE(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Brotli DEFAULT_MSG BROTLI_LIBRARY_COMMON BROTLI_LIBRARY_DEC BROTLI_INCLUDE_DIR)
-
-  IF(BROTLI_FOUND)
-    get_filename_component(BROTLI_LIBRARY_DIR ${BROTLI_LIBRARY_COMMON} DIRECTORY)
-    SET(BROTLI_INCLUDE_DIRS ${BROTLI_INCLUDE_DIR})
-    SET(BROTLI_LIBRARIES ${BROTLI_LIBRARY_DEC} ${BROTLI_LIBRARY_COMMON})
-  ENDIF()
-ENDIF()
-
-MARK_AS_ADVANCED(
-  BROTLI_INCLUDE_DIR
-  BROTLI_LIBRARY_COMMON
-  BROTLI_LIBRARY_DEC
-  BROTLI_LIBRARY_DIR
-)
-
-UNSET(_BROTLI_SEARCH_DIRS)
--- a/build_files/cmake/Modules/FindFFmpeg.cmake
+++ b/build_files/cmake/Modules/FindFFmpeg.cmake
@@ -33,8 +33,6 @@ if(NOT FFMPEG_FIND_COMPONENTS)
    avfilter
    avformat
    avutil
-    swscale
-    swresample
  )
 endif()

@@ -52,9 +50,9 @@ foreach(_component ${FFMPEG_FIND_COMPONENTS})
  string(TOUPPER ${_component} _upper_COMPONENT)
  find_library(FFMPEG_${_upper_COMPONENT}_LIBRARY
    NAMES
-      ${_component}
+      ${_upper_COMPONENT}
    HINTS
-      ${_ffmpeg_SEARCH_DIRS}
+      ${LIBDIR}/ffmpeg
    PATH_SUFFIXES
      lib64 lib
  )
--- a/build_files/cmake/Modules/FindHIP.cmake
+++ b/build_files/cmake/Modules/FindHIP.cmake
@@ -1,81 +0,0 @@
-# - Find HIP compiler
-#
-# This module defines
-#  HIP_HIPCC_EXECUTABLE, the full path to the hipcc executable
-#  HIP_VERSION, the HIP compiler version
-#
-#  HIP_FOUND, if the HIP toolkit is found.
-
-#=============================================================================
-# Copyright 2021 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
-#=============================================================================
-
-# If HIP_ROOT_DIR was defined in the environment, use it.
-if(NOT HIP_ROOT_DIR AND NOT $ENV{HIP_ROOT_DIR} STREQUAL "")
-  set(HIP_ROOT_DIR $ENV{HIP_ROOT_DIR})
-endif()
-
-set(_hip_SEARCH_DIRS
-  ${HIP_ROOT_DIR}
-)
-
-find_program(HIP_HIPCC_EXECUTABLE
-  NAMES
-    hipcc
-  HINTS
-    ${_hip_SEARCH_DIRS}
-  PATH_SUFFIXES
-    bin
-)
-
-if(HIP_HIPCC_EXECUTABLE AND NOT EXISTS ${HIP_HIPCC_EXECUTABLE})
-  message(WARNING "Cached or directly specified hipcc executable does not exist.")
-  set(HIP_FOUND FALSE)
-elseif(HIP_HIPCC_EXECUTABLE)
-  set(HIP_FOUND TRUE)
-
-  set(HIP_VERSION_MAJOR 0)
-  set(HIP_VERSION_MINOR 0)
-  set(HIP_VERSION_PATCH 0)
-
-  # Get version from the output.
-  execute_process(COMMAND ${HIP_HIPCC_EXECUTABLE} --version
-                  OUTPUT_VARIABLE HIP_VERSION_RAW
-                  ERROR_QUIET
-                  OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-  # Parse parts.
-  if(HIP_VERSION_RAW MATCHES "HIP version: .*")
-    # Strip the HIP prefix and get list of individual version components.
-    string(REGEX REPLACE
-           ".*HIP version: ([.0-9]+).*" "\\1"
-           HIP_SEMANTIC_VERSION "${HIP_VERSION_RAW}")
-    string(REPLACE "." ";" HIP_VERSION_PARTS "${HIP_SEMANTIC_VERSION}")
-    list(LENGTH HIP_VERSION_PARTS NUM_HIP_VERSION_PARTS)
-
-    # Extract components into corresponding variables.
-    if(NUM_HIP_VERSION_PARTS GREATER 0)
-      list(GET HIP_VERSION_PARTS 0 HIP_VERSION_MAJOR)
-    endif()
-    if(NUM_HIP_VERSION_PARTS GREATER 1)
-      list(GET HIP_VERSION_PARTS 1 HIP_VERSION_MINOR)
-    endif()
-    if(NUM_HIP_VERSION_PARTS GREATER 2)
-      list(GET HIP_VERSION_PARTS 2 HIP_VERSION_PATCH)
-    endif()
-
-    # Unset temp variables.
-    unset(NUM_HIP_VERSION_PARTS)
-    unset(HIP_SEMANTIC_VERSION)
-    unset(HIP_VERSION_PARTS)
-  endif()
-
-  # Construct full semantic version.
-  set(HIP_VERSION "${HIP_VERSION_MAJOR}.${HIP_VERSION_MINOR}.${HIP_VERSION_PATCH}")
-  unset(HIP_VERSION_RAW)
-else()
-  set(HIP_FOUND FALSE)
-endif()
--- a/build_files/cmake/Modules/FindOptiX.cmake
+++ b/build_files/cmake/Modules/FindOptiX.cmake
@@ -21,7 +21,7 @@ ENDIF()

 SET(_optix_SEARCH_DIRS
  ${OPTIX_ROOT_DIR}
-  "$ENV{PROGRAMDATA}/NVIDIA Corporation/OptiX SDK 7.3.0"
+  "$ENV{PROGRAMDATA}/NVIDIA Corporation/OptiX SDK 7.0.0"
 )

 FIND_PATH(OPTIX_INCLUDE_DIR
@@ -33,23 +33,11 @@ FIND_PATH(OPTIX_INCLUDE_DIR
    include
 )

-IF(EXISTS "${OPTIX_INCLUDE_DIR}/optix.h")
-  FILE(STRINGS "${OPTIX_INCLUDE_DIR}/optix.h" _optix_version REGEX "^#define OPTIX_VERSION[ \t].*$")
-  STRING(REGEX MATCHALL "[0-9]+" _optix_version ${_optix_version})
-
-  MATH(EXPR _optix_version_major "${_optix_version} / 10000")
-  MATH(EXPR _optix_version_minor "(${_optix_version} % 10000) / 100")
-  MATH(EXPR _optix_version_patch "${_optix_version} % 100")
-
-  SET(OPTIX_VERSION "${_optix_version_major}.${_optix_version_minor}.${_optix_version_patch}")
-ENDIF()
-
 # handle the QUIETLY and REQUIRED arguments and set OPTIX_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OptiX
-    REQUIRED_VARS OPTIX_INCLUDE_DIR
-    VERSION_VAR OPTIX_VERSION)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OptiX DEFAULT_MSG
+    OPTIX_INCLUDE_DIR)

 IF(OPTIX_FOUND)
  SET(OPTIX_INCLUDE_DIRS ${OPTIX_INCLUDE_DIR})
@@ -57,7 +45,6 @@ ENDIF()

 MARK_AS_ADVANCED(
  OPTIX_INCLUDE_DIR
-  OPTIX_VERSION
 )

 UNSET(_optix_SEARCH_DIRS)
--- a/build_files/cmake/clang_array_check.py
+++ b/build_files/cmake/clang_array_check.py
@@ -168,7 +168,7 @@ def function_parm_wash_tokens(parm):
    # if tokens[-1].kind == To
    # remove trailing char
    if tokens[-1].kind == TokenKind.PUNCTUATION:
-        if tokens[-1].spelling in {",", ")", ";"}:
+        if tokens[-1].spelling in (",", ")", ";"):
            tokens.pop()
        # else:
        #     print(tokens[-1].spelling)
@@ -179,7 +179,7 @@ def function_parm_wash_tokens(parm):
        t_spelling = t.spelling
        ok = True
        if t_kind == TokenKind.KEYWORD:
-            if t_spelling in {"const", "restrict", "volatile"}:
+            if t_spelling in ("const", "restrict", "volatile"):
                ok = False
            elif t_spelling.startswith("__"):
                ok = False  # __restrict
--- a/build_files/cmake/cmake_consistency_check.py
+++ b/build_files/cmake/cmake_consistency_check.py
@@ -114,7 +114,7 @@ def is_c_header(filename: str) -> bool:

 def is_c(filename: str) -> bool:
    ext = splitext(filename)[1]
-    return (ext in {".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl", ".metal"})
+    return (ext in {".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"})


 def is_c_any(filename: str) -> bool:
--- a/build_files/cmake/cmake_netbeans_project.py
+++ b/build_files/cmake/cmake_netbeans_project.py
@@ -180,7 +180,7 @@ def create_nb_project_main():
        f.write('    </logicalFolder>\n')

        f.write('  </logicalFolder>\n')
-        # default, but this dir is in fact not in blender dir so we can ignore it
+        # default, but this dir is infact not in blender dir so we can ignore it
        # f.write('  <sourceFolderFilter>^(nbproject)$</sourceFolderFilter>\n')
        f.write(r'  <sourceFolderFilter>^(nbproject|__pycache__|.*\.py|.*\.html|.*\.blend)$</sourceFolderFilter>\n')

--- a/build_files/cmake/cmake_static_check_cppcheck.py
+++ b/build_files/cmake/cmake_static_check_cppcheck.py
@@ -24,7 +24,6 @@ import project_source_info
 import subprocess
 import sys
 import os
-import tempfile

 from typing import (
    Any,
@@ -36,6 +35,7 @@ USE_QUIET = (os.environ.get("QUIET", None) is not None)

 CHECKER_IGNORE_PREFIX = [
    "extern",
+    "intern/moto",
 ]

 CHECKER_BIN = "cppcheck"
@@ -47,19 +47,13 @@ CHECKER_ARGS = [
    "--max-configs=1",  # speeds up execution
    #  "--check-config", # when includes are missing
    "--enable=all",  # if you want sixty hundred pedantic suggestions
-
-    # Quiet output, otherwise all defines/includes are printed (overly verbose).
-    # Only enable this for troubleshooting (if defines are not set as expected for example).
-    "--quiet",
-
-    # NOTE: `--cppcheck-build-dir=<dir>` is added later as a temporary directory.
 ]

 if USE_QUIET:
    CHECKER_ARGS.append("--quiet")


-def cppcheck() -> None:
+def main() -> None:
    source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
    source_defines = project_source_info.build_defines_as_args()

@@ -84,10 +78,7 @@ def cppcheck() -> None:
            percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"

            sys.stdout.flush()
-            sys.stdout.write("%s %s\n" % (
-                percent_str,
-                os.path.relpath(c, project_source_info.SOURCE_DIR)
-            ))
+            sys.stdout.write("%s " % percent_str)

        return subprocess.Popen(cmd)

@@ -99,11 +90,5 @@ def cppcheck() -> None:
    print("Finished!")


-def main() -> None:
-    with tempfile.TemporaryDirectory() as temp_dir:
-        CHECKER_ARGS.append("--cppcheck-build-dir=" + temp_dir)
-        cppcheck()
-
-
 if __name__ == "__main__":
    main()
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@ -9,7 +9,6 @@ set(WITH_INSTALL_PORTABLE    ON  CACHE BOOL "" FORCE)

 set(WITH_ALEMBIC             OFF CACHE BOOL "" FORCE)
 set(WITH_AUDASPACE           OFF CACHE BOOL "" FORCE)
-set(WITH_BLENDER_THUMBNAILER OFF CACHE BOOL "" FORCE)
 set(WITH_BOOST               OFF CACHE BOOL "" FORCE)
 set(WITH_BUILDINFO           OFF CACHE BOOL "" FORCE)
 set(WITH_BULLET              OFF CACHE BOOL "" FORCE)
@@ -19,6 +18,9 @@ set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
 set(WITH_COMPOSITOR          OFF CACHE BOOL "" FORCE)
 set(WITH_COREAUDIO           OFF CACHE BOOL "" FORCE)
 set(WITH_CYCLES              OFF CACHE BOOL "" FORCE)
+set(WITH_CYCLES_DEVICE_OPTIX OFF CACHE BOOL "" FORCE)
+set(WITH_CYCLES_EMBREE       OFF CACHE BOOL "" FORCE)
+set(WITH_CYCLES_OSL          OFF CACHE BOOL "" FORCE)
 set(WITH_DRACO               OFF CACHE BOOL "" FORCE)
 set(WITH_FFTW3               OFF CACHE BOOL "" FORCE)
 set(WITH_FREESTYLE           OFF CACHE BOOL "" FORCE)
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -61,7 +61,6 @@ set(WITH_MEM_JEMALLOC          ON  CACHE BOOL "" FORCE)
 # platform dependent options
 if(APPLE)
  set(WITH_COREAUDIO           ON  CACHE BOOL "" FORCE)
-  set(WITH_CYCLES_DEVICE_METAL ON  CACHE BOOL "" FORCE)
 endif()
 if(NOT WIN32)
  set(WITH_JACK                ON  CACHE BOOL "" FORCE)
@@ -82,5 +81,4 @@ if(NOT APPLE)
  set(WITH_CYCLES_DEVICE_OPTIX    ON  CACHE BOOL "" FORCE)
  set(WITH_CYCLES_CUDA_BINARIES   ON  CACHE BOOL "" FORCE)
  set(WITH_CYCLES_CUBIN_COMPILER  OFF CACHE BOOL "" FORCE)
-  set(WITH_CYCLES_HIP_BINARIES    ON  CACHE BOOL "" FORCE)
 endif()
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -488,6 +488,7 @@ function(blender_add_test_executable

  include_directories(${includes})
  include_directories(${includes_sys})
+  setup_libdirs()

  BLENDER_SRC_GTEST_EX(
    NAME ${name}
@@ -524,6 +525,83 @@ function(setup_heavy_lib_pool)
  endif()
 endfunction()

+function(SETUP_LIBDIRS)
+
+  # NOTE: For all new libraries, use absolute library paths.
+  # This should eventually be phased out.
+  # APPLE plaform uses full paths for linking libraries, and avoids link_directories.
+  if(NOT MSVC AND NOT APPLE)
+    link_directories(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH})
+
+    if(WITH_PYTHON)  #  AND NOT WITH_PYTHON_MODULE  # WIN32 needs
+      link_directories(${PYTHON_LIBPATH})
+    endif()
+    if(WITH_SDL AND NOT WITH_SDL_DYNLOAD)
+      link_directories(${SDL_LIBPATH})
+    endif()
+    if(WITH_CODEC_FFMPEG)
+      link_directories(${FFMPEG_LIBPATH})
+    endif()
+    if(WITH_IMAGE_OPENEXR)
+      link_directories(${OPENEXR_LIBPATH})
+    endif()
+    if(WITH_IMAGE_TIFF)
+      link_directories(${TIFF_LIBPATH})
+    endif()
+    if(WITH_BOOST)
+      link_directories(${BOOST_LIBPATH})
+    endif()
+    if(WITH_OPENIMAGEIO)
+      link_directories(${OPENIMAGEIO_LIBPATH})
+    endif()
+    if(WITH_OPENIMAGEDENOISE)
+      link_directories(${OPENIMAGEDENOISE_LIBPATH})
+    endif()
+    if(WITH_OPENCOLORIO)
+      link_directories(${OPENCOLORIO_LIBPATH})
+    endif()
+    if(WITH_OPENVDB)
+      link_directories(${OPENVDB_LIBPATH})
+    endif()
+    if(WITH_OPENAL)
+      link_directories(${OPENAL_LIBPATH})
+    endif()
+    if(WITH_JACK AND NOT WITH_JACK_DYNLOAD)
+      link_directories(${JACK_LIBPATH})
+    endif()
+    if(WITH_PULSEAUDIO AND NOT WITH_PULSEAUDIO_DYNLOAD)
+      link_directories(${LIBPULSE_LIBPATH})
+    endif()
+    if(WITH_CODEC_SNDFILE)
+      link_directories(${LIBSNDFILE_LIBPATH})
+    endif()
+    if(WITH_FFTW3)
+      link_directories(${FFTW3_LIBPATH})
+    endif()
+    if(WITH_OPENCOLLADA)
+      link_directories(${OPENCOLLADA_LIBPATH})
+      # # Never set
+      # link_directories(${PCRE_LIBPATH})
+      # link_directories(${EXPAT_LIBPATH})
+    endif()
+    if(WITH_LLVM)
+      link_directories(${LLVM_LIBPATH})
+    endif()
+
+    if(WITH_ALEMBIC)
+      link_directories(${ALEMBIC_LIBPATH})
+    endif()
+
+    if(WITH_GMP)
+      link_directories(${GMP_LIBPATH})
+    endif()
+
+    if(WIN32 AND NOT UNIX)
+      link_directories(${PTHREADS_LIBPATH})
+    endif()
+  endif()
+endfunction()
+
 # Platform specific linker flags for targets.
 function(setup_platform_linker_flags
  target)
@@ -1214,6 +1292,29 @@ macro(openmp_delayload
    endif()
 endmacro()

+macro(blender_precompile_headers target cpp header)
+  if(MSVC)
+    # get the name for the pch output file
+    get_filename_component(pchbase ${cpp} NAME_WE)
+    set(pchfinal "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${pchbase}.pch")
+
+    # mark the cpp as the one outputting the pch
+    set_property(SOURCE ${cpp} APPEND PROPERTY OBJECT_OUTPUTS "${pchfinal}")
+
+    # get all sources for the target
+    get_target_property(sources ${target} SOURCES)
+
+    # make all sources depend on the pch to enforce the build order
+    foreach(src ${sources})
+      set_property(SOURCE ${src} APPEND PROPERTY OBJECT_DEPENDS "${pchfinal}")
+    endforeach()
+
+    target_sources(${target} PRIVATE ${cpp} ${header})
+    set_target_properties(${target} PROPERTIES COMPILE_FLAGS "/Yu${header} /Fp${pchfinal} /FI${header}")
+    set_source_files_properties(${cpp} PROPERTIES COMPILE_FLAGS "/Yc${header} /Fp${pchfinal}")
+  endif()
+endmacro()
+
 macro(set_and_warn_dependency
  _dependency _setting _val)
  # when $_dependency is disabled, forces $_setting = $_val
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -166,18 +166,13 @@ if(WITH_FFTW3)
  find_package(Fftw3)
 endif()

-# FreeType compiled with Brotli compression for woff2.
 find_package(Freetype REQUIRED)
-list(APPEND FREETYPE_LIBRARIES
-  ${LIBDIR}/brotli/lib/libbrotlicommon-static.a
-  ${LIBDIR}/brotli/lib/libbrotlidec-static.a)

 if(WITH_IMAGE_OPENEXR)
  find_package(OpenEXR)
 endif()

 if(WITH_CODEC_FFMPEG)
-  set(FFMPEG_ROOT_DIR ${LIBDIR}/ffmpeg)
  set(FFMPEG_FIND_COMPONENTS
    avcodec avdevice avformat avutil
    mp3lame ogg opus swresample swscale
@@ -262,6 +257,9 @@ if(WITH_BOOST)
  if(WITH_INTERNATIONAL)
    list(APPEND _boost_FIND_COMPONENTS locale)
  endif()
+  if(WITH_CYCLES_NETWORK)
+    list(APPEND _boost_FIND_COMPONENTS serialization)
+  endif()
  if(WITH_OPENVDB)
    list(APPEND _boost_FIND_COMPONENTS iostreams)
  endif()
@@ -341,7 +339,7 @@ if(WITH_LLVM)

 endif()

-if(WITH_CYCLES AND WITH_CYCLES_OSL)
+if(WITH_CYCLES_OSL)
  set(CYCLES_OSL ${LIBDIR}/osl)

  find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
@@ -361,7 +359,7 @@ if(WITH_CYCLES AND WITH_CYCLES_OSL)
  endif()
 endif()

-if(WITH_CYCLES AND WITH_CYCLES_EMBREE)
+if(WITH_CYCLES_EMBREE)
  find_package(Embree 3.8.0 REQUIRED)
  # Increase stack size for Embree, only works for executables.
  if(NOT WITH_PYTHON_MODULE)
@@ -484,11 +482,8 @@ string(APPEND PLATFORM_LINKFLAGS " -stdlib=libc++")
 # Suppress ranlib "has no symbols" warnings (workaround for T48250)
 set(CMAKE_C_ARCHIVE_CREATE   "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
 set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
-# llvm-ranlib doesn't support this flag. Xcode's libtool does.
-if(NOT ${CMAKE_RANLIB} MATCHES ".*llvm-ranlib$")
-  set(CMAKE_C_ARCHIVE_FINISH   "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
-  set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
-endif()
+set(CMAKE_C_ARCHIVE_FINISH   "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
+set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")

 if(WITH_COMPILER_CCACHE)
  if(NOT CMAKE_GENERATOR STREQUAL "Xcode")
@@ -515,6 +510,3 @@ list(APPEND CMAKE_BUILD_RPATH "${OpenMP_LIBRARY_DIR}")

 set(CMAKE_SKIP_INSTALL_RPATH FALSE)
 list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../Resources/${BLENDER_VERSION}/lib")
-
-# Same as `CFBundleIdentifier` in Info.plist.
-set(CMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.blenderfoundation.blender")
--- a/build_files/cmake/platform/platform_apple_xcode.cmake
+++ b/build_files/cmake/platform/platform_apple_xcode.cmake
@@ -96,7 +96,7 @@ else()
    # Detect SDK version to use.
    if(NOT DEFINED OSX_SYSTEM)
      execute_process(
-          COMMAND xcrun --sdk macosx --show-sdk-version
+          COMMAND xcrun --show-sdk-version
          OUTPUT_VARIABLE OSX_SYSTEM
          OUTPUT_STRIP_TRAILING_WHITESPACE)
    endif()
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -18,7 +18,7 @@
 # All rights reserved.
 # ***** END GPL LICENSE BLOCK *****

-# Libraries configuration for any *nix system including Linux and Unix (excluding APPLE).
+# Libraries configuration for any *nix system including Linux and Unix.

 # Detect precompiled library directory
 if(NOT DEFINED LIBDIR)
@@ -48,9 +48,6 @@ if(NOT DEFINED LIBDIR)
  unset(LIBDIR_CENTOS7_ABI)
 endif()

-# Support restoring this value once pre-compiled libraries have been handled.
-set(WITH_STATIC_LIBS_INIT ${WITH_STATIC_LIBS})
-
 if(EXISTS ${LIBDIR})
  message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")

@@ -103,17 +100,7 @@ find_package_wrapper(JPEG REQUIRED)
 find_package_wrapper(PNG REQUIRED)
 find_package_wrapper(ZLIB REQUIRED)
 find_package_wrapper(Zstd REQUIRED)
-
-if(NOT WITH_SYSTEM_FREETYPE)
-  # FreeType compiled with Brotli compression for woff2.
-  find_package_wrapper(Freetype REQUIRED)
-  if(EXISTS ${LIBDIR})
-    find_package_wrapper(Brotli REQUIRED)
-    list(APPEND FREETYPE_LIBRARIES
-      ${BROTLI_LIBRARIES}
-    )
-  endif()
-endif()
+find_package_wrapper(Freetype REQUIRED)

 if(WITH_PYTHON)
  # No way to set py35, remove for now.
@@ -191,30 +178,26 @@ endif()

 if(WITH_CODEC_FFMPEG)
  if(EXISTS ${LIBDIR})
-    set(FFMPEG_ROOT_DIR ${LIBDIR}/ffmpeg)
-    # Override FFMPEG components to also include static library dependencies
-    # included with precompiled libraries, and to ensure correct link order.
-    set(FFMPEG_FIND_COMPONENTS
-      avformat avcodec avdevice avutil swresample swscale
-      sndfile
-      FLAC
-      mp3lame
-      opus
-      theora theoradec theoraenc
-      vorbis vorbisenc vorbisfile ogg
-      vpx
-      x264
-      xvidcore)
-  elseif(FFMPEG)
-    # Old cache variable used for root dir, convert to new standard.
-    set(FFMPEG_ROOT_DIR ${FFMPEG})
+    # For precompiled lib directory, all ffmpeg dependencies are in the same folder
+    file(GLOB ffmpeg_libs ${LIBDIR}/ffmpeg/lib/*.a ${LIBDIR}/sndfile/lib/*.a)
+    set(FFMPEG ${LIBDIR}/ffmpeg CACHE PATH "FFMPEG Directory")
+    set(FFMPEG_LIBRARIES ${ffmpeg_libs} ${ffmpeg_libs} CACHE STRING "FFMPEG Libraries")
+  else()
+    set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
+    set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
  endif()
-  find_package(FFmpeg)

-  if(NOT FFMPEG_FOUND)
-    set(WITH_CODEC_FFMPEG OFF)
-    message(STATUS "FFmpeg not found, disabling it")
+  mark_as_advanced(FFMPEG)
+
+  # lame, but until we have proper find module for ffmpeg
+  set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
+  if(EXISTS "${FFMPEG}/include/ffmpeg/")
+    list(APPEND FFMPEG_INCLUDE_DIRS "${FFMPEG}/include/ffmpeg")
  endif()
+  # end lameness
+
+  mark_as_advanced(FFMPEG_LIBRARIES)
+  set(FFMPEG_LIBPATH ${FFMPEG}/lib)
 endif()

 if(WITH_FFTW3)
@@ -258,7 +241,7 @@ if(WITH_INPUT_NDOF)
  endif()
 endif()

-if(WITH_CYCLES AND WITH_CYCLES_OSL)
+if(WITH_CYCLES_OSL)
  set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
  if(EXISTS ${CYCLES_OSL} AND NOT OSL_ROOT)
    set(OSL_ROOT ${CYCLES_OSL})
@@ -331,7 +314,7 @@ if(WITH_BOOST)
    endif()
    set(Boost_USE_MULTITHREADED ON)
    set(__boost_packages filesystem regex thread date_time)
-    if(WITH_CYCLES AND WITH_CYCLES_OSL)
+    if(WITH_CYCLES_OSL)
      if(NOT (${OSL_LIBRARY_VERSION_MAJOR} EQUAL "1" AND ${OSL_LIBRARY_VERSION_MINOR} LESS "6"))
        list(APPEND __boost_packages wave)
      else()
@@ -340,6 +323,9 @@ if(WITH_BOOST)
    if(WITH_INTERNATIONAL)
      list(APPEND __boost_packages locale)
    endif()
+    if(WITH_CYCLES_NETWORK)
+      list(APPEND __boost_packages serialization)
+    endif()
    if(WITH_OPENVDB)
      list(APPEND __boost_packages iostreams)
    endif()
@@ -417,7 +403,7 @@ if(WITH_OPENCOLORIO)
  endif()
 endif()

-if(WITH_CYCLES AND WITH_CYCLES_EMBREE)
+if(WITH_CYCLES_EMBREE)
  find_package(Embree 3.8.0 REQUIRED)
 endif()

@@ -549,21 +535,6 @@ add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
 #
 # Keep last, so indirectly linked libraries don't override our own pre-compiled libs.

-if(EXISTS ${LIBDIR})
-  # Clear the prefix path as it causes the `LIBDIR` to override system locations.
-  unset(CMAKE_PREFIX_PATH)
-
-  # Since the pre-compiled `LIBDIR` directories have been handled, don't prefer static libraries.
-  set(WITH_STATIC_LIBS ${WITH_STATIC_LIBS_INIT})
-endif()
-
-if(WITH_SYSTEM_FREETYPE)
-  find_package_wrapper(Freetype)
-  if(NOT FREETYPE_FOUND)
-    message(FATAL_ERROR "Failed finding system FreeType version!")
-  endif()
-endif()
-
 if(WITH_LZO AND WITH_SYSTEM_LZO)
  find_package_wrapper(LZO)
  if(NOT LZO_FOUND)
@@ -676,9 +647,6 @@ endif()
 # ----------------------------------------------------------------------------
 # Compilers

-# Only set the linker once.
-set(_IS_LINKER_DEFAULT ON)
-
 # GNU Compiler
 if(CMAKE_COMPILER_IS_GNUCC)
  # ffp-contract=off:
@@ -697,89 +665,26 @@ if(CMAKE_COMPILER_IS_GNUCC)
  string(PREPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO "${GCC_EXTRA_FLAGS_RELEASE} ")
  unset(GCC_EXTRA_FLAGS_RELEASE)

-  # NOTE(@campbellbarton): Eventually mold will be able to use `-fuse-ld=mold`,
-  # however at the moment this only works for GCC 12.1+ (unreleased at time of writing).
-  # So a workaround is used here "-B" which points to another path to find system commands
-  # such as `ld`.
-  if(WITH_LINKER_MOLD AND _IS_LINKER_DEFAULT)
-    find_program(MOLD_BIN "mold")
-    mark_as_advanced(MOLD_BIN)
-    if(NOT MOLD_BIN)
-      message(STATUS "The \"mold\" binary could not be found, using system linker.")
-      set(WITH_LINKER_MOLD OFF)
-    else()
-      # By default mold installs the binary to:
-      # - `{PREFIX}/bin/mold` as well as a symbolic-link in...
-      # - `{PREFIX}/lib/mold/ld`.
-      # (where `PREFIX` is typically `/usr/`).
-      #
-      # This block of code finds `{PREFIX}/lib/mold` from the `mold` binary.
-      # Other methods of searching for the path could also be made to work,
-      # we could even make our own directory and symbolic-link, however it's more
-      # convenient to use the one provided by mold.
-      #
-      # Use the binary path to "mold", to find the common prefix which contains "lib/mold".
-      # The parent directory: e.g. `/usr/bin/mold` -> `/usr/bin/`.
-      get_filename_component(MOLD_PREFIX "${MOLD_BIN}" DIRECTORY)
-      # The common prefix path: e.g. `/usr/bin/` -> `/usr/` to use as a hint.
-      get_filename_component(MOLD_PREFIX "${MOLD_PREFIX}" DIRECTORY)
-      # Find `{PREFIX}/lib/mold/ld`, store the directory component (without the `ld`).
-      # Then pass `-B {PREFIX}/lib/mold` to GCC so the `ld` located there overrides the default.
-      find_path(
-        MOLD_BIN_DIR "ld"
-        HINTS "${MOLD_PREFIX}"
-        # The default path is `libexec`, Arch Linux for e.g.
-        # replaces this with `lib` so check both.
-        PATH_SUFFIXES "libexec/mold" "lib/mold" "lib64/mold"
-        NO_DEFAULT_PATH
-        NO_CACHE
-      )
-      if(NOT MOLD_BIN_DIR)
-        message(STATUS
-          "The mold linker could not find the directory containing the linker command "
-          "(typically "
-          "\"${MOLD_PREFIX}/libexec/mold/ld\") or "
-          "\"${MOLD_PREFIX}/lib/mold/ld\") using system linker.")
-        set(WITH_LINKER_MOLD OFF)
-      endif()
-      unset(MOLD_PREFIX)
-    endif()
-
-    if(WITH_LINKER_MOLD)
-      # GCC will search for `ld` in this directory first.
-      string(APPEND CMAKE_EXE_LINKER_FLAGS    " -B \"${MOLD_BIN_DIR}\"")
-      string(APPEND CMAKE_SHARED_LINKER_FLAGS " -B \"${MOLD_BIN_DIR}\"")
-      string(APPEND CMAKE_MODULE_LINKER_FLAGS " -B \"${MOLD_BIN_DIR}\"")
-      set(_IS_LINKER_DEFAULT OFF)
-    endif()
-    unset(MOLD_BIN)
-    unset(MOLD_BIN_DIR)
-  endif()
-
-  if(WITH_LINKER_GOLD AND _IS_LINKER_DEFAULT)
+  if(WITH_LINKER_GOLD)
    execute_process(
      COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version
      ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
    if("${LD_VERSION}" MATCHES "GNU gold")
-      string(APPEND CMAKE_EXE_LINKER_FLAGS    " -fuse-ld=gold")
-      string(APPEND CMAKE_SHARED_LINKER_FLAGS " -fuse-ld=gold")
-      string(APPEND CMAKE_MODULE_LINKER_FLAGS " -fuse-ld=gold")
-      set(_IS_LINKER_DEFAULT OFF)
+      string(APPEND CMAKE_C_FLAGS " -fuse-ld=gold")
+      string(APPEND CMAKE_CXX_FLAGS " -fuse-ld=gold")
    else()
      message(STATUS "GNU gold linker isn't available, using the default system linker.")
    endif()
    unset(LD_VERSION)
  endif()

-  if(WITH_LINKER_LLD AND _IS_LINKER_DEFAULT)
+  if(WITH_LINKER_LLD)
    execute_process(
      COMMAND ${CMAKE_C_COMPILER} -fuse-ld=lld -Wl,--version
      ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
    if("${LD_VERSION}" MATCHES "LLD")
-      string(APPEND CMAKE_EXE_LINKER_FLAGS    " -fuse-ld=lld")
-      string(APPEND CMAKE_SHARED_LINKER_FLAGS " -fuse-ld=lld")
-      string(APPEND CMAKE_MODULE_LINKER_FLAGS " -fuse-ld=lld")
-      set(_IS_LINKER_DEFAULT OFF)
+      string(APPEND CMAKE_C_FLAGS " -fuse-ld=lld")
+      string(APPEND CMAKE_CXX_FLAGS " -fuse-ld=lld")
    else()
      message(STATUS "LLD linker isn't available, using the default system linker.")
    endif()
@@ -789,28 +694,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
 # CLang is the same as GCC for now.
 elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
  set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
-
-  if(WITH_LINKER_MOLD AND _IS_LINKER_DEFAULT)
-    find_program(MOLD_BIN "mold")
-    mark_as_advanced(MOLD_BIN)
-    if(NOT MOLD_BIN)
-      message(STATUS "The \"mold\" binary could not be found, using system linker.")
-      set(WITH_LINKER_MOLD OFF)
-    else()
-      if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0)
-        string(APPEND CMAKE_EXE_LINKER_FLAGS    " --ld-path=\"${MOLD_BIN}\"")
-        string(APPEND CMAKE_SHARED_LINKER_FLAGS " --ld-path=\"${MOLD_BIN}\"")
-        string(APPEND CMAKE_MODULE_LINKER_FLAGS " --ld-path=\"${MOLD_BIN}\"")
-      else()
-        string(APPEND CMAKE_EXE_LINKER_FLAGS    " -fuse-ld=\"${MOLD_BIN}\"")
-        string(APPEND CMAKE_SHARED_LINKER_FLAGS " -fuse-ld=\"${MOLD_BIN}\"")
-        string(APPEND CMAKE_MODULE_LINKER_FLAGS " -fuse-ld=\"${MOLD_BIN}\"")
-      endif()
-      set(_IS_LINKER_DEFAULT OFF)
-    endif()
-    unset(MOLD_BIN)
-  endif()
-
 # Intel C++ Compiler
 elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
  # think these next two are broken
@@ -834,8 +717,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
  string(APPEND PLATFORM_LINKFLAGS " -static-intel")
 endif()

-unset(_IS_LINKER_DEFAULT)
-
 # Avoid conflicts with Mesa llvmpipe, Luxrender, and other plug-ins that may
 # use the same libraries as Blender with a different version or build options.
 set(PLATFORM_LINKFLAGS
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -27,7 +27,7 @@ if(NOT MSVC)
 endif()

 if(CMAKE_C_COMPILER_ID MATCHES "Clang")
-  set(MSVC_CLANG ON)
+  set(MSVC_CLANG On)
  set(VC_TOOLS_DIR $ENV{VCToolsRedistDir} CACHE STRING "Location of the msvc redistributables")
  set(MSVC_REDIST_DIR ${VC_TOOLS_DIR})
  if(DEFINED MSVC_REDIST_DIR)
@@ -53,7 +53,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang")
  endif()
  if(WITH_WINDOWS_STRIPPED_PDB)
    message(WARNING "stripped pdb not supported with clang, disabling..")
-    set(WITH_WINDOWS_STRIPPED_PDB OFF)
+    set(WITH_WINDOWS_STRIPPED_PDB Off)
  endif()
 endif()

@@ -159,7 +159,7 @@ endif()
 if(WITH_COMPILER_ASAN AND MSVC AND NOT MSVC_CLANG)
  if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.28.29828)
    #set a flag so we don't have to do this comparison all the time
-    SET(MSVC_ASAN ON)
+    SET(MSVC_ASAN On)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=address")
    set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /fsanitize=address")
    string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " /INCREMENTAL:NO")
@@ -179,22 +179,22 @@ endif()

 if(WITH_WINDOWS_SCCACHE AND CMAKE_VS_MSBUILD_COMMAND)
    message(WARNING "Disabling sccache, sccache is not supported with msbuild")
-    set(WITH_WINDOWS_SCCACHE OFF)
+    set(WITH_WINDOWS_SCCACHE Off)
 endif()

 # Debug Symbol format
 # sccache # MSVC_ASAN # format # why
-# ON      # ON        # Z7     # sccache will only play nice with Z7
-# ON      # OFF       # Z7     # sccache will only play nice with Z7
-# OFF     # ON        # Zi     # Asan will not play nice with Edit and Continue
-# OFF     # OFF       # ZI     # Neither asan nor sscache is enabled Edit and Continue is available
+# On      # On        # Z7     # sccache will only play nice with Z7
+# On      # Off       # Z7     # sccache will only play nice with Z7
+# Off     # On        # Zi     # Asan will not play nice with Edit and Continue
+# Off     # Off       # ZI     # Neither asan nor sscache is enabled Edit and Continue is available

 # Release Symbol format
 # sccache # MSVC_ASAN # format # why
-# ON      # ON        # Z7     # sccache will only play nice with Z7
-# ON      # OFF       # Z7     # sccache will only play nice with Z7
-# OFF     # ON        # Zi     # Asan will not play nice with Edit and Continue
-# OFF     # OFF       # Zi     # Edit and Continue disables some optimizations
+# On      # On        # Z7     # sccache will only play nice with Z7
+# On      # Off       # Z7     # sccache will only play nice with Z7
+# Off     # On        # Zi     # Asan will not play nice with Edit and Continue
+# Off     # Off       # Zi     # Edit and Continue disables some optimizations


 if(WITH_WINDOWS_SCCACHE)
@@ -259,7 +259,7 @@ if(NOT DEFINED LIBDIR)
  else()
    message(FATAL_ERROR "32 bit compiler detected, blender no longer provides pre-build libraries for 32 bit windows, please set the LIBDIR cmake variable to your own library folder")
  endif()
-  if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.30.30423)
+  if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.29.30130)
    message(STATUS "Visual Studio 2022 detected.")
    set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc15)
  elseif(MSVC_VERSION GREATER 1919)
@@ -288,7 +288,7 @@ if(CMAKE_GENERATOR MATCHES "^Visual Studio.+" AND # Only supported in the VS IDE
    "EnableMicrosoftCodeAnalysis=false"
    "EnableClangTidyCodeAnalysis=true"
  )
-  set(VS_CLANG_TIDY ON)
+  set(VS_CLANG_TIDY On)
 endif()

 # Mark libdir as system headers with a lower warn level, to resolve some warnings
@@ -347,11 +347,7 @@ set(FREETYPE_INCLUDE_DIRS
  ${LIBDIR}/freetype/include
  ${LIBDIR}/freetype/include/freetype2
 )
-set(FREETYPE_LIBRARIES
-  ${LIBDIR}/freetype/lib/freetype2ST.lib
-  ${LIBDIR}/brotli/lib/brotlidec-static.lib
-  ${LIBDIR}/brotli/lib/brotlicommon-static.lib
-)
+set(FREETYPE_LIBRARY ${LIBDIR}/freetype/lib/freetype2ST.lib)
 windows_find_package(freetype REQUIRED)

 if(WITH_FFTW3)
@@ -473,7 +469,7 @@ if(WITH_PYTHON)

  set(PYTHON_INCLUDE_DIR ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/include)
  set(PYTHON_NUMPY_INCLUDE_DIRS ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/lib/site-packages/numpy/core/include)
-  set(NUMPY_FOUND ON)
+  set(NUMPY_FOUND On)
  unset(_PYTHON_VERSION_NO_DOTS)
  # uncached vars
  set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
@@ -481,7 +477,7 @@ if(WITH_PYTHON)
 endif()

 if(WITH_BOOST)
-  if(WITH_CYCLES AND WITH_CYCLES_OSL)
+  if(WITH_CYCLES_OSL)
    set(boost_extra_libs wave)
  endif()
  if(WITH_INTERNATIONAL)
@@ -524,7 +520,7 @@ if(WITH_BOOST)
      debug ${BOOST_LIBPATH}/libboost_thread-${BOOST_DEBUG_POSTFIX}
      debug ${BOOST_LIBPATH}/libboost_chrono-${BOOST_DEBUG_POSTFIX}
    )
-    if(WITH_CYCLES AND WITH_CYCLES_OSL)
+    if(WITH_CYCLES_OSL)
      set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
        optimized ${BOOST_LIBPATH}/libboost_wave-${BOOST_POSTFIX}
        debug ${BOOST_LIBPATH}/libboost_wave-${BOOST_DEBUG_POSTFIX})
@@ -712,7 +708,7 @@ if(WITH_CODEC_SNDFILE)
  set(LIBSNDFILE_LIBRARIES ${LIBSNDFILE_LIBPATH}/libsndfile-1.lib)
 endif()

-if(WITH_CYCLES AND WITH_CYCLES_OSL)
+if(WITH_CYCLES_OSL)
  set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
  set(OSL_SHADER_DIR ${CYCLES_OSL}/shaders)
  # Shaders have moved around a bit between OSL versions, check multiple locations
@@ -745,7 +741,7 @@ if(WITH_CYCLES AND WITH_CYCLES_OSL)
  endif()
 endif()

-if(WITH_CYCLES AND WITH_CYCLES_EMBREE)
+if(WITH_CYCLES_EMBREE)
  windows_find_package(Embree)
  if(NOT EMBREE_FOUND)
    set(EMBREE_INCLUDE_DIRS ${LIBDIR}/embree/include)
@@ -857,18 +853,18 @@ if(WITH_GMP)
  set(GMP_INCLUDE_DIRS ${LIBDIR}/gmp/include)
  set(GMP_LIBRARIES ${LIBDIR}/gmp/lib/libgmp-10.lib optimized ${LIBDIR}/gmp/lib/libgmpxx.lib debug ${LIBDIR}/gmp/lib/libgmpxx_d.lib)
  set(GMP_ROOT_DIR ${LIBDIR}/gmp)
-  set(GMP_FOUND ON)
+  set(GMP_FOUND On)
 endif()

 if(WITH_POTRACE)
  set(POTRACE_INCLUDE_DIRS ${LIBDIR}/potrace/include)
  set(POTRACE_LIBRARIES ${LIBDIR}/potrace/lib/potrace.lib)
-  set(POTRACE_FOUND ON)
+  set(POTRACE_FOUND On)
 endif()

 if(WITH_HARU)
  if(EXISTS ${LIBDIR}/haru)
-    set(HARU_FOUND ON)
+    set(HARU_FOUND On)
    set(HARU_ROOT_DIR ${LIBDIR}/haru)
    set(HARU_INCLUDE_DIRS ${HARU_ROOT_DIR}/include)
    set(HARU_LIBRARIES ${HARU_ROOT_DIR}/lib/libhpdfs.lib)
--- a/build_files/cmake/platform/platform_win32_bundle_crt.cmake
+++ b/build_files/cmake/platform/platform_win32_bundle_crt.cmake
@@ -27,7 +27,7 @@ if(WITH_WINDOWS_BUNDLE_CRT)
  # 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
+  # Generating the manifest is a relativly 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.
--- a/build_files/cmake/project_source_info.py
+++ b/build_files/cmake/project_source_info.py
@@ -243,9 +243,7 @@ def build_defines_as_args() -> List[str]:
 # use this module.
 def queue_processes(
        process_funcs: Sequence[Tuple[Callable[..., subprocess.Popen[Any]], Tuple[Any, ...]]],
-        *,
        job_total: int =-1,
-        sleep: float = 0.1,
 ) -> None:
    """ Takes a list of function arg pairs, each function must return a process
    """
@@ -273,20 +271,14 @@ def queue_processes(

                if len(processes) <= job_total:
                    break
-                time.sleep(sleep)
+                else:
+                    time.sleep(0.1)

            sys.stdout.flush()
            sys.stderr.flush()

            processes.append(func(*args))

-        # Don't return until all jobs have finished.
-        while 1:
-            processes[:] = [p for p in processes if p.poll() is None]
-            if not processes:
-                break
-            time.sleep(sleep)
-

 def main() -> None:
    if not os.path.exists(join(CMAKE_DIR, "CMakeCache.txt")):
--- a/build_files/config/pipeline_config.yaml
+++ b/build_files/config/pipeline_config.yaml
@@ -55,7 +55,7 @@ buildbot:
    cuda11:
        version: '11.4.1'
    optix:
-        version: '7.3.0'
+        version: '7.1.0'
    cmake:
        default:
            version: any
--- a/build_files/utils/make_update.py
+++ b/build_files/utils/make_update.py
@@ -31,7 +31,6 @@ def parse_arguments():
    parser.add_argument("--no-submodules", action="store_true")
    parser.add_argument("--use-tests", action="store_true")
    parser.add_argument("--svn-command", default="svn")
-    parser.add_argument("--svn-branch", default=None)
    parser.add_argument("--git-command", default="git")
    parser.add_argument("--use-centos-libraries", action="store_true")
    return parser.parse_args()
@@ -47,7 +46,7 @@ def svn_update(args, release_version):
    svn_non_interactive = [args.svn_command, '--non-interactive']

    lib_dirpath = os.path.join(get_blender_git_root(), '..', 'lib')
-    svn_url = make_utils.svn_libraries_base_url(release_version, args.svn_branch)
+    svn_url = make_utils.svn_libraries_base_url(release_version)

    # Checkout precompiled libraries
    if sys.platform == 'darwin':
@@ -171,28 +170,26 @@ def submodules_update(args, release_version, branch):
        sys.stderr.write("git not found, can't update code\n")
        sys.exit(1)

-    # Update submodules to appropriate given branch,
-    # falling back to master if none is given and/or found in a sub-repository.
-    branch_fallback = "master"
-    if not branch:
-        branch = branch_fallback
+    # Update submodules to latest master or appropriate release branch.
+    if not release_version:
+        branch = "master"

    submodules = [
-        ("release/scripts/addons", branch, branch_fallback),
-        ("release/scripts/addons_contrib", branch, branch_fallback),
-        ("release/datafiles/locale", branch, branch_fallback),
-        ("source/tools", branch, branch_fallback),
+        ("release/scripts/addons", branch),
+        ("release/scripts/addons_contrib", branch),
+        ("release/datafiles/locale", branch),
+        ("source/tools", branch),
    ]

    # Initialize submodules only if needed.
-    for submodule_path, submodule_branch, submodule_branch_fallback in submodules:
+    for submodule_path, submodule_branch in submodules:
        if not os.path.exists(os.path.join(submodule_path, ".git")):
            call([args.git_command, "submodule", "update", "--init", "--recursive"])
            break

    # Checkout appropriate branch and pull changes.
    skip_msg = ""
-    for submodule_path, submodule_branch, submodule_branch_fallback in submodules:
+    for submodule_path, submodule_branch in submodules:
        cwd = os.getcwd()
        try:
            os.chdir(submodule_path)
@@ -200,20 +197,10 @@ def submodules_update(args, release_version, branch):
            if msg:
                skip_msg += submodule_path + " skipped: " + msg + "\n"
            else:
-                # Find a matching branch that exists.
-                call([args.git_command, "fetch", "origin"])
-                if make_utils.git_branch_exists(args.git_command, submodule_branch):
-                    pass
-                elif make_utils.git_branch_exists(args.git_command, submodule_branch_fallback):
-                    submodule_branch = submodule_branch_fallback
-                else:
-                    submodule_branch = None
-
-                # Switch to branch and pull.
-                if submodule_branch:
-                    if make_utils.git_branch(args.git_command) != submodule_branch:
-                        call([args.git_command, "checkout", submodule_branch])
-                    call([args.git_command, "pull", "--rebase", "origin", submodule_branch])
+                if make_utils.git_branch(args.git_command) != submodule_branch:
+                    call([args.git_command, "fetch", "origin"])
+                    call([args.git_command, "checkout", submodule_branch])
+                call([args.git_command, "pull", "--rebase", "origin", submodule_branch])
        finally:
            os.chdir(cwd)

@@ -227,10 +214,6 @@ if __name__ == "__main__":

    # Test if we are building a specific release version.
    branch = make_utils.git_branch(args.git_command)
-    if branch == 'HEAD':
-        sys.stderr.write('Blender git repository is in detached HEAD state, must be in a branch\n')
-        sys.exit(1)
-
    tag = make_utils.git_tag(args.git_command)
    release_version = make_utils.git_branch_release_version(branch, tag)

--- a/build_files/utils/make_utils.py
+++ b/build_files/utils/make_utils.py
@@ -8,19 +8,14 @@ import subprocess
 import sys


-def call(cmd, exit_on_error=True, silent=False):
-    if not silent:
-        print(" ".join(cmd))
+def call(cmd, exit_on_error=True):
+    print(" ".join(cmd))

    # Flush to ensure correct order output on Windows.
    sys.stdout.flush()
    sys.stderr.flush()

-    if silent:
-        retcode = subprocess.call(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-    else:
-        retcode = subprocess.call(cmd)
-
+    retcode = subprocess.call(cmd)
    if exit_on_error and retcode != 0:
        sys.exit(retcode)
    return retcode
@@ -43,11 +38,6 @@ def check_output(cmd, exit_on_error=True):
    return output.strip()


-def git_branch_exists(git_command, branch):
-    return call([git_command, "rev-parse", "--verify", branch], exit_on_error=False, silent=True) == 0 or \
-           call([git_command, "rev-parse", "--verify", "remotes/origin/" + branch], exit_on_error=False, silent=True) == 0
-
-
 def git_branch(git_command):
    # Get current branch name.
    try:
@@ -80,11 +70,9 @@ def git_branch_release_version(branch, tag):
    return release_version


-def svn_libraries_base_url(release_version, branch=None):
+def svn_libraries_base_url(release_version):
    if release_version:
        svn_branch = "tags/blender-" + release_version + "-release"
-    elif branch:
-        svn_branch = "branches/" + branch
    else:
        svn_branch = "trunk"
    return "https://svn.blender.org/svnroot/bf-blender/" + svn_branch + "/lib/"
--- a/build_files/windows/find_dependencies.cmd
+++ b/build_files/windows/find_dependencies.cmd
@@ -3,32 +3,7 @@ for %%X in (svn.exe) do (set SVN=%%~$PATH:X)
 for %%X in (cmake.exe) do (set CMAKE=%%~$PATH:X)
 for %%X in (ctest.exe) do (set CTEST=%%~$PATH:X)
 for %%X in (git.exe) do (set GIT=%%~$PATH:X)
-REM For python, default on 39 but if that does not exist also check
-REM the 310,311 and 312 folders to see if those are there, it checks
-REM this far ahead to ensure good lib folder compatiblity in the future.
-set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\39\bin\python.exe
-if EXIST %PYTHON% (
-	goto detect_python_done
-)
-set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\310\bin\python.exe
-if EXIST %PYTHON% (
-	goto detect_python_done
-)
-set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\311\bin\python.exe
-if EXIST %PYTHON% (
-	goto detect_python_done
-)
-set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\312\bin\python.exe
-if EXIST %PYTHON% (
-	goto detect_python_done
-)
-
-if NOT EXIST %PYTHON% (
-    echo Warning: Python not found, there is likely an issue with the library folder
-    set PYTHON=""
-)
-
-:detect_python_done
+set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\37\bin\python.exe
 if NOT "%verbose%" == "" (
 	echo svn    : "%SVN%"
 	echo cmake  : "%CMAKE%"
@@ -36,3 +11,7 @@ if NOT "%verbose%" == "" (
 	echo git    : "%GIT%"
 	echo python : "%PYTHON%"
 )
+if "%CMAKE%" == "" (
+	echo Cmake not found in path, required for building, exiting...
+	exit /b 1
+)
--- a/build_files/windows/format.cmd
+++ b/build_files/windows/format.cmd
@@ -9,11 +9,17 @@ exit /b 1
 :detect_done
 echo found clang-format in %CF_PATH%

-if NOT EXIST %PYTHON% (
-    echo python not found, required for this operation
-    exit /b 1
+if EXIST %PYTHON% (
+    set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\37\bin\python.exe
+    goto detect_python_done
 )

+echo python not found in lib folder
+exit /b 1
+
+:detect_python_done
+echo found python (%PYTHON%)
+
 set FORMAT_PATHS=%BLENDER_DIR%\source\tools\utils_maintenance\clang_format_paths.py

 REM The formatting script expects clang-format to be in the current PATH.
--- a/build_files/windows/icons.cmd
+++ b/build_files/windows/icons.cmd
@@ -1,8 +1,18 @@
-if NOT EXIST %PYTHON% (
-    echo python not found, required for this operation
-    exit /b 1
+if EXIST %PYTHON% (
+    goto detect_python_done
 )

+set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\39\bin\python.exe
+if EXIST %PYTHON% (
+    goto detect_python_done
+)
+
+echo python not found at %PYTHON%
+exit /b 1
+
+:detect_python_done
+echo found python (%PYTHON%)
+
 call "%~dp0\find_inkscape.cmd"

 if EXIST "%INKSCAPE_BIN%" (
--- a/build_files/windows/icons_geom.cmd
+++ b/build_files/windows/icons_geom.cmd
@@ -1,8 +1,18 @@
-if NOT EXIST %PYTHON% (
-    echo python not found, required for this operation
-    exit /b 1
+if EXIST %PYTHON% (
+    goto detect_python_done
 )

+set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\39\bin\python.exe
+if EXIST %PYTHON% (
+    goto detect_python_done
+)
+
+echo python not found at %PYTHON%
+exit /b 1
+
+:detect_python_done
+echo found python (%PYTHON%)
+
 call "%~dp0\find_blender.cmd"

 if EXIST "%BLENDER_BIN%" (
--- a/build_files/windows/parse_arguments.cmd
+++ b/build_files/windows/parse_arguments.cmd
@@ -116,9 +116,6 @@ if NOT "%1" == "" (
 	) else if "%1" == "doc_py" (
 		set DOC_PY=1
 		goto EOF
-	) else if "%1" == "svnfix" (
-		set SVN_FIX=1
-		goto EOF
 	) else (
 		echo Command "%1" unknown, aborting!
 		goto ERR
--- a/build_files/windows/svn_fix.cmd
+++ b/build_files/windows/svn_fix.cmd
@@ -1,26 +0,0 @@
-if "%BUILD_VS_YEAR%"=="2017" set BUILD_VS_LIBDIRPOST=vc15
-if "%BUILD_VS_YEAR%"=="2019" set BUILD_VS_LIBDIRPOST=vc15
-if "%BUILD_VS_YEAR%"=="2022" set BUILD_VS_LIBDIRPOST=vc15
-
-set BUILD_VS_SVNDIR=win64_%BUILD_VS_LIBDIRPOST%
-set BUILD_VS_LIBDIR="%BLENDER_DIR%..\lib\%BUILD_VS_SVNDIR%"
-
-echo Starting cleanup in %BUILD_VS_LIBDIR%.
-cd %BUILD_VS_LIBDIR%
-:RETRY
-"%SVN%" cleanup
-"%SVN%" update
-if errorlevel 1 (
-		set /p LibRetry= "Error during update, retry? y/n"
-		if /I "!LibRetry!"=="Y" (
-			goto RETRY
-		)
-		echo.
-		echo Error: Download of external libraries failed. 
-		echo This is needed for building, please manually run 'svn cleanup' and 'svn update' in
-		echo %BUILD_VS_LIBDIR% , until this is resolved you CANNOT make a successful blender build
-		echo.
-		exit /b 1
-)
-echo Cleanup complete
-
--- a/build_files/windows/update_sources.cmd
+++ b/build_files/windows/update_sources.cmd
@@ -1,7 +1,10 @@
-if NOT EXIST %PYTHON% (
-    echo python not found, required for this operation
-    exit /b 1
+if EXIST %PYTHON% (
+	goto detect_python_done
 )
+
+echo python not found in lib folder
+exit /b 1
+
 :detect_python_done

 REM Use -B to avoid writing __pycache__ in lib directory and causing update conflicts.
--- a/doc/doxygen/Doxyfile
+++ b/doc/doxygen/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = Blender
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = V3.1
+PROJECT_NUMBER         = V3.0

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
--- a/doc/doxygen/doxygen.intern.h
+++ b/doc/doxygen/doxygen.intern.h
@@ -6,87 +6,91 @@
 *  as part of the normal development process.
 */

-/* TODO: other modules.
- * - `libmv`
- * - `cycles`
- * - `opencolorio`
- * - `opensubdiv`
- * - `openvdb`
- * - `quadriflow`
+/** \defgroup MEM Guarded memory (de)allocation
+ *  \ingroup intern
 */

-/** \defgroup intern_atomic Atomic Operations
- *  \ingroup intern */
+/** \defgroup clog C-Logging (CLOG)
+ *  \ingroup intern
+ */

-/** \defgroup intern_clog C-Logging (CLOG)
- *  \ingroup intern */
+/** \defgroup ctr container
+ *  \ingroup intern
+ */

-/** \defgroup intern_eigen Eigen
- *  \ingroup intern */
+/** \defgroup iksolver iksolver
+ *  \ingroup intern
+ */

-/** \defgroup intern_glew-mx GLEW with Multiple Rendering Context's
- *  \ingroup intern */
+/** \defgroup itasc itasc
+ *  \ingroup intern
+ */

-/** \defgroup intern_iksolver Inverse Kinematics (Solver)
- *  \ingroup intern */
+/** \defgroup memutil memutil
+ *  \ingroup intern
+ */

-/** \defgroup intern_itasc Inverse Kinematics (ITASC)
- *  \ingroup intern */
+/** \defgroup mikktspace mikktspace
+ *  \ingroup intern
+ */

-/** \defgroup intern_libc_compat libc Compatibility For Linux
- *  \ingroup intern */
+/** \defgroup moto moto
+ *  \ingroup intern
+ */

-/** \defgroup intern_locale Locale
- *  \ingroup intern */
+/** \defgroup eigen eigen
+ *  \ingroup intern
+ */

-/** \defgroup intern_mantaflow Manta-Flow Fluid Simulation
- *  \ingroup intern */
+/** \defgroup smoke smoke
+ *  \ingroup intern
+ */

-/** \defgroup intern_mem Guarded Memory (de)allocation
- *  \ingroup intern */
-
-/** \defgroup intern_memutil Memory Utilities (memutil)
- *  \ingroup intern */
-
-/** \defgroup intern_mikktspace MikktSpace
- *  \ingroup intern */
-
-/** \defgroup intern_rigidbody Rigid-Body C-API
- *  \ingroup intern */
-
-/** \defgroup intern_sky_model Sky Model
- *  \ingroup intern */
-
-/** \defgroup intern_utf_conv UTF-8/16 Conversion (utfconv)
- *  \ingroup intern */
+/** \defgroup string string
+ *  \ingroup intern
+ */

 /** \defgroup audaspace Audaspace
 *  \ingroup intern undoc
- *  \todo add to doxygen */
+ *  \todo add to doxygen
+ */
 /** \defgroup audcoreaudio Audaspace CoreAudio
- *  \ingroup audaspace */
+ *  \ingroup audaspace
+ */
 /** \defgroup audfx Audaspace FX
- *  \ingroup audaspace */
+ *  \ingroup audaspace
+ */
 /** \defgroup audopenal Audaspace OpenAL
- *  \ingroup audaspace */
+ *  \ingroup audaspace
+ */
 /** \defgroup audpulseaudio Audaspace PulseAudio
- *  \ingroup audaspace */
+ *  \ingroup audaspace
+ */
 /** \defgroup audwasapi Audaspace WASAPI
- *  \ingroup audaspace */
+ *  \ingroup audaspace
+ */
 /** \defgroup audpython Audaspace Python
- *  \ingroup audaspace */
+ *  \ingroup audaspace
+ */
 /** \defgroup audsdl Audaspace SDL
- *  \ingroup audaspace */
+ *  \ingroup audaspace
+ */
 /** \defgroup audsrc Audaspace SRC
- *  \ingroup audaspace */
+ *
+ *  \ingroup audaspace
+ */
 /** \defgroup audffmpeg Audaspace FFMpeg
- *  \ingroup audaspace */
+ *  \ingroup audaspace
+ */
 /** \defgroup audfftw Audaspace FFTW
- *  \ingroup audaspace */
+ *  \ingroup audaspace
+ */
 /** \defgroup audjack Audaspace Jack
- *  \ingroup audaspace */
+ *  \ingroup audaspace
+ */
 /** \defgroup audsndfile Audaspace sndfile
- *  \ingroup audaspace */
+ *  \ingroup audaspace
+ */

 /** \defgroup GHOST GHOST API
 * \ingroup intern GUI
--- a/doc/doxygen/doxygen.source.h
+++ b/doc/doxygen/doxygen.source.h
@@ -5,8 +5,7 @@
 /** \defgroup bmesh BMesh
 *  \ingroup blender
 */
-/** \defgroup compositor Compositing
- *  \ingroup blender */
+/** \defgroup compositor Compositing */

 /** \defgroup python Python
 *  \ingroup blender
@@ -79,8 +78,7 @@
 *  \ingroup blender
 */

-/** \defgroup data DNA, RNA and .blend access
- *  \ingroup blender */
+/** \defgroup data DNA, RNA and .blend access*/

 /** \defgroup gpu GPU
 *  \ingroup blender
@@ -103,12 +101,11 @@
 *   merged in docs.
 */

-/**
- * \defgroup gui GUI
- * \ingroup blender */
+/** \defgroup gui GUI */

 /** \defgroup wm Window Manager
- *  \ingroup gui */
+ *  \ingroup blender gui
+ */

 /* ================================ */

@@ -282,8 +279,7 @@
 *  \ingroup gui
 */

-/** \defgroup externformats External Formats
- *  \ingroup blender */
+/** \defgroup externformats External Formats */

 /** \defgroup collada COLLADA
 *  \ingroup externformats
@@ -312,7 +308,4 @@
 /* ================================ */

 /** \defgroup undoc Undocumented
- *
- * \brief Modules and libraries that are still undocumented,
- * or lacking proper integration into the doxygen system, are marked in this group.
- */
+ *  \brief Modules and libraries that are still undocumented, or lacking proper integration into the doxygen system, are marked in this group. */
--- a/doc/manpage/blender.1.py
+++ b/doc/manpage/blender.1.py
@@ -61,7 +61,7 @@ def blender_extract_info(blender_bin: str) -> Dict[str, str]:
        stdout=subprocess.PIPE,
    ).stdout.decode(encoding="utf-8")

-    blender_version_output = subprocess.run(
+    blender_version_ouput = subprocess.run(
        [blender_bin, "--version"],
        env=blender_env,
        check=True,
@@ -73,7 +73,7 @@ def blender_extract_info(blender_bin: str) -> Dict[str, str]:
    # check for each lines prefix to ensure these aren't included.
    blender_version = ""
    blender_date = ""
-    for l in blender_version_output.split("\n"):
+    for l in blender_version_ouput.split("\n"):
        if l.startswith("Blender "):
            # Remove 'Blender' prefix.
            blender_version = l.split(" ", 1)[1].strip()
--- a/doc/python_api/examples/aud.py
+++ b/doc/python_api/examples/aud.py
@@ -14,7 +14,7 @@ sound = aud.Sound('music.ogg')
 # play the audio, this return a handle to control play/pause
 handle = device.play(sound)
 # if the audio is not too big and will be used often you can buffer it
-sound_buffered = aud.Sound.cache(sound)
+sound_buffered = aud.Sound.buffer(sound)
 handle_buffered = device.play(sound_buffered)

 # stop the sounds (otherwise they play until their ends)
--- a/doc/python_api/examples/bpy.app.timers.5.py
+++ b/doc/python_api/examples/bpy.app.timers.5.py
@@ -11,7 +11,7 @@ import queue

 execution_queue = queue.Queue()

-# This function can safely be called in another thread.
+# This function can savely be called in another thread.
 # The function will be executed when the timer runs the next time.
 def run_in_main_thread(function):
    execution_queue.put(function)
--- a/doc/python_api/examples/bpy.types.Bone.convert_local_to_pose.py
+++ b/doc/python_api/examples/bpy.types.Bone.convert_local_to_pose.py
@@ -1,55 +0,0 @@
-"""
-This method enables conversions between Local and Pose space for bones in
-the middle of updating the armature without having to update dependencies
-after each change, by manually carrying updated matrices in a recursive walk.
-"""
-
-def set_pose_matrices(obj, matrix_map):
-    "Assign pose space matrices of all bones at once, ignoring constraints."
-
-    def rec(pbone, parent_matrix):
-        if pbone.name in matrix_map:
-            matrix = matrix_map[pbone.name]
-
-            ## Instead of:
-            # pbone.matrix = matrix
-            # bpy.context.view_layer.update()
-
-            # Compute and assign local matrix, using the new parent matrix
-            if pbone.parent:
-                pbone.matrix_basis = pbone.bone.convert_local_to_pose(
-                    matrix,
-                    pbone.bone.matrix_local,
-                    parent_matrix=parent_matrix,
-                    parent_matrix_local=pbone.parent.bone.matrix_local,
-                    invert=True
-                )
-            else:
-                pbone.matrix_basis = pbone.bone.convert_local_to_pose(
-                    matrix,
-                    pbone.bone.matrix_local,
-                    invert=True
-                )
-        else:
-            # Compute the updated pose matrix from local and new parent matrix
-            if pbone.parent:
-                matrix = pbone.bone.convert_local_to_pose(
-                    pbone.matrix_basis,
-                    pbone.bone.matrix_local,
-                    parent_matrix=parent_matrix,
-                    parent_matrix_local=pbone.parent.bone.matrix_local,
-                )
-            else:
-                matrix = pbone.bone.convert_local_to_pose(
-                    pbone.matrix_basis,
-                    pbone.bone.matrix_local,
-                )
-
-        # Recursively process children, passing the new matrix through
-        for child in pbone.children:
-            rec(child, matrix)
-
-    # Scan all bone trees from their roots
-    for pbone in obj.pose.bones:
-        if not pbone.parent:
-            rec(pbone, None)
--- a/doc/python_api/examples/bpy.types.Operator.1.py
+++ b/doc/python_api/examples/bpy.types.Operator.1.py
@@ -42,13 +42,8 @@ class SimpleMouseOperator(bpy.types.Operator):
        self.y = event.mouse_y
        return self.execute(context)

-# Only needed if you want to add into a dynamic menu
-def menu_func(self, context):
-    self.layout.operator(SimpleMouseOperator.bl_idname, text="Simple Mouse Operator")

-# Register and add to the view menu (required to also use F3 search "Simple Mouse Operator" for quick access)
 bpy.utils.register_class(SimpleMouseOperator)
-bpy.types.VIEW3D_MT_view.append(menu_func)

 # Test call to the newly defined operator.
 # Here we call the operator and invoke it, meaning that the settings are taken
--- a/doc/python_api/examples/bpy.types.Operator.2.py
+++ b/doc/python_api/examples/bpy.types.Operator.2.py
@@ -43,7 +43,7 @@ def menu_func(self, context):
    self.layout.operator(ExportSomeData.bl_idname, text="Text Export Operator")


-# Register and add to the file selector (required to also use F3 search "Text Export Operator" for quick access)
+# Register and add to the file selector
 bpy.utils.register_class(ExportSomeData)
 bpy.types.TOPBAR_MT_file_export.append(menu_func)

--- a/doc/python_api/examples/bpy.types.Operator.3.py
+++ b/doc/python_api/examples/bpy.types.Operator.3.py
@@ -27,14 +27,8 @@ class DialogOperator(bpy.types.Operator):
        wm = context.window_manager
        return wm.invoke_props_dialog(self)

-# Only needed if you want to add into a dynamic menu
-def menu_func(self, context):
-    self.layout.operator(DialogOperator.bl_idname, text="Dialog Operator")

-
-# Register and add to the object menu (required to also use F3 search "Dialog Operator" for quick access)
 bpy.utils.register_class(DialogOperator)
-bpy.types.VIEW3D_MT_object.append(menu_func)

 # Test call.
 bpy.ops.object.dialog_operator('INVOKE_DEFAULT')
--- a/doc/python_api/examples/bpy.types.Operator.4.py
+++ b/doc/python_api/examples/bpy.types.Operator.4.py
@@ -41,13 +41,8 @@ class CustomDrawOperator(bpy.types.Operator):

        col.prop(self, "my_string")

-# Only needed if you want to add into a dynamic menu
-def menu_func(self, context):
-    self.layout.operator(CustomDrawOperator.bl_idname, text="Custom Draw Operator")

-# Register and add to the object menu (required to also use F3 search "Custom Draw Operator" for quick access)
 bpy.utils.register_class(CustomDrawOperator)
-bpy.types.VIEW3D_MT_object.append(menu_func)

 # test call
 bpy.ops.object.custom_draw('INVOKE_DEFAULT')
--- a/doc/python_api/examples/bpy.types.Operator.5.py
+++ b/doc/python_api/examples/bpy.types.Operator.5.py
@@ -55,13 +55,8 @@ class ModalOperator(bpy.types.Operator):
        context.window_manager.modal_handler_add(self)
        return {'RUNNING_MODAL'}

-# Only needed if you want to add into a dynamic menu
-def menu_func(self, context):
-    self.layout.operator(ModalOperator.bl_idname, text="Modal Operator")

-# Register and add to the object menu (required to also use F3 search "Modal Operator" for quick access)
 bpy.utils.register_class(ModalOperator)
-bpy.types.VIEW3D_MT_object.append(menu_func)

 # test call
 bpy.ops.object.modal_operator('INVOKE_DEFAULT')
--- a/doc/python_api/examples/bpy.types.Operator.6.py
+++ b/doc/python_api/examples/bpy.types.Operator.6.py
@@ -31,13 +31,8 @@ class SearchEnumOperator(bpy.types.Operator):
        context.window_manager.invoke_search_popup(self)
        return {'RUNNING_MODAL'}

-# Only needed if you want to add into a dynamic menu
-def menu_func(self, context):
-    self.layout.operator(SearchEnumOperator.bl_idname, text="Search Enum Operator")

-# Register and add to the object menu (required to also use F3 search "Search Enum Operator" for quick access)
 bpy.utils.register_class(SearchEnumOperator)
-bpy.types.VIEW3D_MT_object.append(menu_func)

 # test call
 bpy.ops.object.search_enum_operator('INVOKE_DEFAULT')
--- a/doc/python_api/examples/bpy.types.Operator.py
+++ b/doc/python_api/examples/bpy.types.Operator.py
@@ -22,13 +22,8 @@ class HelloWorldOperator(bpy.types.Operator):
        print("Hello World")
        return {'FINISHED'}

-# Only needed if you want to add into a dynamic menu
-def menu_func(self, context):
-    self.layout.operator(HelloWorldOperator.bl_idname, text="Hello World Operator")

-# Register and add to the view menu (required to also use F3 search "Hello World Operator" for quick access)
 bpy.utils.register_class(HelloWorldOperator)
-bpy.types.VIEW3D_MT_view.append(menu_func)

 # test call to the newly defined operator
 bpy.ops.wm.hello_world()
--- a/doc/python_api/examples/gpu.9.py
+++ b/doc/python_api/examples/gpu.9.py
@@ -32,7 +32,7 @@ def draw():
        context.region,
        view_matrix,
        projection_matrix,
-        do_color_management=True)
+        True)

    gpu.state.depth_mask_set(False)
    draw_texture_2d(offscreen.texture_color, (10, 10), WIDTH, HEIGHT)
--- a/doc/python_api/requirements.txt
+++ b/doc/python_api/requirements.txt
@@ -10,4 +10,4 @@ requests==2.26.0

 # Only needed to match the theme used for the official documentation.
 # Without this theme, the default theme will be used.
-sphinx_rtd_theme==1.0.0
+sphinx_rtd_theme==1.0.0rc1
--- a/doc/python_api/rst/bgl.rst
+++ b/doc/python_api/rst/bgl.rst
@@ -106,6 +106,24 @@ including advanced features.
      floating-point values. These values are interpreted as a plane equation.


+.. function:: glColor (red, green, blue, alpha):
+
+   B{glColor3b, glColor3d, glColor3f, glColor3i, glColor3s, glColor3ub, glColor3ui, glColor3us,
+   glColor4b, glColor4d, glColor4f, glColor4i, glColor4s, glColor4ub, glColor4ui, glColor4us,
+   glColor3bv, glColor3dv, glColor3fv, glColor3iv, glColor3sv, glColor3ubv, glColor3uiv,
+   glColor3usv, glColor4bv, glColor4dv, glColor4fv, glColor4iv, glColor4sv, glColor4ubv,
+   glColor4uiv, glColor4usv}
+
+   Set a new color.
+
+   .. seealso:: `OpenGL Docs <https://khronos.org/registry/OpenGL-Refpages/gl4/html/glColor.xhtml>`__
+
+   :type red, green, blue, alpha: Depends on function prototype.
+   :arg red, green, blue: Specify new red, green, and blue values for the current color.
+   :arg alpha: Specifies a new alpha value for the current color. Included only in the
+      four-argument glColor4 commands. (With '4' colors only)
+
+
 .. function:: glColorMask(red, green, blue, alpha):

   Enable and disable writing of frame buffer color components
--- a/doc/python_api/rst/info_gotcha.rst
+++ b/doc/python_api/rst/info_gotcha.rst
@@ -728,7 +728,7 @@ Abusing RNA property callbacks
 ------------------------------

 Python-defined RNA properties can have custom callbacks. Trying to perform complex operations
-from there, like calling an operator, may work, but is not officially recommended nor supported.
+from there, like calling an operator, may work, but is not officialy recommended nor supported.

 Main reason is that those callback should be very fast, but additionally, it may for example
 create issues with undo/redo system (most operators store an history step, and editing an RNA
@@ -743,7 +743,7 @@ will re-allocate objects data,
 any references to a meshes vertices/polygons/UVs, armatures bones,
 curves points, etc. cannot be accessed after switching mode.

-Only the reference to the data itself can be re-accessed, the following example will crash.
+Only the reference to the data its self can be re-accessed, the following example will crash.

 .. code-block:: python

--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -1039,17 +1039,13 @@ context_type_map = {
    # context_member: (RNA type, is_collection)
    "active_annotation_layer": ("GPencilLayer", False),
    "active_bone": ("EditBone", False),
-    "active_file": ("FileSelectEntry", False),
    "active_gpencil_frame": ("GreasePencilLayer", True),
    "active_gpencil_layer": ("GPencilLayer", True),
    "active_node": ("Node", False),
    "active_object": ("Object", False),
    "active_operator": ("Operator", False),
    "active_pose_bone": ("PoseBone", False),
-    "active_sequence_strip": ("Sequence", False),
    "active_editable_fcurve": ("FCurve", False),
-    "active_nla_strip": ("NlaStrip", False),
-    "active_nla_track": ("NlaTrack", False),
    "annotation_data": ("GreasePencil", False),
    "annotation_data_owner": ("ID", False),
    "armature": ("Armature", False),
@@ -1078,7 +1074,6 @@ context_type_map = {
    "gpencil_data": ("GreasePencil", False),
    "gpencil_data_owner": ("ID", False),
    "hair": ("Hair", False),
-    "id": ("ID", False),
    "image_paint_object": ("Object", False),
    "lattice": ("Lattice", False),
    "light": ("Light", False),
@@ -1101,31 +1096,24 @@ context_type_map = {
    "scene": ("Scene", False),
    "sculpt_object": ("Object", False),
    "selectable_objects": ("Object", True),
-    "selected_asset_files": ("FileSelectEntry", True),
    "selected_bones": ("EditBone", True),
-    "selected_editable_actions": ("Action", True),
    "selected_editable_bones": ("EditBone", True),
    "selected_editable_fcurves": ("FCurve", True),
    "selected_editable_keyframes": ("Keyframe", True),
    "selected_editable_objects": ("Object", True),
    "selected_editable_sequences": ("Sequence", True),
-    "selected_ids": ("ID", True),
-    "selected_files": ("FileSelectEntry", True),
-    "selected_ids": ("ID", True),
    "selected_nla_strips": ("NlaStrip", True),
-    "selected_movieclip_tracks": ("MovieTrackingTrack", True),
    "selected_nodes": ("Node", True),
    "selected_objects": ("Object", True),
    "selected_pose_bones": ("PoseBone", True),
    "selected_pose_bones_from_active_object": ("PoseBone", True),
    "selected_sequences": ("Sequence", True),
-    "selected_visible_actions": ("Action", True),
    "selected_visible_fcurves": ("FCurve", True),
    "sequences": ("Sequence", True),
    "soft_body": ("SoftBodyModifier", False),
    "speaker": ("Speaker", False),
    "texture": ("Texture", False),
-    "texture_slot": ("TextureSlot", False),
+    "texture_slot": ("MaterialTextureSlot", False),
    "texture_user": ("ID", False),
    "texture_user_property": ("Property", False),
    "ui_list": ("UIList", False),
@@ -1210,7 +1198,6 @@ def pycontext2sphinx(basepath):
        "text_context_dir",
        "clip_context_dir",
        "sequencer_context_dir",
-        "file_context_dir",
    )

    unique = set()
@@ -1226,10 +1213,7 @@ def pycontext2sphinx(basepath):
        while char_array[i] is not None:
            member = ctypes.string_at(char_array[i]).decode(encoding="ascii")
            fw(".. data:: %s\n\n" % member)
-            try:
-                member_type, is_seq = context_type_map[member]
-            except KeyError:
-                raise SystemExit("Error: context key %r not found in context_type_map; update %s" % (member, __file__)) from None
+            member_type, is_seq = context_type_map[member]
            fw("   :type: %s :class:`bpy.types.%s`\n\n" % ("sequence of " if is_seq else "", member_type))
            unique.add(member)
            i += 1
@@ -1762,7 +1746,6 @@ except ModuleNotFoundError:
    fw("html_show_sphinx = False\n")
    fw("html_baseurl = 'https://docs.blender.org/api/current/'\n")
    fw("html_use_opensearch = 'https://docs.blender.org/api/current'\n")
-    fw("html_show_search_summary = True\n")
    fw("html_split_index = True\n")
    fw("html_static_path = ['static']\n")
    fw("html_extra_path = ['static/favicon.ico', 'static/blender_logo.svg']\n")
@@ -2012,7 +1995,7 @@ def write_rst_importable_modules(basepath):
        "blf": "Font Drawing",
        "imbuf": "Image Buffer",
        "imbuf.types": "Image Buffer Types",
-        "gpu": "GPU Module",
+        "gpu": "GPU Shader Module",
        "gpu.types": "GPU Types",
        "gpu.matrix": "GPU Matrix Utilities",
        "gpu.select": "GPU Select Utilities",
@@ -2257,7 +2240,7 @@ def main():
    # First monkey patch to load in fake members.
    setup_monkey_patch()

-    # Perform changes to Blender itself.
+    # Perform changes to Blender it's self.
    setup_data = setup_blender()

    # eventually, create the dirs
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -67,12 +67,9 @@ endif()

 if(WITH_CYCLES OR WITH_COMPOSITOR OR WITH_OPENSUBDIV)
  add_subdirectory(clew)
-  if((WITH_CYCLES_DEVICE_CUDA OR WITH_CYCLES_DEVICE_OPTIX) AND WITH_CUDA_DYNLOAD)
+  if(WITH_CUDA_DYNLOAD)
    add_subdirectory(cuew)
  endif()
-  if(WITH_CYCLES_DEVICE_HIP AND WITH_HIP_DYNLOAD)
-    add_subdirectory(hipew)
-  endif()
 endif()

 if(WITH_GHOST_X11 AND WITH_GHOST_XDND)
--- a/extern/audaspace/CMakeLists.txt
+++ b/extern/audaspace/CMakeLists.txt
@@ -129,7 +129,6 @@ set(SRC
 	src/util/Barrier.cpp
 	src/util/Buffer.cpp
 	src/util/BufferReader.cpp
-	src/util/RingBuffer.cpp
 	src/util/StreamBuffer.cpp
 	src/util/ThreadPool.cpp
 )
@@ -153,7 +152,6 @@ set(PUBLIC_HDR
 	include/devices/ThreadedDevice.h
 	include/Exception.h
 	include/file/File.h
-	include/file/FileInfo.h
 	include/file/FileManager.h
 	include/file/FileWriter.h
 	include/file/IFileInput.h
@@ -246,7 +244,6 @@ set(PUBLIC_HDR
 	include/util/BufferReader.h
 	include/util/ILockable.h
 	include/util/Math3D.h
-	include/util/RingBuffer.h
 	include/util/StreamBuffer.h
 	include/util/ThreadPool.h
 )
@@ -963,10 +960,7 @@ endif()
 if(BUILD_DEMOS)
 	include_directories(${INCLUDE})

-	set(DEMOS audainfo audaplay audaconvert audaremap signalgen randsounds dynamicmusic playbackmanager)
-
-	add_executable(audainfo demos/audainfo.cpp)
-	target_link_libraries(audainfo audaspace)
+	set(DEMOS audaplay audaconvert audaremap signalgen randsounds dynamicmusic playbackmanager)

 	add_executable(audaplay demos/audaplay.cpp)
 	target_link_libraries(audaplay audaspace)
@@ -1092,12 +1086,12 @@ if(WITH_PYTHON)
 		configure_file(${PYTHON_SOURCE_DIRECTORY}/setup.py.in ${CMAKE_CURRENT_BINARY_DIR}/setup.py ESCAPE_QUOTES @ONLY)

 		if(APPLE)
-			add_custom_command(OUTPUT build COMMAND MACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} ${PYTHON_EXECUTABLE} setup.py build DEPENDS ${PYTHON_SRC} ${PYTHON_HDR} setup.py)
+			add_custom_command(OUTPUT build COMMAND MACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} ${PYTHON_EXECUTABLE} setup.py build DEPENDS ${PYTHON_SRC} ${PYTHON_HDR})
 		elseif(WIN32)
 			set(ENV{VS100COMNTOOLS} $ENV{VS120COMNTOOLS})
-			add_custom_command(OUTPUT build COMMAND ${PYTHON_EXECUTABLE} setup.py build DEPENDS ${PYTHON_SRC} ${PYTHON_HDR} setup.py)
+			add_custom_command(OUTPUT build COMMAND ${PYTHON_EXECUTABLE} setup.py build DEPENDS ${PYTHON_SRC} ${PYTHON_HDR})
 		else()
-			add_custom_command(OUTPUT build COMMAND ${PYTHON_EXECUTABLE} setup.py build DEPENDS ${PYTHON_SRC} ${PYTHON_HDR} setup.py)
+			add_custom_command(OUTPUT build COMMAND ${PYTHON_EXECUTABLE} setup.py build DEPENDS ${PYTHON_SRC} ${PYTHON_HDR})
 		endif()
 		add_custom_target(pythonmodule ALL DEPENDS build SOURCES ${PYTHON_SOURCE_DIRECTORY}/setup.py.in ${PYTHON_SRC} ${PYTHON_HDR})
 		add_dependencies(pythonmodule audaspace)
--- a/extern/audaspace/bindings/C/AUD_PlaybackManager.h
+++ b/extern/audaspace/bindings/C/AUD_PlaybackManager.h
@@ -39,7 +39,7 @@ extern AUD_API void AUD_PlaybackManager_free(AUD_PlaybackManager* manager);
 * Plays a sound through the playback manager, adding it into a category.
 * \param manager The PlaybackManager object.
 * \param sound The sound to be played.
-* \param catKey The key of the category into which the sound will be added. If it doesn't exist a new one will be created.
+* \param catKey The key of the category into which the sound will be added. If it doesn't exist a new one will be creatd.
 */
 extern AUD_API void AUD_PlaybackManager_play(AUD_PlaybackManager* manager, AUD_Sound* sound, unsigned int catKey);

--- a/extern/audaspace/bindings/C/AUD_Sound.cpp
+++ b/extern/audaspace/bindings/C/AUD_Sound.cpp
@@ -94,40 +94,6 @@ AUD_API int AUD_Sound_getLength(AUD_Sound* sound)
 	return (*sound)->createReader()->getLength();
 }

-AUD_API int AUD_Sound_getFileStreams(AUD_Sound* sound, AUD_StreamInfo **stream_infos)
-{
-	assert(sound);
-
-	std::shared_ptr<File> file = std::dynamic_pointer_cast<File>(*sound);
-
-	if(file)
-	{
-		try
-		{
-			auto streams = file->queryStreams();
-
-			size_t size = sizeof(AUD_StreamInfo) * streams.size();
-
-			if(!size)
-			{
-				*stream_infos = nullptr;
-				return 0;
-			}
-
-			*stream_infos = reinterpret_cast<AUD_StreamInfo*>(std::malloc(size));
-			std::memcpy(*stream_infos, streams.data(), size);
-
-			return streams.size();
-		}
-		catch(Exception&)
-		{
-		}
-	}
-
-	*stream_infos = nullptr;
-	return 0;
-}
-
 AUD_API sample_t* AUD_Sound_data(AUD_Sound* sound, int* length, AUD_Specs* specs)
 {
 	assert(sound);
@@ -286,12 +252,6 @@ AUD_API AUD_Sound* AUD_Sound_bufferFile(unsigned char* buffer, int size)
 	return new AUD_Sound(new File(buffer, size));
 }

-AUD_API AUD_Sound* AUD_Sound_bufferFileStream(unsigned char* buffer, int size, int stream)
-{
-	assert(buffer);
-	return new AUD_Sound(new File(buffer, size, stream));
-}
-
 AUD_API AUD_Sound* AUD_Sound_cache(AUD_Sound* sound)
 {
 	assert(sound);
@@ -312,12 +272,6 @@ AUD_API AUD_Sound* AUD_Sound_file(const char* filename)
 	return new AUD_Sound(new File(filename));
 }

-AUD_API AUD_Sound* AUD_Sound_fileStream(const char* filename, int stream)
-{
-	assert(filename);
-	return new AUD_Sound(new File(filename, stream));
-}
-
 AUD_API AUD_Sound* AUD_Sound_sawtooth(float frequency, AUD_SampleRate rate)
 {
 	return new AUD_Sound(new Sawtooth(frequency, rate));
--- a/extern/audaspace/bindings/C/AUD_Sound.h
+++ b/extern/audaspace/bindings/C/AUD_Sound.h
@@ -36,15 +36,7 @@ extern AUD_API AUD_Specs AUD_Sound_getSpecs(AUD_Sound* sound);
 * \return The length of the sound in samples.
 * \note This function creates a reader from the sound and deletes it again.
 */
-extern AUD_API int AUD_Sound_getLength(AUD_Sound* sound);
-
-/**
- * Retrieves the stream infos of a sound file.
- * \param sound The sound to retrieve from which must be a file sound.
- * \param infos A pointer to a AUD_StreamInfo array that will be allocated and must afterwards be freed by the caller.
- * \return The number of items in the infos array.
- */
-extern AUD_API int AUD_Sound_getFileStreams(AUD_Sound* sound, AUD_StreamInfo** stream_infos);
+extern AUD_API int AUD_getLength(AUD_Sound* sound);

 /**
 * Reads a sound's samples into memory.
@@ -97,15 +89,6 @@ extern AUD_API AUD_Sound* AUD_Sound_buffer(sample_t* data, int length, AUD_Specs
 */
 extern AUD_API AUD_Sound* AUD_Sound_bufferFile(unsigned char* buffer, int size);

-/**
- * Loads a sound file from a memory buffer.
- * \param buffer The buffer which contains the sound file.
- * \param size The size of the buffer.
- * \param stream The index of the audio stream within the file if it contains multiple audio streams.
- * \return A handle of the sound file.
- */
-extern AUD_API AUD_Sound* AUD_Sound_bufferFileStream(unsigned char* buffer, int size, int stream);
-
 /**
 * Caches a sound into a memory buffer.
 * \param sound The sound to cache.
@@ -120,14 +103,6 @@ extern AUD_API AUD_Sound* AUD_Sound_cache(AUD_Sound* sound);
 */
 extern AUD_API AUD_Sound* AUD_Sound_file(const char* filename);

-/**
- * Loads a sound file.
- * \param filename The filename of the sound file.
- * \param stream The index of the audio stream within the file if it contains multiple audio streams.
- * \return A handle of the sound file.
- */
-extern AUD_API AUD_Sound* AUD_Sound_fileStream(const char* filename, int stream);
-
 /**
 * Creates a sawtooth sound.
 * \param frequency The frequency of the generated sawtooth sound.
--- a/extern/audaspace/bindings/C/AUD_Special.cpp
+++ b/extern/audaspace/bindings/C/AUD_Special.cpp
@@ -86,6 +86,7 @@ AUD_API AUD_SoundInfo AUD_getInfo(AUD_Sound* sound)
 	info.specs.channels = AUD_CHANNELS_INVALID;
 	info.specs.rate = AUD_RATE_INVALID;
 	info.length = 0.0f;
+	info.start_offset = 0.0f;

 	try
 	{
@@ -95,6 +96,7 @@ AUD_API AUD_SoundInfo AUD_getInfo(AUD_Sound* sound)
 		{
 			info.specs = convSpecToC(reader->getSpecs());
 			info.length = reader->getLength() / (float) info.specs.rate;
+			info.start_offset = reader->getStartOffset();
 		}
 	}
 	catch(Exception&)
@@ -107,7 +109,7 @@ AUD_API AUD_SoundInfo AUD_getInfo(AUD_Sound* sound)
 AUD_API float* AUD_readSoundBuffer(const char* filename, float low, float high,
 						   float attack, float release, float threshold,
 						   int accumulate, int additive, int square,
-						   float sthreshold, double samplerate, int* length, int stream)
+						   float sthreshold, double samplerate, int* length)
 {
 	Buffer buffer;
 	DeviceSpecs specs;
@@ -115,7 +117,7 @@ AUD_API float* AUD_readSoundBuffer(const char* filename, float low, float high,
 	specs.rate = (SampleRate)samplerate;
 	std::shared_ptr<ISound> sound;

-	std::shared_ptr<ISound> file = std::shared_ptr<ISound>(new File(filename, stream));
+	std::shared_ptr<ISound> file = std::shared_ptr<ISound>(new File(filename));

 	int position = 0;

@@ -245,7 +247,7 @@ AUD_API int AUD_readSound(AUD_Sound* sound, float* buffer, int length, int sampl

 		buffer[i * 3] = min;
 		buffer[i * 3 + 1] = max;
-		buffer[i * 3 + 2] = std::sqrt(power / len);
+		buffer[i * 3 + 2] = sqrt(power / len); // RMS

 		if(overallmax < max)
 			overallmax = max;
--- a/extern/audaspace/bindings/C/AUD_Special.h
+++ b/extern/audaspace/bindings/C/AUD_Special.h
@@ -37,7 +37,7 @@ extern AUD_API float* AUD_readSoundBuffer(const char* filename, float low, float
 								  float attack, float release, float threshold,
 								  int accumulate, int additive, int square,
 								  float sthreshold, double samplerate,
-								  int* length, int stream);
+								  int* length);

 /**
 * Pauses a playing sound after a specific amount of time.
--- a/extern/audaspace/bindings/C/AUD_Types.h
+++ b/extern/audaspace/bindings/C/AUD_Types.h
@@ -176,17 +176,5 @@ typedef struct
 {
 	AUD_Specs specs;
 	float length;
+	double start_offset;
 } AUD_SoundInfo;
-
-/// Specification of a sound source.
-typedef struct
-{
-	/// Start time in seconds.
-	double start;
-
-	/// Duration in seconds. May be estimated or 0 if unknown.
-	double duration;
-
-	/// Audio data parameters.
-	AUD_DeviceSpecs specs;
-} AUD_StreamInfo;
--- a/extern/audaspace/bindings/python/PySound.cpp
+++ b/extern/audaspace/bindings/python/PySound.cpp
@@ -89,11 +89,10 @@ Sound_new(PyTypeObject* type, PyObject* args, PyObject* kwds)
 	self = (Sound*)type->tp_alloc(type, 0);
 	if(self != nullptr)
 	{
-		static const char* kwlist[] = {"filename", "stream", nullptr};
+		static const char* kwlist[] = {"filename", nullptr};
 		const char* filename = nullptr;
-		int stream = 0;

-		if(!PyArg_ParseTupleAndKeywords(args, kwds, "s|i:Sound", const_cast<char**>(kwlist), &filename, &stream))
+		if(!PyArg_ParseTupleAndKeywords(args, kwds, "s:Sound", const_cast<char**>(kwlist), &filename))
 		{
 			Py_DECREF(self);
 			return nullptr;
@@ -101,7 +100,7 @@ Sound_new(PyTypeObject* type, PyObject* args, PyObject* kwds)

 		try
 		{
-			self->sound = new std::shared_ptr<ISound>(new File(filename, stream));
+			self->sound = new std::shared_ptr<ISound>(new File(filename));
 		}
 		catch(Exception& e)
 		{
@@ -290,7 +289,7 @@ PyDoc_STRVAR(M_aud_Sound_buffer_doc,
 			 ".. classmethod:: buffer(data, rate)\n\n"
 			 "   Creates a sound from a data buffer.\n\n"
 			 "   :arg data: The data as two dimensional numpy array.\n"
-			 "   :type data: :class:`numpy.ndarray`\n"
+			 "   :type data: numpy.ndarray\n"
 			 "   :arg rate: The sample rate.\n"
 			 "   :type rate: double\n"
 			 "   :return: The created :class:`Sound` object.\n"
@@ -408,9 +407,8 @@ static PyObject *
 Sound_file(PyTypeObject* type, PyObject* args)
 {
 	const char* filename = nullptr;
-	int stream = 0;

-	if(!PyArg_ParseTuple(args, "s|i:file", &filename, &stream))
+	if(!PyArg_ParseTuple(args, "s:file", &filename))
 		return nullptr;

 	Sound* self;
@@ -420,7 +418,7 @@ Sound_file(PyTypeObject* type, PyObject* args)
 	{
 		try
 		{
-			self->sound = new std::shared_ptr<ISound>(new File(filename, stream));
+			self->sound = new std::shared_ptr<ISound>(new File(filename));
 		}
 		catch(Exception& e)
 		{
--- a/extern/audaspace/bindings/python/setup.py.in
+++ b/extern/audaspace/bindings/python/setup.py.in
@@ -8,20 +8,20 @@ import numpy
 from distutils.core import setup, Extension

 if len(sys.argv) > 2 and sys.argv[1] == '--build-docs':
-    import subprocess
-    from distutils.core import Distribution
-    from distutils.command.build import build
+	import subprocess
+	from distutils.core import Distribution
+	from distutils.command.build import build

-    dist = Distribution()
-    cmd = build(dist)
-    cmd.finalize_options()
-    #print(cmd.build_platlib)
+	dist = Distribution()
+	cmd = build(dist)
+	cmd.finalize_options()
+	#print(cmd.build_platlib)

-    os.environ['PYTHONPATH'] = os.path.join(os.getcwd(), cmd.build_platlib)
-    os.environ['LD_LIBRARY_PATH'] = os.getcwd()
+	os.environ['PYTHONPATH'] = os.path.join(os.getcwd(), cmd.build_platlib)
+	os.environ['LD_LIBRARY_PATH'] = os.getcwd()

-    ret = subprocess.call(sys.argv[2:])
-    sys.exit(ret)
+	ret = subprocess.call(sys.argv[2:])
+	sys.exit(ret)


 # the following line is not working due to https://bugs.python.org/issue9023
@@ -43,8 +43,7 @@ audaspace = Extension(
                      library_dirs = ['.', 'Release', 'Debug'],
                      language = 'c++',
                      extra_compile_args = extra_args,
-                      define_macros = [('WITH_CONVOLUTION', None)] if '@WITH_FFTW@' == 'ON' else [],
-                      sources = [os.path.join(source_directory, file) for file in ['PyAPI.cpp', 'PyDevice.cpp', 'PyHandle.cpp', 'PySound.cpp', 'PySequenceEntry.cpp', 'PySequence.cpp', 'PyPlaybackManager.cpp', 'PyDynamicMusic.cpp', 'PyThreadPool.cpp', 'PySource.cpp'] + (['PyImpulseResponse.cpp', 'PyHRTF.cpp'] if '@WITH_FFTW@' == 'ON' else [])]
+					  sources = [os.path.join(source_directory, file) for file in ['PyAPI.cpp', 'PyDevice.cpp', 'PyHandle.cpp', 'PySound.cpp', 'PySequenceEntry.cpp', 'PySequence.cpp', 'PyPlaybackManager.cpp', 'PyDynamicMusic.cpp', 'PyThreadPool.cpp', 'PySource.cpp'] + (['PyImpulseResponse.cpp', 'PyHRTF.cpp'] if '@WITH_FFTW@' == 'ON' else [])]
 )

 setup(
@@ -57,6 +56,6 @@ setup(
      license = 'Apache License 2.0',
      long_description = codecs.open(os.path.join(source_directory, '../../README.md'), 'r', 'utf-8').read(),
      ext_modules = [audaspace],
-      headers = [os.path.join(source_directory, file) for file in ['PyAPI.h', 'PyDevice.h', 'PyHandle.h', 'PySound.h', 'PySequenceEntry.h', 'PySequence.h', 'PyPlaybackManager.h', 'PyDynamicMusic.h', 'PyThreadPool.h', 'PySource.h'] + (['PyImpulseResponse.h', 'PyHRTF.h'] if '@WITH_FFTW@' == 'ON' else [])] + ['Audaspace.h']
+	  headers = [os.path.join(source_directory, file) for file in ['PyAPI.h', 'PyDevice.h', 'PyHandle.h', 'PySound.h', 'PySequenceEntry.h', 'PySequence.h', 'PyPlaybackManager.h', 'PyDynamicMusic.h', 'PyThreadPool.h', 'PySource.h'] + (['PyImpulseResponse.h', 'PyHRTF.h'] if '@WITH_FFTW@' == 'ON' else [])] + ['Audaspace.h']
 )

--- a/extern/audaspace/include/IReader.h
+++ b/extern/audaspace/include/IReader.h
@@ -70,6 +70,12 @@ public:
 	 */
 	virtual int getPosition() const=0;

+	/**
+	 * Returns the start offset the sound should have to line up with related sources.
+	 * \return The required start offset in seconds.
+	 */
+	virtual double getStartOffset() const { return 0.0;}
+
 	/**
 	 * Returns the specification of the reader.
 	 * \return The Specs structure.
--- a/extern/audaspace/include/file/File.h
+++ b/extern/audaspace/include/file/File.h
@@ -23,11 +23,9 @@
 */

 #include "ISound.h"
-#include "FileInfo.h"

 #include <string>
 #include <memory>
-#include <vector>

 AUD_NAMESPACE_BEGIN

@@ -50,14 +48,6 @@ private:
 	 */
 	std::shared_ptr<Buffer> m_buffer;

-	/**
-	 * The index of the stream within the file if it contains multiple.
-	 * The first audio stream in the file has index 0 and the index increments by one
-	 * for every other audio stream in the file. Other types of streams in the file
-	 * do not count.
-	 */
-	int m_stream;
-
 	// delete copy constructor and operator=
 	File(const File&) = delete;
 	File& operator=(const File&) = delete;
@@ -67,25 +57,16 @@ public:
 	 * Creates a new sound.
 	 * The file is read from the file system using the given path.
 	 * \param filename The sound file path.
-	 * \param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 */
-	File(std::string filename, int stream = 0);
+	File(std::string filename);

 	/**
 	 * Creates a new sound.
 	 * The file is read from memory using the supplied buffer.
 	 * \param buffer The buffer to read from.
 	 * \param size The size of the buffer.
-	 * \param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 */
-	File(const data_t* buffer, int size, int stream = 0);
-
-	/**
-	 * Queries the streams of the file.
-	 * \return A vector with as many streams as there are in the file.
-	 * \exception Exception Thrown if the file specified cannot be read.
-	 */
-	std::vector<StreamInfo> queryStreams();
+	File(const data_t* buffer, int size);

 	virtual std::shared_ptr<IReader> createReader();
 };
--- a/extern/audaspace/include/file/FileInfo.h
+++ b/extern/audaspace/include/file/FileInfo.h
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright 2009-2016 Jörg Müller
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-#pragma once
-
-/**
- * @file FileInfo.h
- * @ingroup file
- * The FileInfo data structures.
- */
-
-#include "respec/Specification.h"
-
-AUD_NAMESPACE_BEGIN
-
-/// Specification of a sound source.
-struct StreamInfo
-{
-	/// Start time in seconds.
-	double start;
-
-	/// Duration in seconds. May be estimated or 0 if unknown.
-	double duration;
-
-	/// Audio data parameters.
-	DeviceSpecs specs;
-};
-
-AUD_NAMESPACE_END
--- a/extern/audaspace/include/file/FileManager.h
+++ b/extern/audaspace/include/file/FileManager.h
@@ -22,14 +22,12 @@
 * The FileManager class.
 */

-#include "FileInfo.h"
 #include "respec/Specification.h"
 #include "IWriter.h"

 #include <list>
 #include <memory>
 #include <string>
-#include <vector>

 AUD_NAMESPACE_BEGIN

@@ -68,36 +66,18 @@ public:
 	/**
 	 * Creates a file reader for the given filename if a registed IFileInput is able to read it.
 	 * @param filename The path to the file.
-	 * @param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 * @return The reader created.
 	 * @exception Exception If no file input can read the file an exception is thrown.
 	 */
-	static std::shared_ptr<IReader> createReader(std::string filename, int stream = 0);
+	static std::shared_ptr<IReader> createReader(std::string filename);

 	/**
 	 * Creates a file reader for the given buffer if a registed IFileInput is able to read it.
 	 * @param buffer The buffer to read the file from.
-	 * @param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 * @return The reader created.
 	 * @exception Exception If no file input can read the file an exception is thrown.
 	 */
-	static std::shared_ptr<IReader> createReader(std::shared_ptr<Buffer> buffer, int stream = 0);
-
-	/**
-	 * Queries the streams of a sound file.
-	 * \param filename Path to the file to be read.
-	 * \return A vector with as many streams as there are in the file.
-	 * \exception Exception Thrown if the file specified cannot be read.
-	 */
-	static std::vector<StreamInfo> queryStreams(std::string filename);
-
-	/**
-	 * Queries the streams of a sound file.
-	 * \param buffer The in-memory file buffer.
-	 * \return A vector with as many streams as there are in the file.
-	 * \exception Exception Thrown if the file specified cannot be read.
-	 */
-	static std::vector<StreamInfo> queryStreams(std::shared_ptr<Buffer> buffer);
+	static std::shared_ptr<IReader> createReader(std::shared_ptr<Buffer> buffer);

 	/**
 	 * Creates a file writer that writes a sound to the given file path.
--- a/extern/audaspace/include/file/IFileInput.h
+++ b/extern/audaspace/include/file/IFileInput.h
@@ -23,11 +23,9 @@
 */

 #include "Audaspace.h"
-#include "FileInfo.h"

 #include <memory>
 #include <string>
-#include <vector>

 AUD_NAMESPACE_BEGIN

@@ -50,36 +48,18 @@ public:
 	/**
 	 * Creates a reader for a file to be read.
 	 * \param filename Path to the file to be read.
-	 * \param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 * \return The reader that reads the file.
 	 * \exception Exception Thrown if the file specified cannot be read.
 	 */
-	virtual std::shared_ptr<IReader> createReader(std::string filename, int stream = 0)=0;
+	virtual std::shared_ptr<IReader> createReader(std::string filename)=0;

 	/**
 	 * Creates a reader for a file to be read from memory.
 	 * \param buffer The in-memory file buffer.
-	 * \param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 * \return The reader that reads the file.
 	 * \exception Exception Thrown if the file specified cannot be read.
 	 */
-	virtual std::shared_ptr<IReader> createReader(std::shared_ptr<Buffer> buffer, int stream = 0)=0;
-
-	/**
-	 * Queries the streams of a sound file.
-	 * \param filename Path to the file to be read.
-	 * \return A vector with as many streams as there are in the file.
-	 * \exception Exception Thrown if the file specified cannot be read.
-	 */
-	virtual std::vector<StreamInfo> queryStreams(std::string filename)=0;
-
-	/**
-	 * Queries the streams of a sound file.
-	 * \param buffer The in-memory file buffer.
-	 * \return A vector with as many streams as there are in the file.
-	 * \exception Exception Thrown if the file specified cannot be read.
-	 */
-	virtual std::vector<StreamInfo> queryStreams(std::shared_ptr<Buffer> buffer)=0;
+	virtual std::shared_ptr<IReader> createReader(std::shared_ptr<Buffer> buffer)=0;
 };

 AUD_NAMESPACE_END
--- a/extern/audaspace/include/fx/VolumeReader.h
+++ b/extern/audaspace/include/fx/VolumeReader.h
@@ -67,4 +67,4 @@ public:
 	virtual void read(int& length, bool& eos, sample_t* buffer);
 };

-AUD_NAMESPACE_END
+AUD_NAMESPACE_END
--- a/extern/audaspace/include/util/RingBuffer.h
+++ b/extern/audaspace/include/util/RingBuffer.h
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright 2009-2021 Jörg Müller
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-#pragma once
-
-/**
- * @file RingBuffer.h
- * @ingroup util
- * The RingBuffer class.
- */
-
-#include "Audaspace.h"
-#include "Buffer.h"
-
-#include <cstddef>
-
-AUD_NAMESPACE_BEGIN
-
-/**
- * This class is a simple ring buffer in RAM which is 32 Byte aligned and provides
- * functionality for concurrent reading and writting without locks.
- */
-class AUD_API RingBuffer
-{
-private:
-	/// The buffer storing the actual data.
-	Buffer m_buffer;
-
-	/// The reading pointer.
-	volatile size_t m_read;
-
-	/// The writing pointer.
-	volatile size_t m_write;
-
-	// delete copy constructor and operator=
-	RingBuffer(const RingBuffer&) = delete;
-	RingBuffer& operator=(const RingBuffer&) = delete;
-
-public:
-	/**
-	 * Creates a new ring buffer.
-	 * \param size The size of the buffer in bytes.
-	 */
-	RingBuffer(int size = 0);
-
-	/**
-	 * Returns the pointer to the ring buffer in memory.
-	 */
-	sample_t* getBuffer() const;
-
-	/**
-	 * Returns the size of the ring buffer in bytes.
-	 */
-	int getSize() const;
-
-	size_t getReadSize() const;
-
-	size_t getWriteSize() const;
-
-	size_t read(data_t* target, size_t size);
-
-	size_t write(data_t* source, size_t size);
-
-	/**
-	 * Resets the ring buffer to a state where nothing has been written or read.
-	 */
-	void reset();
-
-	/**
-	 * Resizes the ring buffer.
-	 * \param size The new size of the ring buffer, measured in bytes.
-	 */
-	void resize(int size);
-
-	/**
-	 * Makes sure the ring buffer has a minimum size.
-	 * If size is >= current size, nothing will happen.
-	 * Otherwise the ring buffer is resized with keep as parameter.
-	 * \param size The new minimum size of the ring buffer, measured in bytes.
-	 */
-	void assureSize(int size);
-};
-
-AUD_NAMESPACE_END
--- a/extern/audaspace/plugins/ffmpeg/FFMPEG.cpp
+++ b/extern/audaspace/plugins/ffmpeg/FFMPEG.cpp
@@ -35,24 +35,14 @@ void FFMPEG::registerPlugin()
 	FileManager::registerOutput(plugin);
 }

-std::shared_ptr<IReader> FFMPEG::createReader(std::string filename, int stream)
+std::shared_ptr<IReader> FFMPEG::createReader(std::string filename)
 {
-	return std::shared_ptr<IReader>(new FFMPEGReader(filename, stream));
+	return std::shared_ptr<IReader>(new FFMPEGReader(filename));
 }

-std::shared_ptr<IReader> FFMPEG::createReader(std::shared_ptr<Buffer> buffer, int stream)
+std::shared_ptr<IReader> FFMPEG::createReader(std::shared_ptr<Buffer> buffer)
 {
-	return std::shared_ptr<IReader>(new FFMPEGReader(buffer, stream));
-}
-
-std::vector<StreamInfo> FFMPEG::queryStreams(std::string filename)
-{
-	return FFMPEGReader(filename).queryStreams();
-}
-
-std::vector<StreamInfo> FFMPEG::queryStreams(std::shared_ptr<Buffer> buffer)
-{
-	return FFMPEGReader(buffer).queryStreams();
+	return std::shared_ptr<IReader>(new FFMPEGReader(buffer));
 }

 std::shared_ptr<IWriter> FFMPEG::createWriter(std::string filename, DeviceSpecs specs, Container format, Codec codec, unsigned int bitrate)
--- a/extern/audaspace/plugins/ffmpeg/FFMPEG.h
+++ b/extern/audaspace/plugins/ffmpeg/FFMPEG.h
@@ -52,10 +52,8 @@ public:
 	 */
 	static void registerPlugin();

-	virtual std::shared_ptr<IReader> createReader(std::string filename, int stream = 0);
-	virtual std::shared_ptr<IReader> createReader(std::shared_ptr<Buffer> buffer, int stream = 0);
-	virtual std::vector<StreamInfo> queryStreams(std::string filename);
-	virtual std::vector<StreamInfo> queryStreams(std::shared_ptr<Buffer> buffer);
+	virtual std::shared_ptr<IReader> createReader(std::string filename);
+	virtual std::shared_ptr<IReader> createReader(std::shared_ptr<Buffer> buffer);
 	virtual std::shared_ptr<IWriter> createWriter(std::string filename, DeviceSpecs specs, Container format, Codec codec, unsigned int bitrate);
 };

--- a/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
+++ b/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
@@ -31,25 +31,6 @@ AUD_NAMESPACE_BEGIN
 #define FFMPEG_OLD_CODE
 #endif

-SampleFormat FFMPEGReader::convertSampleFormat(AVSampleFormat format)
-{
-	switch(av_get_packed_sample_fmt(format))
-	{
-	case AV_SAMPLE_FMT_U8:
-		return FORMAT_U8;
-	case AV_SAMPLE_FMT_S16:
-		return FORMAT_S16;
-	case AV_SAMPLE_FMT_S32:
-		return FORMAT_S32;
-	case AV_SAMPLE_FMT_FLT:
-		return FORMAT_FLOAT32;
-	case AV_SAMPLE_FMT_DBL:
-		return FORMAT_FLOAT64;
-	default:
-		AUD_THROW(FileException, "FFMPEG sample format unknown.");
-	}
-}
-
 int FFMPEGReader::decode(AVPacket& packet, Buffer& buffer)
 {
 	int buf_size = buffer.getSize();
@@ -87,7 +68,7 @@ int FFMPEGReader::decode(AVPacket& packet, Buffer& buffer)
 					for(int i = 0; i < m_frame->nb_samples; i++)
 					{
 						std::memcpy(((data_t*)buffer.getBuffer()) + buf_pos + ((m_codecCtx->channels * i) + channel) * single_size,
-							   m_frame->data[channel] + i * single_size, single_size);
+								 m_frame->data[channel] + i * single_size, single_size);
 					}
 				}
 			}
@@ -128,7 +109,7 @@ int FFMPEGReader::decode(AVPacket& packet, Buffer& buffer)
 				for(int i = 0; i < m_frame->nb_samples; i++)
 				{
 					std::memcpy(((data_t*)buffer.getBuffer()) + buf_pos + ((m_codecCtx->channels * i) + channel) * single_size,
-						   m_frame->data[channel] + i * single_size, single_size);
+							 m_frame->data[channel] + i * single_size, single_size);
 				}
 			}
 		}
@@ -142,10 +123,13 @@ int FFMPEGReader::decode(AVPacket& packet, Buffer& buffer)
 	return buf_pos;
 }

-void FFMPEGReader::init(int stream)
+void FFMPEGReader::init()
 {
 	m_position = 0;
+	m_start_offset = 0.0f;
 	m_pkgbuf_left = 0;
+	m_st_time = 0;
+	m_duration = 0;

 	if(avformat_find_stream_info(m_formatCtx, nullptr) < 0)
 		AUD_THROW(FileException, "File couldn't be read, ffmpeg couldn't find the stream info.");
@@ -153,22 +137,43 @@ void FFMPEGReader::init(int stream)
 	// find audio stream and codec
 	m_stream = -1;

+	double dur_sec = 0;
+
 	for(unsigned int i = 0; i < m_formatCtx->nb_streams; i++)
 	{
 #ifdef FFMPEG_OLD_CODE
-		if((m_formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+		if(m_formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
 #else
-		if((m_formatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
+		if(m_formatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
 #endif
-			&& (m_stream < 0))
 		{
-			if(stream == 0)
+			AVStream *audio_stream = m_formatCtx->streams[i];
+			double audio_timebase = av_q2d(audio_stream->time_base);
+
+			if (audio_stream->start_time != AV_NOPTS_VALUE)
 			{
-				m_stream=i;
-				break;
+				m_st_time = audio_stream->start_time;
+			}
+
+			int64_t ctx_start_time = 0;
+			if (m_formatCtx->start_time != AV_NOPTS_VALUE) {
+				ctx_start_time = m_formatCtx->start_time;
+			}
+
+			m_start_offset = m_st_time * audio_timebase - (double)ctx_start_time / AV_TIME_BASE;
+
+			if(audio_stream->duration != AV_NOPTS_VALUE)
+			{
+				dur_sec = audio_stream->duration * audio_timebase;
 			}
 			else
-				stream--;
+			{
+				/* If the audio starts after the stream start time, subract this from the total duration. */
+				dur_sec = (double)m_formatCtx->duration / AV_TIME_BASE - m_start_offset;
+			}
+
+			m_stream=i;
+			break;
 		}
 	}

@@ -237,9 +242,10 @@ void FFMPEGReader::init(int stream)
 	}

 	m_specs.rate = (SampleRate) m_codecCtx->sample_rate;
+	m_duration = lround(dur_sec * m_codecCtx->sample_rate);
 }

-FFMPEGReader::FFMPEGReader(std::string filename, int stream) :
+FFMPEGReader::FFMPEGReader(std::string filename) :
 	m_pkgbuf(),
 	m_formatCtx(nullptr),
 	m_codecCtx(nullptr),
@@ -253,7 +259,7 @@ FFMPEGReader::FFMPEGReader(std::string filename, int stream) :

 	try
 	{
-		init(stream);
+		init();
 	}
 	catch(Exception&)
 	{
@@ -262,7 +268,7 @@ FFMPEGReader::FFMPEGReader(std::string filename, int stream) :
 	}
 }

-FFMPEGReader::FFMPEGReader(std::shared_ptr<Buffer> buffer, int stream) :
+FFMPEGReader::FFMPEGReader(std::shared_ptr<Buffer> buffer) :
 		m_pkgbuf(),
 		m_codecCtx(nullptr),
 		m_frame(nullptr),
@@ -289,7 +295,7 @@ FFMPEGReader::FFMPEGReader(std::shared_ptr<Buffer> buffer, int stream) :

 	try
 	{
-		init(stream);
+		init();
 	}
 	catch(Exception&)
 	{
@@ -312,51 +318,6 @@ FFMPEGReader::~FFMPEGReader()
 	avformat_close_input(&m_formatCtx);
 }

-std::vector<StreamInfo> FFMPEGReader::queryStreams()
-{
-	std::vector<StreamInfo> result;
-
-	for(unsigned int i = 0; i < m_formatCtx->nb_streams; i++)
-	{
-#ifdef FFMPEG_OLD_CODE
-		if(m_formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
-#else
-		if(m_formatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
-#endif
-		{
-			StreamInfo info;
-
-			double time_base = av_q2d(m_formatCtx->streams[i]->time_base);
-
-			if(m_formatCtx->streams[i]->start_time != AV_NOPTS_VALUE)
-				info.start = m_formatCtx->streams[i]->start_time * time_base;
-			else
-				info.start = 0;
-
-			if(m_formatCtx->streams[i]->duration != AV_NOPTS_VALUE)
-				info.duration = m_formatCtx->streams[i]->duration * time_base;
-			else if(m_formatCtx->duration != AV_NOPTS_VALUE)
-				info.duration = double(m_formatCtx->duration) / AV_TIME_BASE - info.start;
-			else
-				info.duration = 0;
-
-#ifdef FFMPEG_OLD_CODE
-			info.specs.channels = Channels(m_formatCtx->streams[i]->codec->channels);
-			info.specs.rate = m_formatCtx->streams[i]->codec->sample_rate;
-			info.specs.format = convertSampleFormat(m_formatCtx->streams[i]->codec->sample_fmt);
-#else
-			info.specs.channels = Channels(m_formatCtx->streams[i]->codecpar->channels);
-			info.specs.rate = m_formatCtx->streams[i]->codecpar->sample_rate;
-			info.specs.format = convertSampleFormat(AVSampleFormat(m_formatCtx->streams[i]->codecpar->format));
-#endif
-
-			result.emplace_back(info);
-		}
-	}
-
-	return result;
-}
-
 int FFMPEGReader::read_packet(void* opaque, uint8_t* buf, int buf_size)
 {
 	FFMPEGReader* reader = reinterpret_cast<FFMPEGReader*>(opaque);
@@ -407,16 +368,18 @@ void FFMPEGReader::seek(int position)
 {
 	if(position >= 0)
 	{
-		double pts_time_base = av_q2d(m_formatCtx->streams[m_stream]->time_base);
+		double pts_time_base =
+			av_q2d(m_formatCtx->streams[m_stream]->time_base);

-		uint64_t st_time = m_formatCtx->streams[m_stream]->start_time;
-		uint64_t seek_pos = (uint64_t)(position / (pts_time_base * m_specs.rate));
+		uint64_t seek_pts = (((uint64_t)position) / ((uint64_t)m_specs.rate)) / pts_time_base;

-		if(st_time != AV_NOPTS_VALUE)
-			seek_pos += st_time;
+		if(m_st_time != AV_NOPTS_VALUE) {
+			seek_pts += m_st_time;
+		}

 		// a value < 0 tells us that seeking failed
-		if(av_seek_frame(m_formatCtx, m_stream, seek_pos, AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_ANY) >= 0)
+		if(av_seek_frame(m_formatCtx, m_stream, seek_pts,
+				 AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_ANY) >= 0)
 		{
 			avcodec_flush_buffers(m_codecCtx);
 			m_position = position;
@@ -437,7 +400,7 @@ void FFMPEGReader::seek(int position)
 					if(packet.pts != AV_NOPTS_VALUE)
 					{
 						// calculate real position, and read to frame!
-						m_position = (packet.pts - (st_time != AV_NOPTS_VALUE ? st_time : 0)) * pts_time_base * m_specs.rate;
+						m_position = (packet.pts - m_st_time) * pts_time_base * m_specs.rate;

 						if(m_position < position)
 						{
@@ -467,25 +430,8 @@ void FFMPEGReader::seek(int position)

 int FFMPEGReader::getLength() const
 {
-	auto stream = m_formatCtx->streams[m_stream];
-
-	double time_base = av_q2d(stream->time_base);
-	double duration;
-
-	if(stream->duration != AV_NOPTS_VALUE)
-		duration = stream->duration * time_base;
-	else if(m_formatCtx->duration != AV_NOPTS_VALUE)
-	{
-		duration = float(m_formatCtx->duration) / AV_TIME_BASE;
-
-		if(stream->start_time != AV_NOPTS_VALUE)
-			duration -= stream->start_time * time_base;
-	}
-	else
-		duration = -1;
-
 	// return approximated remaning size
-	return (int)(duration * m_codecCtx->sample_rate) - m_position;
+	return m_duration - m_position;
 }

 int FFMPEGReader::getPosition() const
@@ -493,6 +439,11 @@ int FFMPEGReader::getPosition() const
 	return m_position;
 }

+double FFMPEGReader::getStartOffset() const
+{
+	return m_start_offset;
+}
+
 Specs FFMPEGReader::getSpecs() const
 {
 	return m_specs.specs;
@@ -529,11 +480,13 @@ void FFMPEGReader::read(int& length, bool& eos, sample_t* buffer)
 			// decode the package
 			pkgbuf_pos = decode(packet, m_pkgbuf);

-			// copy to output buffer
-			data_size = std::min(pkgbuf_pos, left * sample_size);
-			m_convert((data_t*) buf, (data_t*) m_pkgbuf.getBuffer(), data_size / AUD_FORMAT_SIZE(m_specs.format));
-			buf += data_size / AUD_FORMAT_SIZE(m_specs.format);
-			left -= data_size / sample_size;
+			if (packet.pts >= m_st_time) {
+				// copy to output buffer
+				data_size = std::min(pkgbuf_pos, left * sample_size);
+				m_convert((data_t*) buf, (data_t*) m_pkgbuf.getBuffer(), data_size / AUD_FORMAT_SIZE(m_specs.format));
+				buf += data_size / AUD_FORMAT_SIZE(m_specs.format);
+				left -= data_size / sample_size;
+			}
 		}
 		av_packet_unref(&packet);
 	}
--- a/extern/audaspace/plugins/ffmpeg/FFMPEGReader.h
+++ b/extern/audaspace/plugins/ffmpeg/FFMPEGReader.h
@@ -29,11 +29,9 @@
 #include "respec/ConverterFunctions.h"
 #include "IReader.h"
 #include "util/Buffer.h"
-#include "file/FileInfo.h"

 #include <string>
 #include <memory>
-#include <vector>

 struct AVCodecContext;
 extern "C" {
@@ -56,6 +54,22 @@ private:
 	 */
 	int m_position;

+	/**
+	 * The start offset in seconds relative to the media container start time.
+	 * IE how much the sound should be delayed to be kept in sync with the rest of the containter streams.
+	 */
+	double m_start_offset;
+
+	/**
+	 * The start time pts of the stream. All packets before this timestamp shouldn't be played back (only decoded).
+	 */
+	int64_t m_st_time;
+
+	/**
+	 * The duration of the audio stream in samples.
+	 */
+	int64_t m_duration;
+
 	/**
 	 * The specification of the audio data.
 	 */
@@ -121,13 +135,6 @@ private:
 	 */
 	bool m_tointerleave;

-	/**
-	 * Converts an ffmpeg sample format to an audaspace one.
-	 * \param format The AVSampleFormat sample format.
-	 * \return The sample format as SampleFormat.
-	 */
-	AUD_LOCAL static SampleFormat convertSampleFormat(AVSampleFormat format);
-
 	/**
 	 * Decodes a packet into the given buffer.
 	 * \param packet The AVPacket to decode.
@@ -138,9 +145,8 @@ private:

 	/**
 	 * Initializes the object.
-	 * \param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 */
-	AUD_LOCAL void init(int stream);
+	AUD_LOCAL void init();

 	// delete copy constructor and operator=
 	FFMPEGReader(const FFMPEGReader&) = delete;
@@ -150,33 +156,24 @@ public:
 	/**
 	 * Creates a new reader.
 	 * \param filename The path to the file to be read.
-	 * \param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 * \exception Exception Thrown if the file specified does not exist or
 	 *            cannot be read with ffmpeg.
 	 */
-	FFMPEGReader(std::string filename, int stream = 0);
+	FFMPEGReader(std::string filename);

 	/**
 	 * Creates a new reader.
 	 * \param buffer The buffer to read from.
-	 * \param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 * \exception Exception Thrown if the buffer specified cannot be read
 	 *                          with ffmpeg.
 	 */
-	FFMPEGReader(std::shared_ptr<Buffer> buffer, int stream = 0);
+	FFMPEGReader(std::shared_ptr<Buffer> buffer);

 	/**
 	 * Destroys the reader and closes the file.
 	 */
 	virtual ~FFMPEGReader();

-	/**
-	 * Queries the streams of a sound file.
-	 * \return A vector with as many streams as there are in the file.
-	 * \exception Exception Thrown if the file specified cannot be read.
-	 */
-	virtual std::vector<StreamInfo> queryStreams();
-
 	/**
 	 * Reads data to a memory buffer.
 	 * This function is used for avio only.
@@ -201,6 +198,7 @@ public:
 	virtual void seek(int position);
 	virtual int getLength() const;
 	virtual int getPosition() const;
+	virtual double getStartOffset() const;
 	virtual Specs getSpecs() const;
 	virtual void read(int& length, bool& eos, sample_t* buffer);
 };
--- a/extern/audaspace/plugins/libsndfile/SndFile.cpp
+++ b/extern/audaspace/plugins/libsndfile/SndFile.cpp
@@ -32,26 +32,16 @@ void SndFile::registerPlugin()
 	FileManager::registerOutput(plugin);
 }

-std::shared_ptr<IReader> SndFile::createReader(std::string filename, int stream)
+std::shared_ptr<IReader> SndFile::createReader(std::string filename)
 {
 	return std::shared_ptr<IReader>(new SndFileReader(filename));
 }

-std::shared_ptr<IReader> SndFile::createReader(std::shared_ptr<Buffer> buffer, int stream)
+std::shared_ptr<IReader> SndFile::createReader(std::shared_ptr<Buffer> buffer)
 {
 	return std::shared_ptr<IReader>(new SndFileReader(buffer));
 }

-std::vector<StreamInfo> SndFile::queryStreams(std::string filename)
-{
-	return SndFileReader(filename).queryStreams();
-}
-
-std::vector<StreamInfo> SndFile::queryStreams(std::shared_ptr<Buffer> buffer)
-{
-	return SndFileReader(buffer).queryStreams();
-}
-
 std::shared_ptr<IWriter> SndFile::createWriter(std::string filename, DeviceSpecs specs, Container format, Codec codec, unsigned int bitrate)
 {
 	return std::shared_ptr<IWriter>(new SndFileWriter(filename, specs, format, codec, bitrate));
--- a/extern/audaspace/plugins/libsndfile/SndFile.h
+++ b/extern/audaspace/plugins/libsndfile/SndFile.h
@@ -52,10 +52,8 @@ public:
 	 */
 	static void registerPlugin();

-	virtual std::shared_ptr<IReader> createReader(std::string filename, int stream = 0);
-	virtual std::shared_ptr<IReader> createReader(std::shared_ptr<Buffer> buffer, int stream = 0);
-	virtual std::vector<StreamInfo> queryStreams(std::string filename);
-	virtual std::vector<StreamInfo> queryStreams(std::shared_ptr<Buffer> buffer);
+	virtual std::shared_ptr<IReader> createReader(std::string filename);
+	virtual std::shared_ptr<IReader> createReader(std::shared_ptr<Buffer> buffer);
 	virtual std::shared_ptr<IWriter> createWriter(std::string filename, DeviceSpecs specs, Container format, Codec codec, unsigned int bitrate);
 };

--- a/extern/audaspace/plugins/libsndfile/SndFileReader.cpp
+++ b/extern/audaspace/plugins/libsndfile/SndFileReader.cpp
@@ -118,21 +118,6 @@ SndFileReader::~SndFileReader()
 	sf_close(m_sndfile);
 }

-std::vector<StreamInfo> SndFileReader::queryStreams()
-{
-	std::vector<StreamInfo> result;
-
-	StreamInfo info;
-	info.start = 0;
-	info.duration = double(getLength()) / m_specs.rate;
-	info.specs.specs = m_specs;
-	info.specs.format = FORMAT_FLOAT32;
-
-	result.emplace_back(info);
-
-	return result;
-}
-
 bool SndFileReader::isSeekable() const
 {
 	return m_seekable;
--- a/extern/audaspace/plugins/libsndfile/SndFileReader.h
+++ b/extern/audaspace/plugins/libsndfile/SndFileReader.h
@@ -28,12 +28,9 @@
 * The SndFileReader class.
 */

-#include "file/FileInfo.h"
-
 #include <string>
 #include <sndfile.h>
 #include <memory>
-#include <vector>

 AUD_NAMESPACE_BEGIN

@@ -99,7 +96,6 @@ public:
 	/**
 	 * Creates a new reader.
 	 * \param filename The path to the file to be read.
-	 * \param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 * \exception Exception Thrown if the file specified does not exist or
 	 *            cannot be read with libsndfile.
 	 */
@@ -108,7 +104,6 @@ public:
 	/**
 	 * Creates a new reader.
 	 * \param buffer The buffer to read from.
-	 * \param stream The index of the audio stream within the file if it contains multiple audio streams.
 	 * \exception Exception Thrown if the buffer specified cannot be read
 	 *                          with libsndfile.
 	 */
@@ -119,13 +114,6 @@ public:
 	 */
 	virtual ~SndFileReader();

-	/**
-	 * Queries the streams of a sound file.
-	 * \return A vector with as many streams as there are in the file.
-	 * \exception Exception Thrown if the file specified cannot be read.
-	 */
-	virtual std::vector<StreamInfo> queryStreams();
-
 	virtual bool isSeekable() const;
 	virtual void seek(int position);
 	virtual int getLength() const;
--- a/extern/audaspace/plugins/pulseaudio/PulseAudioDevice.cpp
+++ b/extern/audaspace/plugins/pulseaudio/PulseAudioDevice.cpp
@@ -23,121 +23,95 @@

 AUD_NAMESPACE_BEGIN

-PulseAudioDevice::PulseAudioSynchronizer::PulseAudioSynchronizer(PulseAudioDevice *device) :
-	m_device(device)
-{
-}
-
-double PulseAudioDevice::PulseAudioSynchronizer::getPosition(std::shared_ptr<IHandle> handle)
-{
-	pa_usec_t latency;
-	int negative;
-	AUD_pa_stream_get_latency(m_device->m_stream, &latency, &negative);
-
-	double delay = m_device->m_ring_buffer.getReadSize() / (AUD_SAMPLE_SIZE(m_device->m_specs) * m_device->m_specs.rate) + latency * 1.0e-6;
-
-	return handle->getPosition() - delay;
-}
-
-void PulseAudioDevice::updateRingBuffer()
-{
-	unsigned int samplesize = AUD_SAMPLE_SIZE(m_specs);
-
-	std::unique_lock<std::mutex> lock(m_mixingLock);
-
-	Buffer buffer;
-
-	while(m_valid)
-	{
-		size_t size = m_ring_buffer.getWriteSize();
-
-		size_t sample_count = size / samplesize;
-
-		if(sample_count > 0)
-		{
-			size = sample_count * samplesize;
-
-			buffer.assureSize(size);
-
-			mix(reinterpret_cast<data_t*>(buffer.getBuffer()), sample_count);
-
-			m_ring_buffer.write(reinterpret_cast<data_t*>(buffer.getBuffer()), size);
-		}
-
-		m_mixingCondition.wait(lock);
-	}
-}
-
 void PulseAudioDevice::PulseAudio_state_callback(pa_context *context, void *data)
 {
 	PulseAudioDevice* device = (PulseAudioDevice*)data;

-	device->m_state = AUD_pa_context_get_state(context);
+	std::lock_guard<ILockable> lock(*device);

-	AUD_pa_threaded_mainloop_signal(device->m_mainloop, 0);
+	device->m_state = AUD_pa_context_get_state(context);
 }

 void PulseAudioDevice::PulseAudio_request(pa_stream *stream, size_t total_bytes, void *data)
 {
 	PulseAudioDevice* device = (PulseAudioDevice*)data;

-	data_t* buffer;
-
-	size_t sample_size = AUD_DEVICE_SAMPLE_SIZE(device->m_specs);
+	void* buffer;

 	while(total_bytes > 0)
 	{
 		size_t num_bytes = total_bytes;

-		AUD_pa_stream_begin_write(stream, reinterpret_cast<void**>(&buffer), &num_bytes);
+		AUD_pa_stream_begin_write(stream, &buffer, &num_bytes);

-		size_t readsamples = device->m_ring_buffer.getReadSize();
+		device->mix((data_t*)buffer, num_bytes / AUD_DEVICE_SAMPLE_SIZE(device->m_specs));

-		readsamples = std::min(readsamples, size_t(num_bytes)) / sample_size;
-
-		device->m_ring_buffer.read(buffer, readsamples * sample_size);
-
-		if(readsamples * sample_size < num_bytes)
-			std::memset(buffer + readsamples * sample_size, 0, num_bytes - readsamples * sample_size);
-
-		if(device->m_mixingLock.try_lock())
-		{
-			device->m_mixingCondition.notify_all();
-			device->m_mixingLock.unlock();
-		}
-
-		AUD_pa_stream_write(stream, reinterpret_cast<void*>(buffer), num_bytes, nullptr, 0, PA_SEEK_RELATIVE);
+		AUD_pa_stream_write(stream, buffer, num_bytes, nullptr, 0, PA_SEEK_RELATIVE);

 		total_bytes -= num_bytes;
 	}
 }

-void PulseAudioDevice::playing(bool playing)
+void PulseAudioDevice::PulseAudio_underflow(pa_stream *stream, void *data)
 {
-	m_playback = playing;
+	PulseAudioDevice* device = (PulseAudioDevice*)data;

-	AUD_pa_threaded_mainloop_lock(m_mainloop);
-	AUD_pa_stream_cork(m_stream, playing ? 0 : 1, nullptr, nullptr);
-	AUD_pa_threaded_mainloop_unlock(m_mainloop);
+	DeviceSpecs specs = device->getSpecs();
+
+	if(++device->m_underflows > 4 && device->m_buffersize < AUD_DEVICE_SAMPLE_SIZE(specs) * specs.rate * 2)
+	{
+		device->m_buffersize <<= 1;
+		device->m_underflows = 0;
+
+		pa_buffer_attr buffer_attr;
+
+		buffer_attr.fragsize = -1U;
+		buffer_attr.maxlength = -1U;
+		buffer_attr.minreq = -1U;
+		buffer_attr.prebuf = -1U;
+		buffer_attr.tlength = device->m_buffersize;
+
+		AUD_pa_stream_set_buffer_attr(stream, &buffer_attr, nullptr, nullptr);
+	}
+}
+
+void PulseAudioDevice::runMixingThread()
+{
+	for(;;)
+	{
+		{
+			std::lock_guard<ILockable> lock(*this);
+
+			if(shouldStop())
+			{
+				AUD_pa_stream_cork(m_stream, 1, nullptr, nullptr);
+				AUD_pa_stream_flush(m_stream, nullptr, nullptr);
+				doStop();
+				return;
+			}
+		}
+
+		if(AUD_pa_stream_is_corked(m_stream))
+			AUD_pa_stream_cork(m_stream, 0, nullptr, nullptr);
+
+		// similar to AUD_pa_mainloop_iterate(m_mainloop, false, nullptr); except with a longer timeout
+		AUD_pa_mainloop_prepare(m_mainloop, 1 << 14);
+		AUD_pa_mainloop_poll(m_mainloop);
+		AUD_pa_mainloop_dispatch(m_mainloop);
+	}
 }

 PulseAudioDevice::PulseAudioDevice(std::string name, DeviceSpecs specs, int buffersize) :
-	m_synchronizer(this),
-	m_playback(false),
 	m_state(PA_CONTEXT_UNCONNECTED),
-	m_valid(true),
 	m_underflows(0)
 {
-	m_mainloop = AUD_pa_threaded_mainloop_new();
+	m_mainloop = AUD_pa_mainloop_new();

-	AUD_pa_threaded_mainloop_lock(m_mainloop);
-
-	m_context = AUD_pa_context_new(AUD_pa_threaded_mainloop_get_api(m_mainloop), name.c_str());
+	m_context = AUD_pa_context_new(AUD_pa_mainloop_get_api(m_mainloop), name.c_str());

 	if(!m_context)
 	{
-		AUD_pa_threaded_mainloop_unlock(m_mainloop);
-		AUD_pa_threaded_mainloop_free(m_mainloop);
+		AUD_pa_mainloop_free(m_mainloop);

 		AUD_THROW(DeviceException, "Could not connect to PulseAudio.");
 	}
@@ -146,26 +120,21 @@ PulseAudioDevice::PulseAudioDevice(std::string name, DeviceSpecs specs, int buff

 	AUD_pa_context_connect(m_context, nullptr, PA_CONTEXT_NOFLAGS, nullptr);

-	AUD_pa_threaded_mainloop_start(m_mainloop);
-
 	while(m_state != PA_CONTEXT_READY)
 	{
 		switch(m_state)
 		{
 		case PA_CONTEXT_FAILED:
 		case PA_CONTEXT_TERMINATED:
-			AUD_pa_threaded_mainloop_unlock(m_mainloop);
-			AUD_pa_threaded_mainloop_stop(m_mainloop);
-
 			AUD_pa_context_disconnect(m_context);
 			AUD_pa_context_unref(m_context);

-			AUD_pa_threaded_mainloop_free(m_mainloop);
+			AUD_pa_mainloop_free(m_mainloop);

 			AUD_THROW(DeviceException, "Could not connect to PulseAudio.");
 			break;
 		default:
-			AUD_pa_threaded_mainloop_wait(m_mainloop);
+			AUD_pa_mainloop_iterate(m_mainloop, true, nullptr);
 			break;
 		}
 	}
@@ -213,18 +182,16 @@ PulseAudioDevice::PulseAudioDevice(std::string name, DeviceSpecs specs, int buff

 	if(!m_stream)
 	{
-		AUD_pa_threaded_mainloop_unlock(m_mainloop);
-		AUD_pa_threaded_mainloop_stop(m_mainloop);
-
 		AUD_pa_context_disconnect(m_context);
 		AUD_pa_context_unref(m_context);

-		AUD_pa_threaded_mainloop_free(m_mainloop);
+		AUD_pa_mainloop_free(m_mainloop);

 		AUD_THROW(DeviceException, "Could not create PulseAudio stream.");
 	}

 	AUD_pa_stream_set_write_callback(m_stream, PulseAudio_request, this);
+	AUD_pa_stream_set_underflow_callback(m_stream, PulseAudio_underflow, this);

 	buffersize *= AUD_DEVICE_SAMPLE_SIZE(m_specs);
 	m_buffersize = buffersize;
@@ -237,53 +204,31 @@ PulseAudioDevice::PulseAudioDevice(std::string name, DeviceSpecs specs, int buff
 	buffer_attr.prebuf = -1U;
 	buffer_attr.tlength = buffersize;

-	m_ring_buffer.resize(buffersize);
-
-	if(AUD_pa_stream_connect_playback(m_stream, nullptr, &buffer_attr, static_cast<pa_stream_flags_t>(PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_ADJUST_LATENCY | PA_STREAM_AUTO_TIMING_UPDATE), nullptr, nullptr) < 0)
+	if(AUD_pa_stream_connect_playback(m_stream, nullptr, &buffer_attr, static_cast<pa_stream_flags_t>(PA_STREAM_START_CORKED | PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_ADJUST_LATENCY | PA_STREAM_AUTO_TIMING_UPDATE), nullptr, nullptr) < 0)
 	{
-		AUD_pa_threaded_mainloop_unlock(m_mainloop);
-		AUD_pa_threaded_mainloop_stop(m_mainloop);
-
 		AUD_pa_context_disconnect(m_context);
 		AUD_pa_context_unref(m_context);

-		AUD_pa_threaded_mainloop_free(m_mainloop);
+		AUD_pa_mainloop_free(m_mainloop);

 		AUD_THROW(DeviceException, "Could not connect PulseAudio stream.");
 	}

-	AUD_pa_threaded_mainloop_unlock(m_mainloop);
-
 	create();
-
-	m_mixingThread = std::thread(&PulseAudioDevice::updateRingBuffer, this);
 }

 PulseAudioDevice::~PulseAudioDevice()
 {
-	m_valid = false;
-
-	m_mixingLock.lock();
-	m_mixingCondition.notify_all();
-	m_mixingLock.unlock();
-
-	m_mixingThread.join();
-
-	AUD_pa_threaded_mainloop_stop(m_mainloop);
+	stopMixingThread();

 	AUD_pa_context_disconnect(m_context);
 	AUD_pa_context_unref(m_context);

-	AUD_pa_threaded_mainloop_free(m_mainloop);
+	AUD_pa_mainloop_free(m_mainloop);

 	destroy();
 }

-ISynchronizer *PulseAudioDevice::getSynchronizer()
-{
-	return &m_synchronizer;
-}
-
 class PulseAudioDeviceFactory : public IDeviceFactory
 {
 private:
--- a/extern/audaspace/plugins/pulseaudio/PulseAudioDevice.h
+++ b/extern/audaspace/plugins/pulseaudio/PulseAudioDevice.h
@@ -26,11 +26,7 @@
 * The PulseAudioDevice class.
 */

-#include "devices/SoftwareDevice.h"
-#include "util/RingBuffer.h"
-
-#include <condition_variable>
-#include <thread>
+#include "devices/ThreadedDevice.h"

 #include <pulse/pulseaudio.h>

@@ -39,65 +35,17 @@ AUD_NAMESPACE_BEGIN
 /**
 * This device plays back through PulseAudio, the simple direct media layer.
 */
-class AUD_PLUGIN_API PulseAudioDevice : public SoftwareDevice
+class AUD_PLUGIN_API PulseAudioDevice : public ThreadedDevice
 {
 private:
-	class PulseAudioSynchronizer : public DefaultSynchronizer
-	{
-		PulseAudioDevice* m_device;
-
-	public:
-		PulseAudioSynchronizer(PulseAudioDevice* device);
-
-		virtual double getPosition(std::shared_ptr<IHandle> handle);
-	};
-
-	/// Synchronizer.
-	PulseAudioSynchronizer m_synchronizer;
-
-	/**
-	 * Whether there is currently playback.
-	 */
-	volatile bool m_playback;
-
-	pa_threaded_mainloop* m_mainloop;
+	pa_mainloop* m_mainloop;
 	pa_context* m_context;
 	pa_stream* m_stream;
 	pa_context_state_t m_state;

-	/**
-	 * The mixing ring buffer.
-	 */
-	RingBuffer m_ring_buffer;
-
-	/**
-	 * Whether the device is valid.
-	 */
-	bool m_valid;
-
 	int m_buffersize;
 	uint32_t m_underflows;

-	/**
-	 * The mixing thread.
-	 */
-	std::thread m_mixingThread;
-
-	/**
-	 * Mutex for mixing.
-	 */
-	std::mutex m_mixingLock;
-
-	/**
-	 * Condition for mixing.
-	 */
-	std::condition_variable m_mixingCondition;
-
-	/**
-	 * Updates the ring buffer.
-	 */
-	AUD_LOCAL void updateRingBuffer();
-
 	/**
 	 * Reports the state of the PulseAudio server connection.
 	 * \param context The PulseAudio context.
@@ -113,13 +61,23 @@ private:
 	 */
 	AUD_LOCAL static void PulseAudio_request(pa_stream* stream, size_t total_bytes, void* data);

+	/**
+	 * Reports an underflow from the PulseAudio server.
+	 * Automatically adjusts the latency if this happens too often.
+	 * @param stream The PulseAudio stream.
+	 * \param data The PulseAudio device.
+	 */
+	AUD_LOCAL static void PulseAudio_underflow(pa_stream* stream, void* data);
+
+	/**
+	 * Streaming thread main function.
+	 */
+	AUD_LOCAL void runMixingThread();
+
 	// delete copy constructor and operator=
 	PulseAudioDevice(const PulseAudioDevice&) = delete;
 	PulseAudioDevice& operator=(const PulseAudioDevice&) = delete;

-protected:
-	virtual void playing(bool playing);
-
 public:
 	/**
 	 * Opens the PulseAudio audio device for playback.
@@ -135,8 +93,6 @@ public:
 	 */
 	virtual ~PulseAudioDevice();

-	virtual ISynchronizer* getSynchronizer();
-
 	/**
 	 * Registers this plugin.
 	 */
--- a/extern/audaspace/plugins/pulseaudio/PulseAudioSymbols.h
+++ b/extern/audaspace/plugins/pulseaudio/PulseAudioSymbols.h
@@ -25,7 +25,6 @@ PULSEAUDIO_SYMBOL(pa_stream_begin_write);
 PULSEAUDIO_SYMBOL(pa_stream_connect_playback);
 PULSEAUDIO_SYMBOL(pa_stream_cork);
 PULSEAUDIO_SYMBOL(pa_stream_flush);
-PULSEAUDIO_SYMBOL(pa_stream_get_latency);
 PULSEAUDIO_SYMBOL(pa_stream_is_corked);
 PULSEAUDIO_SYMBOL(pa_stream_new);
 PULSEAUDIO_SYMBOL(pa_stream_set_buffer_attr);
@@ -40,13 +39,3 @@ PULSEAUDIO_SYMBOL(pa_mainloop_iterate);
 PULSEAUDIO_SYMBOL(pa_mainloop_prepare);
 PULSEAUDIO_SYMBOL(pa_mainloop_poll);
 PULSEAUDIO_SYMBOL(pa_mainloop_dispatch);
-
-PULSEAUDIO_SYMBOL(pa_threaded_mainloop_free);
-PULSEAUDIO_SYMBOL(pa_threaded_mainloop_get_api);
-PULSEAUDIO_SYMBOL(pa_threaded_mainloop_lock);
-PULSEAUDIO_SYMBOL(pa_threaded_mainloop_new);
-PULSEAUDIO_SYMBOL(pa_threaded_mainloop_signal);
-PULSEAUDIO_SYMBOL(pa_threaded_mainloop_start);
-PULSEAUDIO_SYMBOL(pa_threaded_mainloop_stop);
-PULSEAUDIO_SYMBOL(pa_threaded_mainloop_unlock);
-PULSEAUDIO_SYMBOL(pa_threaded_mainloop_wait);
--- a/extern/audaspace/plugins/wasapi/WASAPIDevice.cpp
+++ b/extern/audaspace/plugins/wasapi/WASAPIDevice.cpp
@@ -95,13 +95,6 @@ void WASAPIDevice::runMixingThread()
 				sleep_duration = std::chrono::milliseconds(buffer_size * 1000 / int(m_specs.rate) / 2);
 			}

-			if(m_default_device_changed)
-			{
-				m_default_device_changed = false;
-				result = AUDCLNT_E_DEVICE_INVALIDATED;
-				goto stop_thread;
-			}
-
 			if(FAILED(result = m_audio_client->GetCurrentPadding(&padding)))
 				goto stop_thread;

@@ -303,78 +296,13 @@ bool WASAPIDevice::setupDevice(DeviceSpecs &specs)
 	return true;
 }

-ULONG WASAPIDevice::AddRef()
-{
-	return InterlockedIncrement(&m_reference_count);
-}
-
-ULONG WASAPIDevice::Release()
-{
-	ULONG reference_count = InterlockedDecrement(&m_reference_count);
-
-	if(0 == reference_count)
-		delete this;
-
-	return reference_count;
-}
-
-HRESULT WASAPIDevice::QueryInterface(REFIID riid, void **ppvObject)
-{
-	if(riid == __uuidof(IMMNotificationClient))
-	{
-		*ppvObject = reinterpret_cast<IMMNotificationClient*>(this);
-		AddRef();
-	}
-	else if(riid == IID_IUnknown)
-	{
-		*ppvObject = reinterpret_cast<IUnknown*>(this);
-		AddRef();
-	}
-	else
-	{
-		*ppvObject = nullptr;
-		return E_NOINTERFACE;
-	}
-
-	return S_OK;
-}
-
-HRESULT WASAPIDevice::OnDeviceStateChanged(LPCWSTR pwstrDeviceId, DWORD dwNewState)
-{
-	return S_OK;
-}
-
-HRESULT WASAPIDevice::OnDeviceAdded(LPCWSTR pwstrDeviceId)
-{
-	return S_OK;
-}
-
-HRESULT WASAPIDevice::OnDeviceRemoved(LPCWSTR pwstrDeviceId)
-{
-	return S_OK;
-}
-
-HRESULT WASAPIDevice::OnDefaultDeviceChanged(EDataFlow flow, ERole role, LPCWSTR pwstrDeviceId)
-{
-	if(flow != EDataFlow::eCapture)
-		m_default_device_changed = true;
-
-	return S_OK;
-}
-
-HRESULT WASAPIDevice::OnPropertyValueChanged(LPCWSTR pwstrDeviceId, const PROPERTYKEY key)
-{
-	return S_OK;
-}
-
 WASAPIDevice::WASAPIDevice(DeviceSpecs specs, int buffersize) :
 	m_buffersize(buffersize),
 	m_imm_device_enumerator(nullptr),
 	m_imm_device(nullptr),
 	m_audio_client(nullptr),
-	m_wave_format_extensible({}),
-	m_default_device_changed(false),
-	m_reference_count(1)
+
+	m_wave_format_extensible({})
 {
 	// initialize COM if it hasn't happened yet
 	CoInitializeEx(nullptr, COINIT_MULTITHREADED);
@@ -399,8 +327,6 @@ WASAPIDevice::WASAPIDevice(DeviceSpecs specs, int buffersize) :

 	create();

-	m_imm_device_enumerator->RegisterEndpointNotificationCallback(this);
-
 	return;

 	error:
@@ -414,8 +340,6 @@ WASAPIDevice::~WASAPIDevice()
 {
 	stopMixingThread();

-	m_imm_device_enumerator->UnregisterEndpointNotificationCallback(this);
-
 	SafeRelease(&m_audio_client);
 	SafeRelease(&m_imm_device);
 	SafeRelease(&m_imm_device_enumerator);
--- a/extern/audaspace/plugins/wasapi/WASAPIDevice.h
+++ b/extern/audaspace/plugins/wasapi/WASAPIDevice.h
@@ -40,7 +40,7 @@ AUD_NAMESPACE_BEGIN
 /**
 * This device plays back through WASAPI, the Windows audio API.
 */
-class AUD_PLUGIN_API WASAPIDevice : IMMNotificationClient, public ThreadedDevice
+class AUD_PLUGIN_API WASAPIDevice : public ThreadedDevice
 {
 private:
 	int m_buffersize;
@@ -48,8 +48,6 @@ private:
 	IMMDevice* m_imm_device;
 	IAudioClient* m_audio_client;
 	WAVEFORMATEXTENSIBLE m_wave_format_extensible;
-	bool m_default_device_changed;
-	LONG m_reference_count;

 	AUD_LOCAL HRESULT setupRenderClient(IAudioRenderClient*& render_client, UINT32& buffer_size);

@@ -60,17 +58,6 @@ private:

 	AUD_LOCAL bool setupDevice(DeviceSpecs& specs);

-	// IUnknown implementation
-	ULONG STDMETHODCALLTYPE AddRef();
-	ULONG STDMETHODCALLTYPE Release();
-	HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject);
-	// IMMNotificationClient implementation
-	HRESULT STDMETHODCALLTYPE OnDeviceStateChanged(LPCWSTR pwstrDeviceId, DWORD dwNewState);
-	HRESULT STDMETHODCALLTYPE OnDeviceAdded(LPCWSTR pwstrDeviceId);
-	HRESULT STDMETHODCALLTYPE OnDeviceRemoved(LPCWSTR pwstrDeviceId);
-	HRESULT STDMETHODCALLTYPE OnDefaultDeviceChanged(EDataFlow flow, ERole role, LPCWSTR pwstrDeviceId);
-	HRESULT STDMETHODCALLTYPE OnPropertyValueChanged(LPCWSTR pwstrDeviceId, const PROPERTYKEY key);
-
 	// delete copy constructor and operator=
 	WASAPIDevice(const WASAPIDevice&) = delete;
 	WASAPIDevice& operator=(const WASAPIDevice&) = delete;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hans Goudey	a0f754e774	Merge branch 'master' into refactor-idprop-ui-data	2021-08-26 23:41:41 -05:00
Hans Goudey	137a5e162c	Merge branch 'master' into refactor-idprop-ui-data	2021-08-24 17:40:18 -05:00
Hans Goudey	aad18a0050	End comments with period	2021-08-09 15:08:59 -05:00
Hans Goudey	8a9d764544	Remove trailing whitespace	2021-08-09 15:08:29 -05:00
Hans Goudey	414ad257ec	Merge branch 'master' into refactor-idprop-ui-data	2021-08-09 15:06:35 -05:00
Hans Goudey	07b2aaa8c7	Don't apply any changes on failure, refactor with `IDP_ui_data_free_unique_contents`	2021-08-06 12:12:04 -05:00
Hans Goudey	14d333cd31	Cleanup: Rename variables	2021-08-06 11:33:20 -05:00
Hans Goudey	2263e16a57	Merge branch 'master' into refactor-idprop-ui-data	2021-08-06 07:42:14 -05:00
Hans Goudey	1681d09919	Put "\n" on newline	2021-08-05 13:57:35 -05:00
Hans Goudey	1bbc4ccbd2	Remove more curly braces	2021-08-05 13:56:39 -05:00
Hans Goudey	6b944e8dc0	Add key arg to id_properties_ui doc	2021-08-05 13:54:29 -05:00
Hans Goudey	8473bee909	Free unused result in failure cases	2021-08-05 13:52:28 -05:00
Hans Goudey	983e84322a	Write to a temporary local copy of the UI data	2021-08-05 13:34:19 -05:00
Hans Goudey	c85397ad51	Rename IDP_free_ui_data -> IDP_ui_data_free	2021-08-05 13:19:36 -05:00
Hans Goudey	ed351f2784	Split setting defaults to a separate function for int and float	2021-08-05 13:16:59 -05:00
Hans Goudey	fb4b5c7235	Add back curly braces in one place	2021-08-05 13:14:53 -05:00
Hans Goudey	cc00567061	Remove const from int argument in header	2021-08-05 12:55:41 -05:00
Hans Goudey	95538552a8	Remove curly braces	2021-08-05 12:55:19 -05:00
Hans Goudey	442236d9ea	Add function to fill default array from doubles, simplify a bit	2021-08-05 12:47:10 -05:00
Hans Goudey	ecd8bdafbb	Use IDP_ui_data_type instead of more specific checks	2021-08-05 12:02:17 -05:00
Hans Goudey	71164a826d	Use pyrna_enum_value_from_id to parse enum items (fix bug creating custom property)	2021-08-05 11:44:41 -05:00
Hans Goudey	11d7619e22	Revert "Use pyrna_enum_value_parse_string" This reverts commit `1cf574dc39`.	2021-08-05 11:23:51 -05:00
Hans Goudey	c41c378428	Merge branch 'master' into refactor-idprop-ui-data	2021-08-05 10:46:12 -05:00
Hans Goudey	1cf574dc39	Use pyrna_enum_value_parse_string	2021-08-02 10:19:23 -04:00
Hans Goudey	6a5e97e379	Switch to C for the new file	2021-08-02 09:45:38 -04:00
Hans Goudey	a207c1560f	Merge branch 'master' into refactor-idprop-ui-data	2021-08-02 09:41:39 -04:00
Hans Goudey	40e3841939	Small cleanup	2021-08-02 00:15:47 -04:00
Hans Goudey	4877b0f742	Refactor new IDProperty UI data API (the changes described above)	2021-08-01 23:55:21 -04:00
Hans Goudey	3bbeb8543b	Cleanup: Use BLI_assert_unreachable	2021-08-01 23:22:07 -04:00
Hans Goudey	02fd6dda35	Merge branch 'master' into refactor-idprop-ui-data	2021-08-01 09:37:02 -04:00
Hans Goudey	638c2f0c3f	Add "id_properties_clear()" calls to UI data tests	2021-07-14 11:21:46 -04:00
Hans Goudey	c492f26549	Cleanup: Reoder definition	2021-07-14 11:05:33 -04:00
Hans Goudey	34fb3a19df	Merge branch 'master' into refactor-idprop-ui-data	2021-07-14 10:58:39 -04:00
Hans Goudey	3b39186afa	Rename id_properties_create to id_properties_ensure	2021-07-12 21:50:43 -04:00
Hans Goudey	73012ab1f7	Merge branch 'master' into refactor-idprop-ui-data	2021-07-12 21:43:40 -04:00
Hans Goudey	57317c4f83	Simplify python code with `bool(keys)`	2021-07-06 12:22:24 -05:00
Hans Goudey	6f258744b1	Merge branch 'master' into refactor-idprop-ui-data	2021-07-06 12:20:28 -05:00
Hans Goudey	c577e6598d	Report type "Error" to "Warning"	2021-07-05 22:47:47 -05:00
Hans Goudey	e1fa608c1b	Rename IDPropertyUIDataType -> eIDPropertyUIDataType	2021-07-05 22:46:53 -05:00
Hans Goudey	6903142975	Merge master	2021-07-05 17:31:13 -05:00
Hans Goudey	5b98e14f26	Sanitize custom property editing operator	2021-06-22 14:01:00 -05:00
Hans Goudey	79fd9d8883	Merge branch 'master' into refactor-idprop-ui-data	2021-06-22 13:25:41 -05:00
Hans Goudey	5f17a525b9	Review updates	2021-06-20 11:50:36 -05:00
Hans Goudey	07154dada0	Merge branch 'master' into refactor-idprop-ui-data	2021-06-20 11:03:35 -05:00
Hans Goudey	cee6e9dcc0	Slightly refactor default value array retrieval (keep manual parsing for better error messages)	2021-06-18 13:54:19 -05:00
Hans Goudey	45c1135999	Cleanup: Refactor to pass around fewer values between functions	2021-06-18 13:39:57 -05:00
Hans Goudey	ae74e88990	Passing tests with a new version of argument parsing	2021-06-18 13:04:28 -05:00
Hans Goudey	e93214ab23	Fix bug with writing ID type UI data	2021-06-18 13:03:14 -05:00
Hans Goudey	de3c9dfabd	Merge branch 'master' into refactor-idprop-ui-data	2021-06-18 10:28:24 -05:00
Hans Goudey	212fde45ac	Cleanup: change name of function	2021-06-17 16:36:28 -05:00
Hans Goudey	232e3f83bf	Fix some smaller review comments, WIP changes trying to implement different arg parsing	2021-06-17 16:29:26 -05:00
Hans Goudey	278bead415	Merge branch 'master' into refactor-idprop-ui-data	2021-06-17 12:39:54 -05:00
Hans Goudey	5d58f177f7	Simplify checks for python object types, just use `PyLong_AsLong` and `PyFloat_AsDouble`	2021-06-08 23:10:14 -05:00
Hans Goudey	47fee34e9f	Merge branch 'master' into refactor-idprop-ui-data	2021-06-08 22:48:56 -05:00
Hans Goudey	29a9eaaee3	Merge branch 'master' into refactor-idprop-ui-data	2021-06-07 07:55:58 -05:00
Hans Goudey	9520290dbb	Merge branch 'master' into refactor-idprop-ui-data	2021-06-07 07:49:48 -05:00
Hans Goudey	4b67d8302e	Merge branch 'master' into refactor-idprop-ui-data	2021-06-02 12:54:49 -04:00
Hans Goudey	158e353ece	Remove `rna_` prefix from function names	2021-05-14 17:41:45 -05:00
Hans Goudey	b4b8be0d2e	Simplify arg parsing of rna_subtype and description	2021-05-14 17:39:48 -05:00
Hans Goudey	30c424481c	Fix missing comma in doc string	2021-05-14 17:29:20 -05:00
Hans Goudey	a9484fa797	Cleanup: Use BLI_assert_unreachable()	2021-05-14 17:28:46 -05:00
Hans Goudey	7576dcfaa4	Correct return type in doc string	2021-05-14 16:41:09 -05:00
Hans Goudey	3480934ff4	Merge branch 'master' into refactor-idprop-ui-data	2021-05-14 16:39:42 -05:00
Hans Goudey	dca2303328	Prevent UI data min from becoming greater than max and vice versa	2021-05-11 15:55:53 -05:00
Hans Goudey	7849e80632	Add error checking when converting to int and double for UI data	2021-05-11 15:40:08 -05:00
Hans Goudey	5810fa80d4	Cleanup: Rename functions (`rna_ui_data` prefix, `id_properties_create`)	2021-05-11 15:09:49 -05:00
Hans Goudey	e1bcb248ef	Use `return NULL;` when parsing arguments fails	2021-05-11 14:52:31 -05:00
Hans Goudey	72974a60b4	Add error message for RNA subtype not found	2021-05-11 14:50:36 -05:00
Hans Goudey	4d330d97ed	Use keyword-only arguments	2021-05-11 14:47:30 -05:00
Hans Goudey	a24dc46d0a	Cleanup: Rename functions (`IDP_ui_data` prefix)	2021-05-11 14:42:42 -05:00
Hans Goudey	60c156c9c8	Cleanup: Rename functions (`IDP_coerce_to_*_or_zero`)	2021-05-11 14:41:06 -05:00
Hans Goudey	e513178bc4	Cleanup: Formatting of long python argument lists	2021-05-11 14:39:48 -05:00
Hans Goudey	013bb7e9fd	Merge branch 'master' into refactor-idprop-ui-data	2021-05-11 14:34:51 -05:00
Hans Goudey	35a2b13709	Also version nodes modifier settings	2021-05-08 13:29:44 -05:00
Hans Goudey	433585f906	Whitespace	2021-05-08 13:24:31 -05:00
Hans Goudey	ad3cdcc437	Merge branch 'master' into refactor-idprop-ui-data	2021-05-08 13:09:38 -05:00
Hans Goudey	596aebcc28	Fix memory leak introduced by last commit	2021-04-29 13:45:36 -05:00
Hans Goudey	2ebdf5b7a7	Add IDP_ID UI data for tooltips from node sockets	2021-04-29 13:36:22 -05:00
Hans Goudey	4e96d8da88	Refactor IDProperty usage in MOD_nodes.cc	2021-04-29 13:35:48 -05:00
Hans Goudey	0d1f6b518b	Merge branch 'master' into refactor-idprop-ui-data	2021-04-29 10:47:48 -05:00
Hans Goudey	49a8b6bc4e	Merge branch 'master' into refactor-idprop-ui-data	2021-04-29 10:09:20 -05:00
Hans Goudey	d1e4f05734	Cleanup	2021-04-28 23:59:10 -05:00
Hans Goudey	eea8793205	Move versioning to versioning 300	2021-04-28 23:57:42 -05:00
Hans Goudey	a1cf09a202	Fix unecessary parantheses	2021-04-28 23:50:36 -05:00
Hans Goudey	dafd70d8a2	Merge branch 'master' into refactor-idprop-ui-data	2021-04-28 23:46:45 -05:00
Hans Goudey	bba8ec2367	Fix "has properties" check	2021-03-13 09:05:48 -05:00
Hans Goudey	d785ee3a98	Merge branch 'master' into refactor-idprop-ui-data	2021-03-13 09:04:54 -05:00
Hans Goudey	927bec3fba	Fix incorrect `PyArg_ParseTuple` argument	2021-03-10 12:34:39 -05:00
Hans Goudey	6d51bb8efe	Use default consistently instead of default_value	2021-03-10 11:59:39 -05:00
Hans Goudey	6c596cde06	Merge branch 'master' into refactor-idprop-ui-data	2021-03-10 11:53:39 -05:00
Hans Goudey	5849aba1e3	Rename functions as Sybren suggests	2021-03-08 22:41:03 -05:00
Hans Goudey	b608a0195f	Merge branch 'master' into refactor-idprop-ui-data	2021-03-08 22:30:32 -05:00
Hans Goudey	66350caeec	Add more tests	2021-01-13 23:14:29 -06:00
Hans Goudey	80a8cdbab0	Fix keyword argument	2021-01-13 22:58:04 -06:00
Hans Goudey	39e3bd87a0	Update for changes in MOD_nodes.cc	2021-01-13 22:39:10 -06:00
Hans Goudey	a4f5e84c33	Merge branch 'master' into refactor-idprop-ui-data	2021-01-13 21:55:46 -06:00
Hans Goudey	1047713bbe	Add some basic tests for float UI data and copying UI data	2021-01-11 23:56:19 -06:00
Hans Goudey	4c406f7c45	Fix inverted source and destination groups in api function	2021-01-11 23:55:59 -06:00
Hans Goudey	9a52428ebe	Fix limits	2021-01-11 23:16:47 -06:00
Hans Goudey	704c9b25dd	Merge branch 'master' into refactor-idprop-ui-data	2021-01-11 22:55:38 -06:00
Hans Goudey	2e199fc2c5	More testing stuff, it fails	2021-01-11 08:01:10 -06:00
Hans Goudey	378b19233e	Move some functions to idprop.c	2021-01-10 14:28:51 -06:00
Hans Goudey	74c77c887b	Improve function naming	2021-01-10 13:58:03 -06:00
Hans Goudey	334a31fe19	Fix off by one error	2021-01-10 13:49:07 -06:00
Hans Goudey	6c981f2d73	Merge branch 'master' into refactor-idprop-ui-data	2021-01-10 13:47:37 -06:00
Hans Goudey	a8c8400342	Starting the unit tests	2021-01-05 09:56:37 -06:00
Hans Goudey	113ac52701	Remove asserts in versioning and use non type specific reading	2021-01-04 22:14:23 -06:00
Hans Goudey	4f4fdc11cd	Fix errors in docstrings and make indentation consistent	2021-01-04 19:30:04 -06:00
Hans Goudey	d5a51c1376	Fix typo in error message	2021-01-04 19:23:52 -06:00
Hans Goudey	40f0b2d5ef	Use `int_from_py_int_or_double` function	2021-01-04 19:22:55 -06:00
Hans Goudey	7af42f70f9	Rename `check_ui_data_value` to `pyobject_can_convert_to_number`	2021-01-04 19:21:16 -06:00
Hans Goudey	f7cec43e7d	Support booleans as inputs for UI data	2021-01-04 19:19:44 -06:00
Hans Goudey	61bda1952c	Add NULL check in string default access	2021-01-04 19:01:40 -06:00
Hans Goudey	08ea54f42e	Add a `max_len` argument to RNA_property_string_get_default	2021-01-04 18:58:39 -06:00
Hans Goudey	7832003229	Fix incorrect type check in assert	2021-01-04 18:43:53 -06:00
Hans Goudey	e841acfa79	Remove extraneous line breaks	2021-01-04 18:43:20 -06:00
Hans Goudey	81a293b984	Add check for property type that doesn't support UI data	2021-01-04 18:41:51 -06:00
Hans Goudey	54eef5a9b0	Use int to store precision	2021-01-04 18:41:05 -06:00
Hans Goudey	8b9fd2a417	Fix spacing in comment	2021-01-04 18:40:30 -06:00
Hans Goudey	1a489fce83	Create UI data in `rna_data()` if it doesn't exist	2021-01-04 17:54:31 -06:00
Hans Goudey	872f5a0b2a	Merge branch 'master' into refactor-idprop-ui-data	2021-01-04 17:49:56 -06:00
Hans Goudey	257fd605e2	Remove versioning for IDProperty groups not exposed to the UI	2020-12-28 15:16:23 -06:00
Hans Goudey	799422bb1c	Merge branch 'master' into refactor-idprop-ui-data	2020-12-28 15:02:13 -06:00
Hans Goudey	fb324f6370	Fix for "use_soft_limits"	2020-12-22 12:23:49 -06:00
Hans Goudey	897fdb9b58	Fix build error	2020-12-22 11:20:50 -06:00
Hans Goudey	ea2387e7cb	Merge branch 'master' into refactor-idprop-ui-data	2020-12-22 11:13:22 -06:00
Hans Goudey	e860c129a8	Merge branch 'master' into refactor-idprop-ui-data	2020-12-16 20:35:31 -06:00
Hans Goudey	351fd68e20	Fix crash, remove debug prints	2020-12-16 07:49:39 -06:00
Hans Goudey	63a0d6ab3d	Add function to copy RNA UI data from one group's properties to another's	2020-12-15 21:19:26 -06:00
Hans Goudey	b30a0ce808	Remove use of "_RNA_UI"	2020-12-15 21:18:42 -06:00
Hans Goudey	90d2fe54b8	Add IDP_ui_data_type helper function, use switch statements	2020-12-15 16:34:47 -06:00
Hans Goudey	9aa7d11146	Small bug fix	2020-12-15 14:41:38 -06:00
Hans Goudey	21c240c1e7	Adjust comment	2020-12-15 12:51:02 -06:00
Hans Goudey	10888eb8ad	Merge branch 'master' into refactor-idprop-ui-data	2020-12-15 12:44:45 -06:00
Hans Goudey	36b04e04ad	Remove unecessary import	2020-12-15 12:09:45 -06:00
Hans Goudey	aacc976522	Add clear_rna method to completely remove UI data	2020-12-15 12:09:34 -06:00
Hans Goudey	6ec08c5f3a	Fix building	2020-12-15 10:46:23 -06:00
Hans Goudey	3fcb015454	Merge branch 'master' into refactor-idprop-ui-data	2020-12-15 10:29:11 -06:00
Hans Goudey	f57d8e7239	Add debug prints, move NULL check to parent function	2020-12-15 10:10:24 -06:00
Hans Goudey	336593f340	Merge branch 'master' into refactor-idprop-ui-data	2020-12-14 20:19:52 -06:00
Hans Goudey	4c323d6e9d	Use new UI data system for nodes modifier	2020-12-10 23:20:46 -06:00
Hans Goudey	06abe408e7	Mainly finish versioning code	2020-12-10 22:41:51 -06:00
Hans Goudey	53ca2fa43b	Merge branch 'master' into refactor-idprop-ui-data	2020-12-10 18:56:01 -06:00
Hans Goudey	d92bc84e3a	Update versioning for properties from more data-blocks, fix bugs	2020-12-08 19:19:31 -06:00
Hans Goudey	2ce0cf0c57	Copy UI data when copying a property's contents	2020-12-08 19:18:49 -06:00
Hans Goudey	20b7ba360d	Small simplification: Use a better function	2020-12-08 16:11:26 -06:00
Hans Goudey	e8b1e5776a	Initial versioning code	2020-12-08 15:34:34 -06:00
Hans Goudey	e5598b75d4	Fix incorrect assert	2020-12-08 12:08:25 -06:00
Hans Goudey	db662b2565	Merge branch 'master' into refactor-idprop-ui-data	2020-12-08 11:47:24 -06:00
Hans Goudey	d96ec8ff1c	Lots of bug fixes, working propery in almost all cases for editing	2020-12-05 13:43:33 -06:00
Hans Goudey	786e12da25	Property edit function works	2020-12-04 17:08:33 -06:00
Hans Goudey	b67fd20dcb	Merge branch 'master' into refactor-idprop-ui-data	2020-12-04 15:42:20 -06:00
Hans Goudey	467f737b7a	Bugfixes, adding a new custom property now works	2020-12-03 10:52:30 -06:00
Hans Goudey	6c90c8bded	Fix incorrect signature for update_rna function	2020-12-03 09:57:11 -06:00
Hans Goudey	f75921b9c9	Merge branch 'master' into refactor-idprop-ui-data	2020-12-03 08:47:31 -06:00
Hans Goudey	a97e3beac3	WIP: Refactor IDProperty UI data storage The way IDProperty UI data (min, max, default value, etc) is quite complicated. For every property, retrieving a single one of these values involves three string lookups. First for the "_RNA_UI" group property, then for another group with the property's name, then for the "min" or other value name. Not only is this inefficient, but it's very hard to figure out, unintuitive, and just generally not helpful. This commit replaces that system with a UI data struct directly in the IDProperty. If it's not used, the only cost is of a pointer. Beyond storing the description, name, and RNA subtype, derived structs are used to store type specific UI data. This patch currently makes more changes than I would make in the first step of landing this refactoring to master, and it doesn't consider versioning yet. Differential Revision: https://developer.blender.org/D9697	2020-12-01 08:53:58 -05:00
Hans Goudey	72329b7018	Add reading and writing for ui data structs	2020-11-28 11:48:57 -05:00
Hans Goudey	9ac87b653c	Fixes for adding and removing custom properties	2020-11-27 14:27:38 -05:00
Hans Goudey	4a34ed3aff	Fixes for custom properties API function	2020-11-27 14:17:52 -05:00
Hans Goudey	f12810906e	Merge branch 'master' into refactor-idprop-ui-data	2020-11-27 12:22:40 -05:00
Hans Goudey	87dfb93f4b	Add an API function to get a property's UI data Now it gets a bit further, but it still crashes because somehow the description is being changed from NULL in between calls to new code.	2020-11-22 14:58:55 -05:00
Hans Goudey	9e5fbaef47	Cleanup: Remove unecessary code	2020-11-22 14:43:07 -05:00
Hans Goudey	26c5ad06d3	Merge branch 'master' into refactor-idprop-ui-data	2020-11-22 12:49:58 -05:00
Hans Goudey	054417e378	Still doesn't work, no bl_rna for IDProperties	2020-11-17 08:20:11 -05:00
Hans Goudey	b7db5c4692	Merge branch 'master' into refactor-idprop-ui-data	2020-11-16 15:18:18 -05:00
Hans Goudey	6f1653a6de	Adding a custom property works	2020-11-16 09:53:40 -05:00
Hans Goudey	d3d1d9bd5e	In progress	2020-11-15 19:58:50 -05:00
Hans Goudey	3b614abec9	Set up defaults when allocating UI data structs	2020-11-15 16:26:50 -05:00
Hans Goudey	ad2fc4c569	Merge branch 'master' into refactor-idprop-ui-data	2020-11-14 20:12:24 -05:00
Hans Goudey	210250a91a	Progress in using the new IDProperty UI data API	2020-11-06 14:25:53 -06:00
Hans Goudey	3fe37136ff	Merge branch 'master' into refactor-idprop-ui-data	2020-11-06 12:50:33 -06:00
Hans Goudey	498685b295	Initial untested RNA UI data python API	2020-11-06 12:43:10 -06:00
Hans Goudey	e2e57307e9	Merge branch 'master' into refactor-idprop-ui-data	2020-11-05 22:48:02 -06:00
Hans Goudey	da9b541261	Starting progress on python interface	2020-11-02 08:08:55 -06:00
Hans Goudey	4ab2b3c205	Merge branch 'master' into refactor-idprop-ui-data	2020-10-31 23:58:12 -05:00
Hans Goudey	ad72114ad9	Most changes to rna_access.c finished, python API is up next	2020-10-31 22:49:23 -05:00