[Bf-blender-cvs] [e306f1fffc3] tmp-vfx-platform-2023: Merge remote-tracking branch 'origin/master' into tmp-vfx-platform-2023

[Ray Molenkamp]

Commit: e306f1fffc3bd3766a757e51981a2af91637369a
Author: Ray Molenkamp
Date:   Thu Nov 3 09:51:29 2022 -0600
Branches: tmp-vfx-platform-2023
https://developer.blender.org/rBe306f1fffc3bd3766a757e51981a2af91637369a

Merge remote-tracking branch 'origin/master' into tmp-vfx-platform-2023

===================================================================



===================================================================

diff --cc build_files/build_environment/CMakeLists.txt
index a3534c70d3c,999223603d5..a50a2af1755
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@@ -87,10 -87,9 +88,10 @@@ endif(
  include(cmake/python_site_packages.cmake)
  include(cmake/package_python.cmake)
  include(cmake/usd.cmake)
 +include(cmake/openvdb.cmake)
  include(cmake/potrace.cmake)
  include(cmake/haru.cmake)
- # Boost needs to be included after python.cmake due to the PYTHON_BINARY variable being needed.
+ # Boost needs to be included after `python.cmake` due to the PYTHON_BINARY variable being needed.
  include(cmake/boost.cmake)
  include(cmake/pugixml.cmake)
  include(cmake/ispc.cmake)
diff --cc build_files/build_environment/cmake/dpcpp.cmake
index 27203a77d71,28315d1f703..ef6fc9c40c9
--- a/build_files/build_environment/cmake/dpcpp.cmake
+++ b/build_files/build_environment/cmake/dpcpp.cmake
@@@ -83,9 -79,12 +83,12 @@@ ExternalProject_Add(external_dpcp
    CMAKE_GENERATOR ${LLVM_GENERATOR}
    SOURCE_SUBDIR llvm
    LIST_SEPARATOR ^^
 -  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/dpcpp ${DEFAULT_CMAKE_FLAGS} ${DPCPP_EXTRA_ARGS}
 +  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/dpcpp ${DPCPP_CMAKE_FLAGS} ${DPCPP_EXTRA_ARGS}
-   #CONFIGURE_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/dpcpp/src/external_dpcpp/buildbot/configure.py ${DPCPP_CONFIGURE_ARGS}
-   #BUILD_COMMAND echo "." #${PYTHON_BINARY} ${BUILD_DIR}/dpcpp/src/external_dpcpp/buildbot/compile.py
+   # CONFIGURE_COMMAND
+   #   ${PYTHON_BINARY}
+   #   ${BUILD_DIR}/dpcpp/src/external_dpcpp/buildbot/configure.py ${DPCPP_CONFIGURE_ARGS}
+   # BUILD_COMMAND
+   #   echo "." # ${PYTHON_BINARY} ${BUILD_DIR}/dpcpp/src/external_dpcpp/buildbot/compile.py
    INSTALL_COMMAND ${CMAKE_COMMAND} --build . -- deploy-sycl-toolchain
    PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/dpcpp/src/external_dpcpp < ${PATCH_DIR}/dpcpp.diff
    INSTALL_DIR ${LIBDIR}/dpcpp
diff --cc build_files/build_environment/cmake/versions.cmake
index 2590cddb82a,4f4330b56f4..eed43529381
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@@ -230,9 -224,10 +230,10 @@@ set(URLLIB3_VERSION 1.26.8
  set(URLLIB3_CPE "cpe:2.3:a:urllib3:urllib3:${URLLIB3_VERSION}:*:*:*:*:*:*:*")
  set(CERTIFI_VERSION 2021.10.8)
  set(REQUESTS_VERSION 2.27.1)
 -set(CYTHON_VERSION 0.29.26)
 +set(CYTHON_VERSION 0.29.30)
- # The version of the zstd library used to build the Python package should match ZSTD_VERSION defined below.
- # At this time of writing, 0.17.0 was already released, but built against zstd 1.5.1, while we use 1.5.0.
+ # The version of the zstd library used to build the Python package should match ZSTD_VERSION
+ # defined below. At this time of writing, 0.17.0 was already released,
+ # but built against zstd 1.5.1, while we use 1.5.0.
  set(ZSTANDARD_VERSION 0.16.0)
  set(AUTOPEP8_VERSION 1.6.0)
  set(PYCODESTYLE_VERSION 2.8.0)
diff --cc tests/python/CMakeLists.txt
index fe61b6d5aee,0d74cfafda5..51da4c24538
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@@ -44,8 -41,7 +44,8 @@@ function(add_python_test testname tests
  
    add_test(
      NAME ${testname}
-     COMMAND ${TEST_PYTHON_EXE} ${testscript} ${ARGN}
+     COMMAND ${TEST_PYTHON_EXE} ${TEST_PYTHON_EXE_EXTRA_ARGS} ${testscript} ${ARGN}
 +    WORKING_DIRECTORY $<TARGET_FILE_DIR:blender>
    )
    set_tests_properties(${testname} PROPERTIES ENVIRONMENT
      LSAN_OPTIONS=exitcode=0:$ENV{LSAN_OPTIONS}