Merge branch 'master' into tmp-volume-matrix-api-update

Straightforward port. I took the oportunity to remove some C vector
functions (ex: copy_v2_v2()).

.arcconfig

@@ -0,0 +1,8 @@
+{
+	"project_id" : "Blender",
+	"conduit_uri" : "https://developer.blender.org/",
+	"phabricator.uri" : "https://developer.blender.org/",
+	"git.default-relative-commit" : "origin/master",
+	"arc.land.update.default" : "rebase",
+	"arc.land.onto.default" : "master"
+}

.clang-format

@@ -130,7 +130,7 @@ PenaltyReturnTypeOnItsOwnLine: 10000
 #
 PenaltyBreakAssignment: 100
 
-AllowShortFunctionsOnASingleLine: Empty
+AllowShortFunctionsOnASingleLine: None
 
 SortIncludes: true
 
@@ -236,8 +236,6 @@ ForEachMacros:
   - LOOP_UNSELECTED_POINTS
   - LOOP_VISIBLE_KEYS
   - LOOP_VISIBLE_POINTS
-  - LIGHT_FOREACH_BEGIN_DIRECTIONAL
-  - LIGHT_FOREACH_BEGIN_LOCAL
   - LISTBASE_CIRCULAR_BACKWARD_BEGIN
   - LISTBASE_CIRCULAR_FORWARD_BEGIN
   - LISTBASE_FOREACH

.gitea/default_merge_message/REBASE_TEMPLATE.md

@@ -2,4 +2,4 @@ ${CommitTitle}
 
 ${CommitBody}
 
-Pull Request: https://projects.blender.org/blender/blender/pulls/${PullRequestIndex}
+Pull Request #${PullRequestIndex}

.gitea/default_merge_message/SQUASH_TEMPLATE.md

@@ -1,3 +1,3 @@
 ${PullRequestTitle}
 
-Pull Request: https://projects.blender.org/blender/blender/pulls/${PullRequestIndex}
+Pull Request #${PullRequestIndex}

.gitea/issue_template/bug.yaml

@@ -1,9 +1,9 @@
 name: Bug Report
 about: File a bug report
 labels:
-  - "Type/Report"
+  - "type::Report"
-  - "Status/Needs Triage"
+  - "status::Needs Triage"
-  - "Priority/Normal"
+  - "priority::Normal"
 body:
   - type: markdown
     attributes:
@@ -15,7 +15,6 @@ body:
                 * Test [daily builds](https://builder.blender.org/) to verify if the issue is already fixed.
                 * Test [previous versions](https://download.blender.org/release/) to find an older working version.
                 * For feature requests, feedback, questions or build issues, see [communication channels](https://wiki.blender.org/wiki/Communication/Contact#User_Feedback_and_Requests).
-                * Security vulnerabilities should be [reported privately](https://wiki.blender.org/wiki/Process/Vulnerability_Reports).
                 * If there are multiple bugs, make multiple bug reports.
 
   - type: textarea

.gitea/issue_template/design.yaml

@@ -1,7 +1,7 @@
 name: Design
 about: Create a design task (for developers only)
 labels:
-  - "Type/Design"
+  - "type::Design"
 body:
   - type: textarea
     id: body

.gitea/issue_template/todo.yaml

@@ -1,7 +1,7 @@
 name: To Do
 about: Create a to do task (for developers only)
 labels:
-  - "Type/To Do"
+  - "type::To Do"
 body:
   - type: textarea
     id: body

.github/pull_request_template.md

@@ -1,4 +1,5 @@
-This repository is only used as a mirror. Blender development happens on projects.blender.org.
+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

.github/stale.yml

@@ -15,7 +15,8 @@ staleLabel: stale
 # Comment to post when closing a stale Issue or Pull Request.
 closeComment: >
   This issue has been automatically closed, because this repository is only
-  used as a mirror. Blender development happens on projects.blender.org.
+  used as a mirror of git.blender.org. Blender development happens on
+  developer.blender.org.
 
   To get started contributing code, please read:
   https://wiki.blender.org/wiki/Process/Contributing_Code

.gitignore

@@ -39,7 +39,7 @@ Desktop.ini
 /doc/python_api/rst/bmesh.ops.rst
 
 # in-source lib downloads
-/build_files/build_environment/downloads/
+/build_files/build_environment/downloads
 
 # in-source buildbot signing configuration
 /build_files/buildbot/codesign/config_server.py
@@ -48,27 +48,4 @@ Desktop.ini
 waveletNoiseTile.bin
 
 # testing environment
-/Testing/
+/Testing
-
-# Translations.
-/locale/user-config.py
-
-# External repositories.
-/scripts/addons/
-/scripts/addons_contrib/
-
-# Ignore old submodules directories.
-# Eventually need to get rid of those, but for the first time of transition
-# avoid indidents when the folders exists after bisect and developers staging
-# them by accident.
-/release/scripts/addons/
-/release/datafiles/locale/
-/release/scripts/addons_contrib/
-/source/tools/
-
-# Build files for VS and VS Code.
-/build/
-/out/
-CMakeSettings.json
-CMakePresets.json
-CMakeUserPresets.json

.gitmodules

@@ -0,0 +1,20 @@
+[submodule "release/scripts/addons"]
+	path = release/scripts/addons
+	url = ../blender-addons.git
+	branch = master
+	ignore = all
+[submodule "release/scripts/addons_contrib"]
+	path = release/scripts/addons_contrib
+	url = ../blender-addons-contrib.git
+	branch = master
+	ignore = all
+[submodule "release/datafiles/locale"]
+	path = release/datafiles/locale
+	url = ../blender-translations.git
+	branch = master
+	ignore = all
+[submodule "source/tools"]
+	path = source/tools
+	url = ../blender-dev-tools.git
+	branch = master
+	ignore = all

CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2006 Blender Foundation
+# Copyright 2006 Blender Foundation. All rights reserved.
 
 # -----------------------------------------------------------------------------
 # Early Initialization
@@ -164,7 +164,7 @@ get_blender_version()
 # Declare Options
 
 # Blender internal features
-option(WITH_BLENDER "Build blender (disable to build only Cycles stand-alone)." ON)
+option(WITH_BLENDER "Build blender (disable to build only the blender player)" ON)
 mark_as_advanced(WITH_BLENDER)
 
 if(WIN32)
@@ -331,9 +331,13 @@ option(WITH_MOD_REMESH          "Enable Remesh Modifier" ON)
 option(WITH_MOD_OCEANSIM        "Enable Ocean Modifier" ON)
 
 # Image format support
+option(WITH_OPENIMAGEIO         "Enable OpenImageIO Support (http://www.openimageio.org)" ON)
 option(WITH_IMAGE_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
 option(WITH_IMAGE_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org)" ON)
+option(WITH_IMAGE_TIFF          "Enable LibTIFF Support" ON)
+option(WITH_IMAGE_DDS           "Enable DDS Image Support" ON)
 option(WITH_IMAGE_CINEON        "Enable CINEON and DPX Image Support" ON)
+option(WITH_IMAGE_HDR           "Enable HDR Image Support" ON)
 option(WITH_IMAGE_WEBP          "Enable WebP Image Support" ON)
 
 # Audio/Video format support
@@ -354,7 +358,6 @@ option(WITH_MATERIALX           "Enable MaterialX Support" OFF)
 # Disable opencollada when we don't have precompiled libs
 option(WITH_OPENCOLLADA   "Enable OpenCollada Support (http://www.opencollada.org)" ON)
 option(WITH_IO_WAVEFRONT_OBJ  "Enable Wavefront-OBJ 3D file format support (*.obj)" ON)
-option(WITH_IO_PLY            "Enable PLY 3D file format support (*.ply)" ON)
 option(WITH_IO_STL            "Enable STL 3D file format support (*.stl)" ON)
 option(WITH_IO_GPENCIL        "Enable grease-pencil file format IO (*.svg, *.pdf)" ON)
 
@@ -521,8 +524,7 @@ endif()
 if(NOT APPLE)
   option(WITH_CYCLES_DEVICE_HIP        "Enable Cycles AMD HIP support" ON)
   option(WITH_CYCLES_HIP_BINARIES      "Build Cycles AMD HIP binaries" OFF)
-  # Radeon VII (gfx906) not currently working with HIP SDK, so left out of the list.
+  set(CYCLES_HIP_BINARIES_ARCH gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 gfx1035 gfx1100 gfx1101 gfx1102 CACHE STRING "AMD HIP architectures to build binaries for")
-  set(CYCLES_HIP_BINARIES_ARCH gfx900 gfx90c gfx902 gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 gfx1035 gfx1100 gfx1101 gfx1102 CACHE STRING "AMD HIP architectures to build binaries for")
   mark_as_advanced(WITH_CYCLES_DEVICE_HIP)
   mark_as_advanced(CYCLES_HIP_BINARIES_ARCH)
 endif()
@@ -615,20 +617,16 @@ endif()
 
 option(WITH_OPENGL "When off limits visibility of the opengl headers to just bf_gpu and gawain (temporary option for development purposes)" ON)
 option(WITH_GPU_BUILDTIME_SHADER_BUILDER "Shader builder is a developer option enabling linting on GLSL during compilation" OFF)
-option(WITH_RENDERDOC "Use Renderdoc API to capture frames" OFF)
 
 mark_as_advanced(
   WITH_OPENGL
   WITH_GPU_BUILDTIME_SHADER_BUILDER
-  WITH_RENDERDOC
 )
 
 # Vulkan
 option(WITH_VULKAN_BACKEND "Enable Vulkan as graphics backend (only for development)" OFF)
-option(WITH_VULKAN_GUARDEDALLOC "Use guardedalloc for host allocations done inside Vulkan (development option)" OFF)
 mark_as_advanced(
   WITH_VULKAN_BACKEND
-  WITH_VULKAN_GUARDEDALLOC
 )
 
 # Metal
@@ -646,15 +644,15 @@ if(WIN32)
 endif()
 
 # Compiler tool-chain.
-if(UNIX)
+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)
-  endif()
-  if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
     option(WITH_LINKER_LLD "Use ld.lld linker which is usually faster than ld.gold" OFF)
     mark_as_advanced(WITH_LINKER_LLD)
-    option(WITH_LINKER_MOLD "Use ld.mold linker which is usually faster than ld.gold & ld.lld. Needs \"sold\" subscription on macOS." OFF)
+  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()
 endif()
@@ -691,10 +689,8 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
       else()
         string(APPEND _asan_defaults " -fsanitize=object-size")
       endif()
-    elseif(CMAKE_COMPILER_IS_GNUCC)
-      string(APPEND _asan_defaults " -fsanitize=leak -fsanitize=object-size")
     else()
-      string(APPEND _asan_defaults " -fsanitize=leak")
+      string(APPEND _asan_defaults " -fsanitize=leak -fsanitize=object-size")
     endif()
 
     set(COMPILER_ASAN_CFLAGS "${_asan_defaults}" CACHE STRING "C flags for address sanitizer")
@@ -711,7 +707,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/7.0.0/lib/windows
         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/6.0.0/lib/windows
       )
-      mark_as_advanced(COMPILER_ASAN_LIBRARY)
     elseif(APPLE)
       execute_process(COMMAND ${CMAKE_CXX_COMPILER}
         -print-file-name=lib
@@ -726,14 +721,13 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
           "${CLANG_LIB_DIR}/darwin/"
       )
       unset(CLANG_LIB_DIR)
-      mark_as_advanced(COMPILER_ASAN_LIBRARY)
+    else()
-    elseif(CMAKE_COMPILER_IS_GNUCC)
       find_library(
         COMPILER_ASAN_LIBRARY asan ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}
       )
-      mark_as_advanced(COMPILER_ASAN_LIBRARY)
     endif()
 
+    mark_as_advanced(COMPILER_ASAN_LIBRARY)
   endif()
 endif()
 
@@ -888,14 +882,16 @@ set_and_warn_dependency(WITH_TBB WITH_MOD_FLUID         OFF)
 # NanoVDB requires OpenVDB to convert the data structure
 set_and_warn_dependency(WITH_OPENVDB WITH_NANOVDB       OFF)
 
-# OpenVDB, Alembic and Vulkan, OSL uses 'half' or 'imath' from OpenEXR
+# OpenVDB and OpenColorIO uses 'half' type from OpenEXR
 set_and_warn_dependency(WITH_IMAGE_OPENEXR WITH_OPENVDB OFF)
-set_and_warn_dependency(WITH_IMAGE_OPENEXR WITH_ALEMBIC OFF)
+
-set_and_warn_dependency(WITH_IMAGE_OPENEXR WITH_VULKAN_BACKEND OFF)
+# Haru needs `TIFFFaxBlackCodes` & `TIFFFaxWhiteCodes` symbols from TIFF.
-set_and_warn_dependency(WITH_IMAGE_OPENEXR WITH_CYCLES_OSL OFF)
+set_and_warn_dependency(WITH_IMAGE_TIFF WITH_HARU       OFF)
 
 # auto enable openimageio for cycles
 if(WITH_CYCLES)
+  set(WITH_OPENIMAGEIO ON)
+
   # auto enable llvm for cycles_osl
   if(WITH_CYCLES_OSL)
     set(WITH_LLVM ON CACHE BOOL "" FORCE)
@@ -956,6 +952,21 @@ endif()
 # -----------------------------------------------------------------------------
 # Check if Sub-modules are Cloned
 
+if(WITH_INTERNATIONAL)
+  file(GLOB RESULT "${CMAKE_SOURCE_DIR}/release/datafiles/locale")
+  list(LENGTH RESULT DIR_LEN)
+  if(DIR_LEN EQUAL 0)
+    message(
+      WARNING
+      "Translation path '${CMAKE_SOURCE_DIR}/release/datafiles/locale' is missing, "
+      "This is a 'git submodule', which are known not to work with bridges to other version "
+      "control systems."
+    )
+    set(TRANSLATIONS_FOUND OFF)
+    set_and_warn_library_found("Translations" TRANSLATIONS_FOUND WITH_INTERNATIONAL)
+  endif()
+endif()
+
 if(WITH_PYTHON)
   # While we have this as an '#error' in 'bpy_capi_utils.h',
   # upgrading Python tends to cause confusion for users who build.
@@ -971,14 +982,14 @@ if(WITH_PYTHON)
     )
   endif()
 
-  file(GLOB RESULT "${CMAKE_SOURCE_DIR}/scripts/addons")
+  file(GLOB RESULT "${CMAKE_SOURCE_DIR}/release/scripts/addons")
   list(LENGTH RESULT DIR_LEN)
   if(DIR_LEN EQUAL 0)
     message(
       WARNING
-      "Addons path '${CMAKE_SOURCE_DIR}/scripts/addons' is missing. "
+      "Addons path '${CMAKE_SOURCE_DIR}/release/scripts/addons' is missing, "
-      "This is an external repository which needs to be checked out. Use `make update` to do so. "
+      "This is a 'git submodule', which are known not to work with bridges to other version "
-      "* CONTINUING WITHOUT ADDONS *"
+      "control systems: * CONTINUING WITHOUT ADDONS *"
     )
   endif()
 endif()
@@ -1087,6 +1098,13 @@ if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM)
 endif()
 
 if(WITH_CYCLES)
+  if(NOT WITH_OPENIMAGEIO)
+    message(
+      FATAL_ERROR
+      "Cycles requires WITH_OPENIMAGEIO, the library may not have been found. "
+      "Configure OIIO or disable WITH_CYCLES"
+    )
+  endif()
   if(WITH_CYCLES_OSL)
     if(NOT WITH_LLVM)
       message(
@@ -1559,9 +1577,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
   # add_check_c_compiler_flag(C_WARNINGS C_WARN_UNUSED_MACROS      -Wunused-macros)
   # add_check_cxx_compiler_flag(CXX_WARNINGS CXX_WARN_UNUSED_MACROS          -Wunused-macros)
 
-  add_check_c_compiler_flag(C_WARNINGS C_WARN_ERROR_UNGUARDED_AVAILABILITY_NEW -Werror=unguarded-availability-new)
-  add_check_c_compiler_flag(CXX_WARNINGS CXX_WARN_ERROR_UNGUARDED_AVAILABILITY_NEW -Werror=unguarded-availability-new)
-
   # ---------------------
   # Suppress Strict Flags
 
@@ -1581,8 +1596,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
   add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_NORETURN -Wno-missing-noreturn)
   add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_BUT_SET_VARIABLE -Wno-unused-but-set-variable)
   add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations)
-  add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_STRICT_PROTOTYPES -Wno-strict-prototypes)
-  add_check_c_compiler_flag(C_REMOVE_STRICT_FLAGS C_WARN_NO_BITWISE_INSTEAD_OF_LOGICAL -Wno-bitwise-instead-of-logical)
 
   add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
   add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_PRIVATE_FIELD -Wno-unused-private-field)
@@ -1596,7 +1609,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
   add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNDEFINED_VAR_TEMPLATE -Wno-undefined-var-template)
   add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_INSTANTIATION_AFTER_SPECIALIZATION -Wno-instantiation-after-specialization)
   add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_MISLEADING_INDENTATION    -Wno-misleading-indentation)
-  add_check_cxx_compiler_flag(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_BITWISE_INSTEAD_OF_LOGICAL -Wno-bitwise-instead-of-logical)
 
 elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 
@@ -1617,7 +1629,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
     # warning level:
     "/W3"
     "/w34062"  # switch statement contains 'default' but no 'case' labels
-    "/w34100"  # 'identifier' : unreferenced formal parameter
     "/w34115"  # 'type' : named type definition in parentheses
     "/w34189"  # local variable is initialized but not referenced
     # see https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/c5038?view=vs-2017
@@ -1939,8 +1950,12 @@ if(FIRST_RUN)
 
   info_cfg_text("Image Formats:")
   info_cfg_option(WITH_IMAGE_CINEON)
+  info_cfg_option(WITH_IMAGE_DDS)
+  info_cfg_option(WITH_IMAGE_HDR)
   info_cfg_option(WITH_IMAGE_OPENEXR)
   info_cfg_option(WITH_IMAGE_OPENJPEG)
+  info_cfg_option(WITH_IMAGE_TIFF)
+  info_cfg_option(WITH_OPENIMAGEIO)
 
   info_cfg_text("Audio:")
   info_cfg_option(WITH_CODEC_AVI)

GNUmakefile

@@ -69,7 +69,7 @@ Static Source Code Checking
    * check_cmake:           Runs our own cmake file checker which detects errors in the cmake file list definitions.
    * check_pep8:            Checks all Python script are pep8 which are tagged to use the stricter formatting.
    * check_mypy:            Checks all Python scripts using mypy,
-                            see: tools/check_source/check_mypy_config.py scripts which are included.
+                            see: source/tools/check_source/check_mypy_config.py scripts which are included.
 
 Documentation Checking
 
@@ -85,7 +85,7 @@ Spell Checkers
    * check_spelling_osl:    Check for spelling errors (OSL only).
    * check_spelling_py:     Check for spelling errors (Python only).
 
-   Note: an additional word-list is maintained at: 'tools/check_source/check_spelling_c_config.py'
+   Note: an additional word-list is maintained at: 'source/tools/check_source/check_spelling_c_config.py'
 
    Note: that spell checkers can take a 'CHECK_SPELLING_CACHE' filepath argument,
    so re-running does not need to re-check unchanged files.
@@ -299,11 +299,7 @@ else
 	ifneq ("$(wildcard $(DEPS_BUILD_DIR)/build.ninja)","")
 		DEPS_BUILD_COMMAND:=ninja
 	else
-		ifeq ($(OS), Darwin)
+		DEPS_BUILD_COMMAND:=make -s
-			DEPS_BUILD_COMMAND:=make -s
-		else
-			DEPS_BUILD_COMMAND:="$(BLENDER_DIR)/build_files/build_environment/linux/make_deps_wrapper.sh" -s
-		endif
 	endif
 endif
 
@@ -402,7 +398,7 @@ endif
 
 deps: .FORCE
 	@echo
-	@echo Configuring dependencies in \"$(DEPS_BUILD_DIR)\", install to \"$(DEPS_INSTALL_DIR)\"
+	@echo Configuring dependencies in \"$(DEPS_BUILD_DIR)\"
 
 	@cmake -H"$(DEPS_SOURCE_DIR)" \
 	       -B"$(DEPS_BUILD_DIR)" \
@@ -490,22 +486,22 @@ check_smatch: .FORCE
 	$(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_smatch.py"
 
 check_mypy: .FORCE
-	@$(PYTHON) "$(BLENDER_DIR)/tools/check_source/check_mypy.py"
+	@$(PYTHON) "$(BLENDER_DIR)/source/tools/check_source/check_mypy.py"
 
 check_wiki_file_structure: .FORCE
 	@PYTHONIOENCODING=utf_8 $(PYTHON) \
-	    "$(BLENDER_DIR)/tools/check_wiki/check_wiki_file_structure.py"
+	    "$(BLENDER_DIR)/source/tools/check_wiki/check_wiki_file_structure.py"
 
 check_spelling_py: .FORCE
 	@cd "$(BUILD_DIR)" ; \
 	PYTHONIOENCODING=utf_8 $(PYTHON) \
-	    "$(BLENDER_DIR)/tools/check_source/check_spelling.py" \
+	    "$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" \
-	    "$(BLENDER_DIR)/scripts"
+	    "$(BLENDER_DIR)/release/scripts"
 
 check_spelling_c: .FORCE
 	@cd "$(BUILD_DIR)" ; \
 	PYTHONIOENCODING=utf_8 $(PYTHON) \
-	    "$(BLENDER_DIR)/tools/check_source/check_spelling.py" \
+	    "$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" \
 	    --cache-file=$(CHECK_SPELLING_CACHE) \
 	    "$(BLENDER_DIR)/source" \
 	    "$(BLENDER_DIR)/intern/cycles" \
@@ -515,21 +511,21 @@ check_spelling_c: .FORCE
 check_spelling_osl: .FORCE
 	@cd "$(BUILD_DIR)" ; \
 	PYTHONIOENCODING=utf_8 $(PYTHON) \
-	    "$(BLENDER_DIR)/tools/check_source/check_spelling.py" \
+	    "$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" \
 	    --cache-file=$(CHECK_SPELLING_CACHE) \
 	    "$(BLENDER_DIR)/intern/cycles/kernel/shaders"
 
 check_descriptions: .FORCE
 	@$(BLENDER_BIN) --background -noaudio --factory-startup --python \
-	    "$(BLENDER_DIR)/tools/check_source/check_descriptions.py"
+	    "$(BLENDER_DIR)/source/tools/check_source/check_descriptions.py"
 
 check_deprecated: .FORCE
 	@PYTHONIOENCODING=utf_8 $(PYTHON) \
-	    tools/check_source/check_deprecated.py
+	    source/tools/check_source/check_deprecated.py
 
 check_licenses: .FORCE
 	@PYTHONIOENCODING=utf_8 $(PYTHON) \
-	    "$(BLENDER_DIR)/tools/check_source/check_licenses.py" \
+	    "$(BLENDER_DIR)/source/tools/check_source/check_licenses.py" \
 	    "--show-headers=$(SHOW_HEADERS)"
 
 check_pep8: .FORCE
@@ -538,7 +534,7 @@ check_pep8: .FORCE
 
 check_cmake: .FORCE
 	@PYTHONIOENCODING=utf_8 $(PYTHON) \
-	    tools/check_source/check_cmake_consistency.py
+	    source/tools/check_source/check_cmake_consistency.py
 
 
 # -----------------------------------------------------------------------------
@@ -576,8 +572,8 @@ update_code: .FORCE
 	@$(PYTHON) ./build_files/utils/make_update.py --no-libraries
 
 format: .FORCE
-	@PATH="${LIBDIR}/llvm/bin/:$(PATH)" $(PYTHON) tools/utils_maintenance/clang_format_paths.py $(PATHS)
+	@PATH="${LIBDIR}/llvm/bin/:$(PATH)" $(PYTHON) source/tools/utils_maintenance/clang_format_paths.py $(PATHS)
-	@$(PYTHON) tools/utils_maintenance/autopep8_format_paths.py --autopep8-command="$(AUTOPEP8)" $(PATHS)
+	@$(PYTHON) source/tools/utils_maintenance/autopep8_format_paths.py --autopep8-command="$(AUTOPEP8)" $(PATHS)
 
 
 # -----------------------------------------------------------------------------

README.md

@@ -24,7 +24,7 @@ Development
 -----------
 
 - [Build Instructions](https://wiki.blender.org/wiki/Building_Blender)
-- [Code Review & Bug Tracker](https://projects.blender.org)
+- [Code Review & Bug Tracker](https://developer.blender.org)
 - [Developer Forum](https://devtalk.blender.org)
 - [Developer Documentation](https://wiki.blender.org)
 

build_files/build_environment/CMakeLists.txt

@@ -78,7 +78,12 @@ include(cmake/tbb.cmake)
 include(cmake/python.cmake)
 include(cmake/llvm.cmake)
 include(cmake/osl.cmake)
-include(cmake/numpy.cmake)
+option(USE_PIP_NUMPY "Install NumPy using pip wheel instead of building from source" OFF)
+if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64"))
+  set(USE_PIP_NUMPY ON)
+else()
+  include(cmake/numpy.cmake)
+endif()
 include(cmake/python_site_packages.cmake)
 include(cmake/package_python.cmake)
 include(cmake/openimageio.cmake)
@@ -90,26 +95,28 @@ include(cmake/haru.cmake)
 # 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)
+include(cmake/openimagedenoise.cmake)
+include(cmake/embree.cmake)
+include(cmake/openpgl.cmake)
+include(cmake/fmt.cmake)
+include(cmake/robinmap.cmake)
+include(cmake/xml2.cmake)
+
 include(cmake/fribidi.cmake)
 include(cmake/harfbuzz.cmake)
 if(NOT APPLE)
   include(cmake/xr_openxr.cmake)
-  include(cmake/dpcpp.cmake)
+  if(NOT WIN32 OR BUILD_MODE STREQUAL Release)
-  include(cmake/dpcpp_deps.cmake)
+    include(cmake/dpcpp.cmake)
+    include(cmake/dpcpp_deps.cmake)
+  endif()
   if(NOT WIN32)
     include(cmake/igc.cmake)
     include(cmake/gmmlib.cmake)
     include(cmake/ocloc.cmake)
   endif()
 endif()
-include(cmake/ispc.cmake)
-include(cmake/openimagedenoise.cmake)
-# Embree needs to be included after dpcpp as it uses it for compiling with GPU support
-include(cmake/embree.cmake)
-include(cmake/openpgl.cmake)
-include(cmake/fmt.cmake)
-include(cmake/robinmap.cmake)
-include(cmake/xml2.cmake)
 
 # OpenColorIO and dependencies.
 include(cmake/expat.cmake)

build_files/build_environment/cmake/download.cmake

@@ -156,7 +156,6 @@ download_source(OPENCLHEADERS)
 download_source(ICDLOADER)
 download_source(MP11)
 download_source(SPIRV_HEADERS)
-download_source(UNIFIED_RUNTIME)
 download_source(IGC)
 download_source(IGC_LLVM)
 download_source(IGC_OPENCL_CLANG)

build_files/build_environment/cmake/dpcpp.cmake

@@ -5,9 +5,6 @@
 # for now.
 string(REPLACE "-DCMAKE_CXX_STANDARD=17" " " DPCPP_CMAKE_FLAGS "${DEFAULT_CMAKE_FLAGS}")
 
-# DPCPP already generates debug libs, there isn't much point in compiling it in debug mode itself.
-string(REPLACE "-DCMAKE_BUILD_TYPE=Debug" "-DCMAKE_BUILD_TYPE=Release" DPCPP_CMAKE_FLAGS "${DPCPP_CMAKE_FLAGS}")
-
 if(WIN32)
   set(LLVM_GENERATOR "Ninja")
 else()
@@ -41,18 +38,17 @@ set(DPCPP_EXTRA_ARGS
   -DLEVEL_ZERO_LIBRARY=${LIBDIR}/level-zero/lib/${LIBPREFIX}ze_loader${SHAREDLIBEXT}
   -DLEVEL_ZERO_INCLUDE_DIR=${LIBDIR}/level-zero/include
   -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${BUILD_DIR}/spirvheaders/src/external_spirvheaders/
-  -DUNIFIED_RUNTIME_SOURCE_DIR=${BUILD_DIR}/unifiedruntime/src/external_unifiedruntime/
   # Below here is copied from an invocation of buildbot/config.py
   -DLLVM_ENABLE_ASSERTIONS=ON
   -DLLVM_TARGETS_TO_BUILD=X86
-  -DLLVM_EXTERNAL_PROJECTS=sycl^^llvm-spirv^^opencl^^libdevice^^xpti^^xptifw^^lld
+  -DLLVM_EXTERNAL_PROJECTS=sycl^^llvm-spirv^^opencl^^libdevice^^xpti^^xptifw
   -DLLVM_EXTERNAL_SYCL_SOURCE_DIR=${DPCPP_SOURCE_ROOT}/sycl
   -DLLVM_EXTERNAL_LLVM_SPIRV_SOURCE_DIR=${DPCPP_SOURCE_ROOT}/llvm-spirv
   -DLLVM_EXTERNAL_XPTI_SOURCE_DIR=${DPCPP_SOURCE_ROOT}/xpti
   -DXPTI_SOURCE_DIR=${DPCPP_SOURCE_ROOT}/xpti
   -DLLVM_EXTERNAL_XPTIFW_SOURCE_DIR=${DPCPP_SOURCE_ROOT}/xptifw
   -DLLVM_EXTERNAL_LIBDEVICE_SOURCE_DIR=${DPCPP_SOURCE_ROOT}/libdevice
-  -DLLVM_ENABLE_PROJECTS=clang^^sycl^^llvm-spirv^^opencl^^libdevice^^xpti^^xptifw^^lld
+  -DLLVM_ENABLE_PROJECTS=clang^^sycl^^llvm-spirv^^opencl^^libdevice^^xpti^^xptifw
   -DLIBCLC_TARGETS_TO_BUILD=
   -DLIBCLC_GENERATE_REMANGLED_VARIANTS=OFF
   -DSYCL_BUILD_PI_HIP_PLATFORM=AMD
@@ -108,19 +104,13 @@ add_dependencies(
   external_mp11
   external_level-zero
   external_spirvheaders
-  external_unifiedruntime
 )
 
 if(BUILD_MODE STREQUAL Release AND WIN32)
   ExternalProject_Add_Step(external_dpcpp after_install
+      COMMAND ${CMAKE_COMMAND} -E rm -f ${LIBDIR}/dpcpp/bin/clang-cl.exe
+      COMMAND ${CMAKE_COMMAND} -E rm -f ${LIBDIR}/dpcpp/bin/clang-cpp.exe
+      COMMAND ${CMAKE_COMMAND} -E rm -f ${LIBDIR}/dpcpp/bin/clang.exe
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/dpcpp ${HARVEST_TARGET}/dpcpp
-      COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/clang-cl.exe
-      COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/clang-cpp.exe
-      COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/clang.exe
-      COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/ld.lld.exe
-      COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/ld64.lld.exe
-      COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/lld.exe
-      COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/lld-link.exe
-      COMMAND ${CMAKE_COMMAND} -E rm -f ${HARVEST_TARGET}/dpcpp/bin/wasm-ld.exe
   )
 endif()

build_files/build_environment/cmake/dpcpp_deps.cmake

@@ -59,13 +59,3 @@ ExternalProject_Add(external_spirvheaders
   BUILD_COMMAND echo .
   INSTALL_COMMAND echo .
 )
-
-ExternalProject_Add(external_unifiedruntime
-  URL file://${PACKAGE_DIR}/${UNIFIED_RUNTIME_FILE}
-  URL_HASH ${UNIFIED_RUNTIME_HASH_TYPE}=${UNIFIED_RUNTIME_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/unifiedruntime
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
-  INSTALL_COMMAND echo .
-)

build_files/build_environment/cmake/embree.cmake

@@ -3,29 +3,18 @@
 # Note the utility apps may use png/tiff/gif system libraries, but the
 # library itself does not depend on them, so should give no problems.
 
-set(EMBREE_CMAKE_FLAGS ${DEFAULT_CMAKE_FLAGS})
-
 set(EMBREE_EXTRA_ARGS
   -DEMBREE_ISPC_SUPPORT=OFF
   -DEMBREE_TUTORIALS=OFF
-  -DEMBREE_STATIC_LIB=OFF
+  -DEMBREE_STATIC_LIB=ON
   -DEMBREE_RAY_MASK=ON
   -DEMBREE_FILTER_FUNCTION=ON
   -DEMBREE_BACKFACE_CULLING=OFF
-  -DEMBREE_BACKFACE_CULLING_CURVES=ON
-  -DEMBREE_BACKFACE_CULLING_SPHERES=ON
   -DEMBREE_TASKING_SYSTEM=TBB
   -DEMBREE_TBB_ROOT=${LIBDIR}/tbb
   -DTBB_ROOT=${LIBDIR}/tbb
 )
 
-if(WIN32)
-  set(EMBREE_EXTRA_ARGS
-    ${EMBREE_EXTRA_ARGS}
-    -DCMAKE_DEBUG_POSTFIX=_d
-  )
-endif()
-
 if(NOT BLENDER_PLATFORM_ARM)
   set(EMBREE_EXTRA_ARGS
     ${EMBREE_EXTRA_ARGS}
@@ -33,43 +22,6 @@ if(NOT BLENDER_PLATFORM_ARM)
   )
 endif()
 
-if(NOT APPLE)
-  if(WIN32)
-    # Levels below -O2 don't work well for Embree+SYCL.
-    string(REGEX REPLACE "-O[A-Za-z0-9]" "" EMBREE_CLANG_CMAKE_CXX_FLAGS_DEBUG ${BLENDER_CLANG_CMAKE_C_FLAGS_DEBUG})
-    string(APPEND EMBREE_CLANG_CMAKE_CXX_FLAGS_DEBUG " -O2")
-    string(REGEX REPLACE "-O[A-Za-z0-9]" "" EMBREE_CLANG_CMAKE_C_FLAGS_DEBUG ${BLENDER_CLANG_CMAKE_C_FLAGS_DEBUG})
-    string(APPEND EMBREE_CLANG_CMAKE_C_FLAGS_DEBUG " -O2")
-    set(EMBREE_CMAKE_FLAGS
-      -DCMAKE_BUILD_TYPE=${BUILD_MODE}
-      -DCMAKE_CXX_FLAGS_RELEASE=${BLENDER_CLANG_CMAKE_CXX_FLAGS_RELEASE}
-      -DCMAKE_CXX_FLAGS_MINSIZEREL=${BLENDER_CLANG_CMAKE_CXX_FLAGS_MINSIZEREL}
-      -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${BLENDER_CLANG_CMAKE_CXX_FLAGS_RELWITHDEBINFO}
-      -DCMAKE_CXX_FLAGS_DEBUG=${EMBREE_CLANG_CMAKE_CXX_FLAGS_DEBUG}
-      -DCMAKE_C_FLAGS_RELEASE=${BLENDER_CLANG_CMAKE_C_FLAGS_RELEASE}
-      -DCMAKE_C_FLAGS_MINSIZEREL=${BLENDER_CLANG_CMAKE_C_FLAGS_MINSIZEREL}
-      -DCMAKE_C_FLAGS_RELWITHDEBINFO=${BLENDER_CLANG_CMAKE_C_FLAGS_RELWITHDEBINFO}
-      -DCMAKE_C_FLAGS_DEBUG=${EMBREE_CLANG_CMAKE_C_FLAGS_DEBUG}
-      -DCMAKE_CXX_STANDARD=17
-    )
-    set(EMBREE_EXTRA_ARGS
-      -DCMAKE_CXX_COMPILER=${LIBDIR}/dpcpp/bin/clang++.exe
-      -DCMAKE_C_COMPILER=${LIBDIR}/dpcpp/bin/clang.exe
-      -DCMAKE_SHARED_LINKER_FLAGS=-L"${LIBDIR}/dpcpp/lib"
-      -DEMBREE_SYCL_SUPPORT=ON
-      ${EMBREE_EXTRA_ARGS}
-    )
-  else()
-    set(EMBREE_EXTRA_ARGS
-      -DCMAKE_CXX_COMPILER=${LIBDIR}/dpcpp/bin/clang++
-      -DCMAKE_C_COMPILER=${LIBDIR}/dpcpp/bin/clang
-      -DCMAKE_SHARED_LINKER_FLAGS=-L"${LIBDIR}/dpcpp/lib"
-      -DEMBREE_SYCL_SUPPORT=ON
-      ${EMBREE_EXTRA_ARGS}
-    )
-  endif()
-endif()
-
 if(TBB_STATIC_LIBRARY)
   set(EMBREE_EXTRA_ARGS
     ${EMBREE_EXTRA_ARGS}
@@ -81,41 +33,37 @@ ExternalProject_Add(external_embree
   URL file://${PACKAGE_DIR}/${EMBREE_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${EMBREE_HASH_TYPE}=${EMBREE_HASH}
-  CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/embree
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/embree/src/external_embree < ${PATCH_DIR}/embree.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${EMBREE_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/embree
 )
 
-if(NOT APPLE)
+add_dependencies(
-  add_dependencies(
+  external_embree
-    external_embree
+  external_tbb
-    external_tbb
+)
-    external_dpcpp
-  )
-else()
-  add_dependencies(
-    external_embree
-    external_tbb
-  )
-endif()
 
 if(WIN32)
+
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_embree after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/embree/include ${HARVEST_TARGET}/embree/include
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/embree ${HARVEST_TARGET}/embree
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/embree/lib ${HARVEST_TARGET}/embree/lib
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/embree/share ${HARVEST_TARGET}/embree/share
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/bin/embree4.dll ${HARVEST_TARGET}/embree/bin/embree4.dll
       DEPENDEES install
     )
   else()
-    ExternalProject_Add_Step(external_embree after_install
+  ExternalProject_Add_Step(external_embree after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/bin/embree4_d.dll ${HARVEST_TARGET}/embree/bin/embree4_d.dll
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree3.lib ${HARVEST_TARGET}/embree/lib/embree3_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree4_d.lib ${HARVEST_TARGET}/embree/lib/embree4_d.lib
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_avx.lib ${HARVEST_TARGET}/embree/lib/embree_avx_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree4_sycl_d.lib ${HARVEST_TARGET}/embree/lib/embree4_sycl_d.lib
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_avx2.lib ${HARVEST_TARGET}/embree/lib/embree_avx2_d.lib
-      DEPENDEES install
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_sse42.lib ${HARVEST_TARGET}/embree/lib/embree_sse42_d.lib
-    )
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/lexers.lib ${HARVEST_TARGET}/embree/lib/lexers_d.lib
-  endif()
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/math.lib ${HARVEST_TARGET}/embree/lib/math_d.lib
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/simd.lib ${HARVEST_TARGET}/embree/lib/simd_d.lib
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/sys.lib ${HARVEST_TARGET}/embree/lib/sys_d.lib
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/tasking.lib ${HARVEST_TARGET}/embree/lib/tasking_d.lib
+    DEPENDEES install
+  )
+endif()
+
 endif()

build_files/build_environment/cmake/epoxy.cmake

@@ -10,7 +10,7 @@ ExternalProject_Add(external_epoxy
   URL_HASH ${EPOXY_HASH_TYPE}=${EPOXY_HASH}
   PREFIX ${BUILD_DIR}/epoxy
   PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/epoxy/src/external_epoxy/ < ${PATCH_DIR}/epoxy.diff
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && ${MESON} setup --prefix ${LIBDIR}/epoxy --default-library ${EPOXY_LIB_TYPE} --libdir lib ${BUILD_DIR}/epoxy/src/external_epoxy-build ${BUILD_DIR}/epoxy/src/external_epoxy -Dtests=false ${MESON_BUILD_TYPE}
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && ${MESON} setup --prefix ${LIBDIR}/epoxy --default-library ${EPOXY_LIB_TYPE} --libdir lib ${BUILD_DIR}/epoxy/src/external_epoxy-build ${BUILD_DIR}/epoxy/src/external_epoxy -Dtests=false
   BUILD_COMMAND ninja
   INSTALL_COMMAND ninja install
 )

build_files/build_environment/cmake/fribidi.cmake

@@ -9,7 +9,7 @@ ExternalProject_Add(external_fribidi
   URL_HASH ${FRIBIDI_HASH_TYPE}=${FRIBIDI_HASH}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   PREFIX ${BUILD_DIR}/fribidi
-  CONFIGURE_COMMAND ${MESON} setup --prefix ${LIBDIR}/fribidi ${MESON_BUILD_TYPE} -Ddocs=false --default-library static --libdir lib ${BUILD_DIR}/fribidi/src/external_fribidi-build ${BUILD_DIR}/fribidi/src/external_fribidi
+  CONFIGURE_COMMAND ${MESON} setup --prefix ${LIBDIR}/fribidi -Ddocs=false --default-library static --libdir lib ${BUILD_DIR}/fribidi/src/external_fribidi-build ${BUILD_DIR}/fribidi/src/external_fribidi
   BUILD_COMMAND ninja
   INSTALL_COMMAND ninja install
   INSTALL_DIR ${LIBDIR}/fribidi

build_files/build_environment/cmake/gmp.cmake

@@ -22,7 +22,7 @@ elseif(UNIX AND NOT APPLE)
   )
 endif()
 
-# Boolean crashes with Arm assembly, see #103423.
+# Boolean crashes with Arm assembly, see T103423.
 if(BLENDER_PLATFORM_ARM)
   set(GMP_OPTIONS
     ${GMP_OPTIONS}

build_files/build_environment/cmake/harfbuzz.cmake

@@ -21,7 +21,6 @@ set(HARFBUZZ_EXTRA_OPTIONS
   # Only used for command line utilities,
   # disable as this would add an addition & unnecessary build-dependency.
   -Dcairo=disabled
-  ${MESON_BUILD_TYPE}
 )
 
 ExternalProject_Add(external_harfbuzz
@@ -60,10 +59,3 @@ if(BUILD_MODE STREQUAL Release AND WIN32)
     DEPENDEES install
   )
 endif()
-
-if(BUILD_MODE STREQUAL Debug AND WIN32)
-  ExternalProject_Add_Step(external_harfbuzz after_install
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/harfbuzz/lib/libharfbuzz.a ${HARVEST_TARGET}/harfbuzz/lib/libharfbuzz_d.lib
-    DEPENDEES install
-  )
-endif()

build_files/build_environment/cmake/harvest.cmake

@@ -218,7 +218,6 @@ else()
   harvest(openimagedenoise/lib openimagedenoise/lib "*.a")
   harvest(embree/include embree/include "*.h")
   harvest(embree/lib embree/lib "*.a")
-  harvest(embree/lib embree/lib "*${SHAREDLIBEXT}*")
   harvest(openpgl/include openpgl/include "*.h")
   harvest(openpgl/lib openpgl/lib "*.a")
   harvest(openpgl/lib/cmake/openpgl-${OPENPGL_SHORT_VERSION} openpgl/lib/cmake/openpgl "*.cmake")

build_files/build_environment/cmake/igc.cmake

@@ -40,8 +40,7 @@ ExternalProject_Add(external_igc_llvm
     ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0004-OpenCL-support-cl_ext_float_atomics.patch &&
     ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0005-OpenCL-Add-cl_khr_integer_dot_product.patch &&
     ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/llvm/0001-Memory-leak-fix-for-Managed-Static-Mutex.patch &&
-    ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/llvm/0002-Remove-repo-name-in-LLVM-IR.patch &&
+    ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/llvm/0002-Remove-repo-name-in-LLVM-IR.patch
-    ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/llvm/0003-Add-missing-include-limit-in-benchmark.patch
 )
 add_dependencies(
   external_igc_llvm
@@ -56,6 +55,9 @@ ExternalProject_Add(external_igc_spirv_translator
   CONFIGURE_COMMAND echo .
   BUILD_COMMAND echo .
   INSTALL_COMMAND echo .
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${IGC_SPIRV_TRANSLATOR_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/spirv/0001-update-SPIR-V-headers-for-SPV_INTEL_split_barrier.patch &&
+    ${PATCH_CMD} -p 1 -d ${IGC_SPIRV_TRANSLATOR_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/spirv/0002-Add-support-for-split-barriers-extension-SPV_INTEL_s.patch &&
+    ${PATCH_CMD} -p 1 -d ${IGC_SPIRV_TRANSLATOR_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/spirv/0003-Support-cl_bf16_conversions.patch
 )
 add_dependencies(
   external_igc_spirv_translator

build_files/build_environment/cmake/mesa.cmake

@@ -15,7 +15,7 @@ llvm-config = '${LIBDIR}/llvm/bin/llvm-config'"
 )
 
 set(MESA_EXTRA_FLAGS
-  ${MESON_BUILD_TYPE}
+  -Dbuildtype=release
   -Dc_args=${MESA_CFLAGS}
   -Dcpp_args=${MESA_CXXFLAGS}
   -Dc_link_args=${MESA_LDFLAGS}

build_files/build_environment/cmake/openvdb.cmake

@@ -44,21 +44,13 @@ set(OPENVDB_EXTRA_ARGS
   # -DLLVM_DIR=${LIBDIR}/llvm/lib/cmake/llvm
 )
 
-set(OPENVDB_PATCH ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb.diff)
-if(APPLE)
-  set(OPENVDB_PATCH
-    ${OPENVDB_PATCH} &&
-    ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb_metal.diff
-  )
-endif()
-
 ExternalProject_Add(openvdb
   URL file://${PACKAGE_DIR}/${OPENVDB_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OPENVDB_HASH_TYPE}=${OPENVDB_HASH}
   CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/openvdb
-  PATCH_COMMAND ${OPENVDB_PATCH}
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openvdb ${DEFAULT_CMAKE_FLAGS} ${OPENVDB_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/openvdb
 )

build_files/build_environment/cmake/options.cmake

@@ -16,10 +16,8 @@ message("BuildMode = ${BUILD_MODE}")
 
 if(BUILD_MODE STREQUAL "Debug")
   set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Debug)
-  set(MESON_BUILD_TYPE -Dbuildtype=debug)
 else()
   set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Release)
-  set(MESON_BUILD_TYPE -Dbuildtype=release)
 endif()
 
 set(DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/downloads" CACHE STRING "Path for downloaded files")
@@ -74,27 +72,6 @@ if(WIN32)
   set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "/MD ${COMMON_MSVC_FLAGS} /D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
   set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD ${COMMON_MSVC_FLAGS} /D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS /Zi /O2 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=2 /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
 
-  # Set similar flags for CLANG compilation.
-  set(COMMON_CLANG_FLAGS "-D_DLL -D_MT") # Equivalent to MSVC /MD
-
-  if(WITH_OPTIMIZED_DEBUG)
-    set(BLENDER_CLANG_CMAKE_C_FLAGS_DEBUG "${COMMON_CLANG_FLAGS} -Xclang --dependent-lib=msvcrtd -O2 -D_DEBUG -DPSAPI_VERSION=2 -DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  else()
-    set(BLENDER_CLANG_CMAKE_C_FLAGS_DEBUG "${COMMON_CLANG_FLAGS} -Xclang --dependent-lib=msvcrtd -g -D_DEBUG -DPSAPI_VERSION=2 -DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  endif()
-  set(BLENDER_CLANG_CMAKE_C_FLAGS_MINSIZEREL "${COMMON_CLANG_FLAGS} -Xclang --dependent-lib=msvcrt -Os -DNDEBUG -DPSAPI_VERSION=2 -DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CLANG_CMAKE_C_FLAGS_RELEASE "${COMMON_CLANG_FLAGS}  -Xclang --dependent-lib=msvcrt -O2 -DNDEBUG -DPSAPI_VERSION=2 -DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CLANG_CMAKE_C_FLAGS_RELWITHDEBINFO "${COMMON_CLANG_FLAGS} -Xclang --dependent-lib=msvcrt -g -O2 -DNDEBUG -DPSAPI_VERSION=2 -DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-
-  if(WITH_OPTIMIZED_DEBUG)
-    set(BLENDER_CLANG_CMAKE_CXX_FLAGS_DEBUG "${COMMON_CLANG_FLAGS} -Xclang --dependent-lib=msvcrtd -D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS -O2 -D_DEBUG -DPLATFORM_WINDOWS -DPSAPI_VERSION=2 -DTINYFORMAT_ALLOW_WCHAR_STRINGS -DBOOST_DEBUG_PYTHON -DBOOST_ALL_NO_LIB")
-  else()
-    set(BLENDER_CLANG_CMAKE_CXX_FLAGS_DEBUG "${COMMON_CLANG_FLAG} -Xclang --dependent-lib=msvcrtd -D_DEBUG -DPLATFORM_WINDOWS -D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS -g -DPSAPI_VERSION=2 -DTINYFORMAT_ALLOW_WCHAR_STRINGS -DBOOST_DEBUG_PYTHON -DBOOST_ALL_NO_LIB")
-  endif()
-  set(BLENDER_CLANG_CMAKE_CXX_FLAGS_MINSIZEREL "${COMMON_CLANG_FLAGS} -Xclang --dependent-lib=msvcrt -D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS -O2 -DNDEBUG  -DPLATFORM_WINDOWS -DPSAPI_VERSION=2 -DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CLANG_CMAKE_CXX_FLAGS_RELEASE "${COMMON_CLANG_FLAGS} -Xclang --dependent-lib=msvcrt -D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS -O2 -DNDEBUG -DPLATFORM_WINDOWS -DPSAPI_VERSION=2 -DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CLANG_CMAKE_CXX_FLAGS_RELWITHDEBINFO "${COMMON_CLANG_FLAGS} -Xclang --dependent-lib=msvcrt -D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS -g -O2 -DNDEBUG -DPLATFORM_WINDOWS -DPSAPI_VERSION=2 -DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-
   set(PLATFORM_FLAGS)
   set(PLATFORM_CXX_FLAGS)
   set(PLATFORM_CMAKE_FLAGS)

build_files/build_environment/cmake/python.cmake

@@ -88,19 +88,6 @@ else()
     export LDFLAGS=${PYTHON_LDFLAGS} &&
     export PKG_CONFIG_PATH=${LIBDIR}/ffi/lib/pkgconfig)
 
-  # NOTE: untested on APPLE so far.
-  if(NOT APPLE)
-    set(PYTHON_CONFIGURE_EXTRA_ARGS
-      ${PYTHON_CONFIGURE_EXTRA_ARGS}
-      # Used on most release Linux builds (Fedora for e.g.),
-      # increases build times noticeably with the benefit of a modest speedup at runtime.
-      --enable-optimizations
-      # While LTO is OK when building on the same system, it's incompatible across GCC versions,
-      # making it impractical for developers to build against, so keep it disabled.
-      # `--with-lto`
-    )
-  endif()
-
   ExternalProject_Add(external_python
     URL file://${PACKAGE_DIR}/${PYTHON_FILE}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}

build_files/build_environment/cmake/python_site_packages.cmake

@@ -38,6 +38,15 @@ ExternalProject_Add(external_python_site_packages
   --no-binary :all:
 )
 
+if(USE_PIP_NUMPY)
+  # Use only wheel (and not build from source) to stop NumPy from linking against buggy
+  # Accelerate framework backend on macOS. Official wheels are built with OpenBLAS.
+  ExternalProject_Add_Step(external_python_site_packages after_install
+    COMMAND ${PYTHON_BINARY} -m pip install --no-cache-dir numpy==${NUMPY_VERSION} --only-binary :all:
+    DEPENDEES install
+  )
+endif()
+
 add_dependencies(
   external_python_site_packages
   external_python

build_files/build_environment/cmake/versions.cmake

@@ -165,9 +165,9 @@ set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${
 set(OPENMP_HASH_TYPE MD5)
 set(OPENMP_FILE openmp-${OPENMP_VERSION}.src.tar.xz)
 
-set(OPENIMAGEIO_VERSION v2.4.9.0)
+set(OPENIMAGEIO_VERSION v2.4.6.0)
 set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/refs/tags/${OPENIMAGEIO_VERSION}.tar.gz)
-set(OPENIMAGEIO_HASH 7da92a7d6029921a8599a977ff1efa2a)
+set(OPENIMAGEIO_HASH c7acc1b9a8fda04ef48f7de1feda4dae)
 set(OPENIMAGEIO_HASH_TYPE MD5)
 set(OPENIMAGEIO_FILE OpenImageIO-${OPENIMAGEIO_VERSION}.tar.gz)
 
@@ -478,9 +478,9 @@ set(SQLITE_HASH_TYPE SHA1)
 set(SQLITE_FILE sqlite-autoconf-${SQLLITE_LONG_VERSION}.tar.gz)
 set(SQLITE_CPE "cpe:2.3:a:sqlite:sqlite:${SQLITE_VERSION}:*:*:*:*:*:*:*")
 
-set(EMBREE_VERSION 4.0.1)
+set(EMBREE_VERSION 3.13.4)
 set(EMBREE_URI https://github.com/embree/embree/archive/v${EMBREE_VERSION}.zip)
-set(EMBREE_HASH dd26617719a587e126b341d1b32f7fd0)
+set(EMBREE_HASH 52d0be294d6c88ba7a6c9e046796e7be)
 set(EMBREE_HASH_TYPE MD5)
 set(EMBREE_FILE embree-v${EMBREE_VERSION}.zip)
 
@@ -528,16 +528,16 @@ set(XR_OPENXR_SDK_HASH a2623ebab3d0b340bc16311b14f02075)
 set(XR_OPENXR_SDK_HASH_TYPE MD5)
 set(XR_OPENXR_SDK_FILE OpenXR-SDK-${XR_OPENXR_SDK_VERSION}.tar.gz)
 
-set(WL_PROTOCOLS_VERSION 1.31)
+set(WL_PROTOCOLS_VERSION 1.21)
 set(WL_PROTOCOLS_FILE wayland-protocols-${WL_PROTOCOLS_VERSION}.tar.gz)
 set(WL_PROTOCOLS_URI https://gitlab.freedesktop.org/wayland/wayland-protocols/-/archive/${WL_PROTOCOLS_VERSION}/${WL_PROTOCOLS_FILE})
-set(WL_PROTOCOLS_HASH a28ff59a56e2ebb746048b6ef8d931d6)
+set(WL_PROTOCOLS_HASH af5ca07e13517cdbab33504492cef54a)
 set(WL_PROTOCOLS_HASH_TYPE MD5)
 
-set(WAYLAND_VERSION 1.22.0)
+set(WAYLAND_VERSION 1.21.0)
 set(WAYLAND_FILE wayland-${WAYLAND_VERSION}.tar.xz)
-set(WAYLAND_URI https://gitlab.freedesktop.org/wayland/wayland/-/releases/${WAYLAND_VERSION}/downloads/wayland-${WAYLAND_VERSION}.tar.xz)
+set(WAYLAND_URI https://gitlab.freedesktop.org/wayland/wayland/-/releases/1.21.0/downloads/wayland-${WAYLAND_VERSION}.tar.xz)
-set(WAYLAND_HASH 7410ab549e3928fce9381455b17b0803)
+set(WAYLAND_HASH f2653a2293bcd882d756c6a83d278903)
 set(WAYLAND_HASH_TYPE MD5)
 
 set(WAYLAND_LIBDECOR_VERSION 0.1.0)
@@ -599,15 +599,15 @@ set(OPENPGL_HASH db63f5dac5cfa8c110ede241f0c413f00db0c4748697381c4fa23e0f9e82a75
 set(OPENPGL_HASH_TYPE SHA256)
 set(OPENPGL_FILE openpgl-${OPENPGL_VERSION}.tar.gz)
 
-set(LEVEL_ZERO_VERSION v1.8.8)
+set(LEVEL_ZERO_VERSION v1.8.5)
 set(LEVEL_ZERO_URI https://github.com/oneapi-src/level-zero/archive/refs/tags/${LEVEL_ZERO_VERSION}.tar.gz)
-set(LEVEL_ZERO_HASH 3553ae8fa0d2d69c4210a8f3428bd6612bd8bb8a627faf52c3658a01851e66d2)
+set(LEVEL_ZERO_HASH b6e9663bbcc53c148d32376998298bec6f7c434ef2218c61fa708963e3a09394)
 set(LEVEL_ZERO_HASH_TYPE SHA256)
 set(LEVEL_ZERO_FILE level-zero-${LEVEL_ZERO_VERSION}.tar.gz)
 
-set(DPCPP_VERSION 2022-12)
+set(DPCPP_VERSION 20221019)
-set(DPCPP_URI https://github.com/intel/llvm/archive/refs/tags/${DPCPP_VERSION}.tar.gz)
+set(DPCPP_URI https://github.com/intel/llvm/archive/refs/tags/sycl-nightly/${DPCPP_VERSION}.tar.gz)
-set(DPCPP_HASH 13151d5ae79f7c9c4a9b072a0c486ae7b3c4993e301bb1268c92214451025790)
+set(DPCPP_HASH 2f533946e91ce3829431758ea17b0b834b960c1a796e9e4563c86e03eb9603a2)
 set(DPCPP_HASH_TYPE SHA256)
 set(DPCPP_FILE DPCPP-${DPCPP_VERSION}.tar.gz)
 
@@ -620,9 +620,9 @@ set(DPCPP_FILE DPCPP-${DPCPP_VERSION}.tar.gz)
 # will take care of building them, unpack is being done in dpcpp_deps.cmake
 
 # Source llvm/lib/SYCLLowerIR/CMakeLists.txt
-set(VCINTRINSICS_VERSION 782fbf7301dc73acaa049a4324c976ad94f587f7)
+set(VCINTRINSICS_VERSION abce9184b7a3a7fe1b02289b9285610d9dc45465)
 set(VCINTRINSICS_URI https://github.com/intel/vc-intrinsics/archive/${VCINTRINSICS_VERSION}.tar.gz)
-set(VCINTRINSICS_HASH f4c0ccad8c1f77760364c551c65e8e1cf194d058889fa46d3b1b2d19ec4dc33f)
+set(VCINTRINSICS_HASH 3e9fd471246b87633b26f7e15e17ab7733d357458c53d5c5881c03929d6c551f)
 set(VCINTRINSICS_HASH_TYPE SHA256)
 set(VCINTRINSICS_FILE vc-intrinsics-${VCINTRINSICS_VERSION}.tar.gz)
 
@@ -657,13 +657,6 @@ set(SPIRV_HEADERS_HASH ec8ecb471a62672697846c436501638ab25447ae9d4a6761e0bfe8a9a
 set(SPIRV_HEADERS_HASH_TYPE SHA256)
 set(SPIRV_HEADERS_FILE SPIR-V-Headers-${SPIRV_HEADERS_VERSION}.tar.gz)
 
-# Source llvm/sycl/plugins/unified_runtime/CMakeLists.txt
-set(UNIFIED_RUNTIME_VERSION fd711c920acc4434cb52ff18b078c082d9d7f44d)
-set(UNIFIED_RUNTIME_URI https://github.com/oneapi-src/unified-runtime/archive/${UNIFIED_RUNTIME_VERSION}.tar.gz)
-set(UNIFIED_RUNTIME_HASH 535ca2ee78f68c5e7e62b10f1bbabd909179488885566e6d9b1fc50e8a1be65f)
-set(UNIFIED_RUNTIME_HASH_TYPE SHA256)
-set(UNIFIED_RUNTIME_FILE unified-runtime-${UNIFIED_RUNTIME_VERSION}.tar.gz)
-
 ######################
 ### DPCPP DEPS END ###
 ######################
@@ -675,9 +668,9 @@ set(UNIFIED_RUNTIME_FILE unified-runtime-${UNIFIED_RUNTIME_VERSION}.tar.gz)
 # compiler, the versions used are taken from the following location
 # https://github.com/intel/intel-graphics-compiler/releases
 
-set(IGC_VERSION 1.0.13064.7)
+set(IGC_VERSION 1.0.12149.1)
 set(IGC_URI https://github.com/intel/intel-graphics-compiler/archive/refs/tags/igc-${IGC_VERSION}.tar.gz)
-set(IGC_HASH a929abd4cca2b293961ec0437ee4b3b2147bd3b2c8a3c423af78c0c359b2e5ae)
+set(IGC_HASH 44f67f24e3bc5130f9f062533abf8154782a9d0a992bc19b498639a8521ae836)
 set(IGC_HASH_TYPE SHA256)
 set(IGC_FILE igc-${IGC_VERSION}.tar.gz)
 
@@ -697,15 +690,15 @@ set(IGC_LLVM_FILE ${IGC_LLVM_VERSION}.tar.gz)
 #
 # WARNING WARNING WARNING
 
-set(IGC_OPENCL_CLANG_VERSION ee31812ea8b89d08c2918f045d11a19bd33525c5)
+set(IGC_OPENCL_CLANG_VERSION 363a5262d8c7cff3fb28f3bdb5d85c8d7e91c1bb)
 set(IGC_OPENCL_CLANG_URI https://github.com/intel/opencl-clang/archive/${IGC_OPENCL_CLANG_VERSION}.tar.gz)
-set(IGC_OPENCL_CLANG_HASH 1db6735bbcfaa31e8a9ba39f121d6bafa806ea8919e9f56782d6aaa67771ddda)
+set(IGC_OPENCL_CLANG_HASH aa8cf72bb239722ce8ce44f79413c6887ecc8ca18477dd520aa5c4809756da9a)
 set(IGC_OPENCL_CLANG_HASH_TYPE SHA256)
 set(IGC_OPENCL_CLANG_FILE opencl-clang-${IGC_OPENCL_CLANG_VERSION}.tar.gz)
 
-set(IGC_VCINTRINSICS_VERSION v0.11.0)
+set(IGC_VCINTRINSICS_VERSION v0.5.0)
 set(IGC_VCINTRINSICS_URI https://github.com/intel/vc-intrinsics/archive/refs/tags/${IGC_VCINTRINSICS_VERSION}.tar.gz)
-set(IGC_VCINTRINSICS_HASH e5acd5626ce7fa6d41ce154c50ac805eda734ee66af94ef28e680ac2ad81bb9f)
+set(IGC_VCINTRINSICS_HASH 70bb47c5e32173cf61514941e83ae7c7eb4485e6d2fca60cfa1f50d4f42c41f2)
 set(IGC_VCINTRINSICS_HASH_TYPE SHA256)
 set(IGC_VCINTRINSICS_FILE vc-intrinsics-${IGC_VCINTRINSICS_VERSION}.tar.gz)
 
@@ -721,9 +714,9 @@ set(IGC_SPIRV_TOOLS_HASH 6e19900e948944243024aedd0a201baf3854b377b9cc7a386553bc1
 set(IGC_SPIRV_TOOLS_HASH_TYPE SHA256)
 set(IGC_SPIRV_TOOLS_FILE SPIR-V-Tools-${IGC_SPIRV_TOOLS_VERSION}.tar.gz)
 
-set(IGC_SPIRV_TRANSLATOR_VERSION d739c01d65ec00dee64dedd40deed805216a7193)
+set(IGC_SPIRV_TRANSLATOR_VERSION a31ffaeef77e23d500b3ea3d35e0c42ff5648ad9)
 set(IGC_SPIRV_TRANSLATOR_URI https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/${IGC_SPIRV_TRANSLATOR_VERSION}.tar.gz)
-set(IGC_SPIRV_TRANSLATOR_HASH ddc0cc9ccbe59dadeaf291012d59de142b2e9f2b124dbb634644d39daddaa13e)
+set(IGC_SPIRV_TRANSLATOR_HASH 9e26c96a45341b8f8af521bacea20e752623346340addd02af95d669f6e89252)
 set(IGC_SPIRV_TRANSLATOR_HASH_TYPE SHA256)
 set(IGC_SPIRV_TRANSLATOR_FILE SPIR-V-Translator-${IGC_SPIRV_TRANSLATOR_VERSION}.tar.gz)
 
@@ -731,15 +724,15 @@ set(IGC_SPIRV_TRANSLATOR_FILE SPIR-V-Translator-${IGC_SPIRV_TRANSLATOR_VERSION}.
 ### Intel Graphics Compiler DEPS END ###
 ########################################
 
-set(GMMLIB_VERSION intel-gmmlib-22.3.0)
+set(GMMLIB_VERSION intel-gmmlib-22.1.8)
 set(GMMLIB_URI https://github.com/intel/gmmlib/archive/refs/tags/${GMMLIB_VERSION}.tar.gz)
-set(GMMLIB_HASH c1f33e1519edfc527127baeb0436b783430dfd256c643130169a3a71dc86aff9)
+set(GMMLIB_HASH bf23e9a3742b4fb98c7666c9e9b29f3219e4b2fb4d831aaf4eed71f5e2d17368)
 set(GMMLIB_HASH_TYPE SHA256)
 set(GMMLIB_FILE ${GMMLIB_VERSION}.tar.gz)
 
-set(OCLOC_VERSION 23.05.25593.18)
+set(OCLOC_VERSION 22.38.24278)
 set(OCLOC_URI https://github.com/intel/compute-runtime/archive/refs/tags/${OCLOC_VERSION}.tar.gz)
-set(OCLOC_HASH 122415028e631922ae999c996954dfd98ce9a32decd564d5484c31476ec9306e)
+set(OCLOC_HASH db0c542fccd651e6404b15a74d46027f1ce0eda8dc9e25a40cbb6c0faef257ee)
 set(OCLOC_HASH_TYPE SHA256)
 set(OCLOC_FILE ocloc-${OCLOC_VERSION}.tar.gz)
 

build_files/build_environment/cmake/wayland.cmake

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

build_files/build_environment/cmake/wayland_protocols.cmake

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

build_files/build_environment/cmake/xvidcore.cmake

@@ -17,13 +17,11 @@ ExternalProject_Add(external_xvidcore
   INSTALL_DIR ${LIBDIR}/xvidcore
 )
 
-if(WIN32)
+ExternalProject_Add_Step(external_xvidcore after_install
-  ExternalProject_Add_Step(external_xvidcore after_install
+  COMMAND ${CMAKE_COMMAND} -E rename ${LIBDIR}/xvidcore/lib/xvidcore.a ${LIBDIR}/xvidcore/lib/libxvidcore.a || true
-    COMMAND ${CMAKE_COMMAND} -E rename ${LIBDIR}/xvidcore/lib/xvidcore.a ${LIBDIR}/xvidcore/lib/libxvidcore.a || true
+  COMMAND ${CMAKE_COMMAND} -E remove ${LIBDIR}/xvidcore/lib/xvidcore.dll.a
-    COMMAND ${CMAKE_COMMAND} -E remove ${LIBDIR}/xvidcore/lib/xvidcore.dll.a
+  DEPENDEES install
-    DEPENDEES install
+)
-  )
-endif()
 
 if(MSVC)
   set_target_properties(external_xvidcore PROPERTIES FOLDER Mingw)

build_files/build_environment/dependencies.dot

@@ -14,7 +14,6 @@ graph[autosize = false, size = "25.7,8.3!", resolution = 300];
 	external_dpcpp -- external_mp11;
 	external_dpcpp -- external_level_zero;
 	external_dpcpp -- external_spirvheaders;
-	external_dpcpp -- external_unifiedruntime;
 	external_embree -- external_tbb;
 	external_ffmpeg -- external_zlib;
 	external_ffmpeg -- external_openjpeg;

build_files/build_environment/linux/linux_rocky8_setup.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-# This script is part of the official build environment, see wiki page for details.
+# This script is part of the official build environment, see WIKI page for details.
-# https://wiki.blender.org/wiki/Building_Blender/Other/Rocky8ReleaseEnvironment
+# https://wiki.blender.org/wiki/Building_Blender/Other/CentOS7ReleaseEnvironment
 
 set -e
 
@@ -59,7 +59,7 @@ PACKAGES_FOR_LIBS=(
     automake
     libtool
 
-    # Used to set rpath on shared libraries
+    # TODO: why is this needed?
     patchelf
 
     # Builds generated by meson use Ninja for the actual build.

build_files/build_environment/linux/make_deps_wrapper.sh

@@ -1,74 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# This script ensures:
-# - One dependency is built at a time.
-# - That dependency uses all available cores.
-#
-# Without this, simply calling `make -j$(nproc)` from the `${CMAKE_BUILD_DIR}/deps/`
-# directory will build many projects at once.
-#
-# This is undesirable for the following reasons:
-#
-# - The output from projects is mixed together,
-#   making it difficult to track down the cause of a build failure.
-#
-# - Larger dependencies such as LLVM can bottleneck the build process,
-#   making it necessary to cancel the build and manually run build commands in each directory.
-#
-# - Building many projects at once means canceling (Control-C) can lead to the build being in an undefined state.
-#   It's possible canceling happens as a patch is being applied or files are being copied.
-#   (steps that aren't part of the compilation process where it's typically safe to cancel).
-
-if [[ -z "$MY_MAKE_CALL_LEVEL" ]]; then
-  export MY_MAKE_CALL_LEVEL=0
-  export MY_MAKEFLAGS=$MAKEFLAGS
-
-  # Extract the jobs argument (`-jN`, `-j N`, `--jobs=N`).
-  add_next=0
-  for i in "$@"; do
-    case $i in
-      -j*)
-        export MY_JOBS_ARG=$i
-        if [ "$MY_JOBS_ARG" = "-j" ]; then
-          add_next=1
-        fi
-        ;;
-      --jobs=*)
-        shift # past argument=value
-        MY_JOBS_ARG=$i
-        ;;
-      *)
-        if (( add_next == 1 )); then
-          MY_JOBS_ARG="$MY_JOBS_ARG $i"
-          add_next=0
-        fi
-        ;;
-    esac
-  done
-  unset i add_next
-
-  if [[ -z "$MY_JOBS_ARG" ]]; then
-    MY_JOBS_ARG="-j$(nproc)"
-  fi
-  export MY_JOBS_ARG
-  # Support user defined `MAKEFLAGS`.
-  export MAKEFLAGS="$MY_MAKEFLAGS -j1"
-else
-  export MY_MAKE_CALL_LEVEL=$(( MY_MAKE_CALL_LEVEL + 1 ))
-  if (( MY_MAKE_CALL_LEVEL == 1 )); then
-    # Important to set jobs to 1, otherwise user defined jobs argument is used.
-    export MAKEFLAGS="$MY_MAKEFLAGS -j1"
-  elif (( MY_MAKE_CALL_LEVEL == 2 )); then
-    # This is the level used by each sub-project.
-    export MAKEFLAGS="$MY_MAKEFLAGS $MY_JOBS_ARG"
-  fi
-  # Else leave `MY_MAKEFLAGS` flags as-is, avoids setting a high number of jobs on recursive
-  # calls (which may easily run out of memory). Let the job-server handle the rest.
-fi
-
-# Useful for troubleshooting the wrapper.
-# echo "Call level: $MY_MAKE_CALL_LEVEL, args=$@".
-
-# Call actual make but ensure recursive calls run via this script.
-exec make MAKE="$0" "$@"

build_files/build_environment/patches/dpcpp.diff

@@ -34,156 +34,3 @@ diff -Naur llvm-sycl-nightly-20220208.orig/libdevice/cmake/modules/SYCLLibdevice
    libsycldevice-obj
    libsycldevice-spv)
  
-diff --git a/sycl/source/detail/program_manager/program_manager.cpp b/sycl/source/detail/program_manager/program_manager.cpp
-index 17eeaafae194..09e6d2217aaa 100644
---- a/sycl/source/detail/program_manager/program_manager.cpp
-+++ b/sycl/source/detail/program_manager/program_manager.cpp
-@@ -1647,46 +1647,120 @@ ProgramManager::getSYCLDeviceImagesWithCompatibleState(
-   }
-   assert(BinImages.size() > 0 && "Expected to find at least one device image");
- 
-+  // Ignore images with incompatible state. Image is considered compatible
-+  // with a target state if an image is already in the target state or can
-+  // be brought to target state by compiling/linking/building.
-+  //
-+  // Example: an image in "executable" state is not compatible with
-+  // "input" target state - there is no operation to convert the image it
-+  // to "input" state. An image in "input" state is compatible with
-+  // "executable" target state because it can be built to get into
-+  // "executable" state.
-+  for (auto It = BinImages.begin(); It != BinImages.end();) {
-+    if (getBinImageState(*It) > TargetState)
-+      It = BinImages.erase(It);
-+    else
-+      ++It;
-+  }
-+
-   std::vector<device_image_plain> SYCLDeviceImages;
--  for (RTDeviceBinaryImage *BinImage : BinImages) {
--    const bundle_state ImgState = getBinImageState(BinImage);
--
--    // Ignore images with incompatible state. Image is considered compatible
--    // with a target state if an image is already in the target state or can
--    // be brought to target state by compiling/linking/building.
--    //
--    // Example: an image in "executable" state is not compatible with
--    // "input" target state - there is no operation to convert the image it
--    // to "input" state. An image in "input" state is compatible with
--    // "executable" target state because it can be built to get into
--    // "executable" state.
--    if (ImgState > TargetState)
--      continue;
- 
--    for (const sycl::device &Dev : Devs) {
-+  // If a non-input state is requested, we can filter out some compatible
-+  // images and return only those with the highest compatible state for each
-+  // device-kernel pair. This map tracks how many kernel-device pairs need each
-+  // image, so that any unneeded ones are skipped.
-+  // TODO this has no effect if the requested state is input, consider having
-+  // a separate branch for that case to avoid unnecessary tracking work.
-+  struct DeviceBinaryImageInfo {
-+    std::shared_ptr<std::vector<sycl::kernel_id>> KernelIDs;
-+    bundle_state State = bundle_state::input;
-+    int RequirementCounter = 0;
-+  };
-+  std::unordered_map<RTDeviceBinaryImage *, DeviceBinaryImageInfo> ImageInfoMap;
-+
-+  for (const sycl::device &Dev : Devs) {
-+    // Track the highest image state for each requested kernel.
-+    using StateImagesPairT =
-+        std::pair<bundle_state, std::vector<RTDeviceBinaryImage *>>;
-+    using KernelImageMapT =
-+        std::map<kernel_id, StateImagesPairT, LessByNameComp>;
-+    KernelImageMapT KernelImageMap;
-+    if (!KernelIDs.empty())
-+      for (const kernel_id &KernelID : KernelIDs)
-+        KernelImageMap.insert({KernelID, {}});
-+
-+    for (RTDeviceBinaryImage *BinImage : BinImages) {
-       if (!compatibleWithDevice(BinImage, Dev) ||
-           !doesDevSupportImgAspects(Dev, *BinImage))
-         continue;
- 
--      std::shared_ptr<std::vector<sycl::kernel_id>> KernelIDs;
--      // Collect kernel names for the image
--      {
--        std::lock_guard<std::mutex> KernelIDsGuard(m_KernelIDsMutex);
--        KernelIDs = m_BinImg2KernelIDs[BinImage];
--        // If the image does not contain any non-service kernels we can skip it.
--        if (!KernelIDs || KernelIDs->empty())
--          continue;
-+      auto InsertRes = ImageInfoMap.insert({BinImage, {}});
-+      DeviceBinaryImageInfo &ImgInfo = InsertRes.first->second;
-+      if (InsertRes.second) {
-+        ImgInfo.State = getBinImageState(BinImage);
-+        // Collect kernel names for the image
-+        {
-+          std::lock_guard<std::mutex> KernelIDsGuard(m_KernelIDsMutex);
-+          ImgInfo.KernelIDs = m_BinImg2KernelIDs[BinImage];
-+        }
-       }
-+      const bundle_state ImgState = ImgInfo.State;
-+      const std::shared_ptr<std::vector<sycl::kernel_id>> &ImageKernelIDs =
-+          ImgInfo.KernelIDs;
-+      int &ImgRequirementCounter = ImgInfo.RequirementCounter;
- 
--      DeviceImageImplPtr Impl = std::make_shared<detail::device_image_impl>(
--          BinImage, Ctx, Devs, ImgState, KernelIDs, /*PIProgram=*/nullptr);
-+      // If the image does not contain any non-service kernels we can skip it.
-+      if (!ImageKernelIDs || ImageKernelIDs->empty())
-+        continue;
- 
--      SYCLDeviceImages.push_back(
--          createSyclObjFromImpl<device_image_plain>(Impl));
--      break;
-+      // Update tracked information.
-+      for (kernel_id &KernelID : *ImageKernelIDs) {
-+        StateImagesPairT *StateImagesPair;
-+        // If only specific kernels are requested, ignore the rest.
-+        if (!KernelIDs.empty()) {
-+          auto It = KernelImageMap.find(KernelID);
-+          if (It == KernelImageMap.end())
-+            continue;
-+          StateImagesPair = &It->second;
-+        } else
-+          StateImagesPair = &KernelImageMap[KernelID];
-+
-+        auto &[KernelImagesState, KernelImages] = *StateImagesPair;
-+
-+        if (KernelImages.empty()) {
-+          KernelImagesState = ImgState;
-+          KernelImages.push_back(BinImage);
-+          ++ImgRequirementCounter;
-+        } else if (KernelImagesState < ImgState) {
-+          for (RTDeviceBinaryImage *Img : KernelImages) {
-+            auto It = ImageInfoMap.find(Img);
-+            assert(It != ImageInfoMap.end());
-+            assert(It->second.RequirementCounter > 0);
-+            --(It->second.RequirementCounter);
-+          }
-+          KernelImages.clear();
-+          KernelImages.push_back(BinImage);
-+          KernelImagesState = ImgState;
-+          ++ImgRequirementCounter;
-+        } else if (KernelImagesState == ImgState) {
-+          KernelImages.push_back(BinImage);
-+          ++ImgRequirementCounter;
-+        }
-+      }
-     }
-   }
- 
-+  for (const auto &ImgInfoPair : ImageInfoMap) {
-+    if (ImgInfoPair.second.RequirementCounter == 0)
-+      continue;
-+
-+    DeviceImageImplPtr Impl = std::make_shared<detail::device_image_impl>(
-+        ImgInfoPair.first, Ctx, Devs, ImgInfoPair.second.State,
-+        ImgInfoPair.second.KernelIDs, /*PIProgram=*/nullptr);
-+
-+    SYCLDeviceImages.push_back(createSyclObjFromImpl<device_image_plain>(Impl));
-+  }
-+
-   return SYCLDeviceImages;
- }
- 

build_files/build_environment/patches/embree.diff

@@ -1,8 +1,19 @@
+diff -Naur org/kernels/rtcore_config.h.in embree-3.13.4/kernels/rtcore_config.h.in
+--- org/kernels/rtcore_config.h.in      2022-06-14 22:13:52 -0600
++++ embree-3.13.4/kernels/rtcore_config.h.in    2022-06-24 15:20:12 -0600
+@@ -14,6 +14,7 @@
+ #cmakedefine01 EMBREE_MIN_WIDTH
+ #define RTC_MIN_WIDTH EMBREE_MIN_WIDTH
+
++#cmakedefine EMBREE_STATIC_LIB
+ #cmakedefine EMBREE_API_NAMESPACE
+
+ #if defined(EMBREE_API_NAMESPACE)
 diff --git a/kernels/CMakeLists.txt b/kernels/CMakeLists.txt
 index 7c2f43d..106b1d5 100644
 --- a/kernels/CMakeLists.txt
 +++ b/kernels/CMakeLists.txt
-@@ -208,6 +208,12 @@ embree_files(EMBREE_LIBRARY_FILES_AVX512 ${AVX512})
+@@ -201,6 +201,12 @@ embree_files(EMBREE_LIBRARY_FILES_AVX512 ${AVX512})
  #message("AVX2: ${EMBREE_LIBRARY_FILES_AVX2}")
  #message("AVX512: ${EMBREE_LIBRARY_FILES_AVX512}")
  
@@ -15,7 +26,7 @@ index 7c2f43d..106b1d5 100644
  # replaces all .cpp files with a dummy file that includes that .cpp file
  # this is to work around an ICC name mangling issue related to lambda functions under windows
  MACRO (CreateISADummyFiles list isa)
-@@ -311,7 +317,7 @@ IF (EMBREE_ISA_AVX  AND EMBREE_LIBRARY_FILES_AVX)
+@@ -277,7 +283,7 @@ IF (EMBREE_ISA_AVX  AND EMBREE_LIBRARY_FILES_AVX)
    ENDIF()
  ENDIF()
  
@@ -24,144 +35,3 @@ index 7c2f43d..106b1d5 100644
    DISABLE_STACK_PROTECTOR_FOR_INTERSECTORS(${EMBREE_LIBRARY_FILES_AVX2})
    ADD_LIBRARY(embree_avx2 STATIC ${EMBREE_LIBRARY_FILES_AVX2})
    TARGET_LINK_LIBRARIES(embree_avx2 PRIVATE tasking)
-diff --git a/include/embree4/rtcore_device.h b/include/embree4/rtcore_device.h
-index 45bf95583..62ee7787d 100644
---- a/include/embree4/rtcore_device.h
-+++ b/include/embree4/rtcore_device.h
-@@ -55,6 +55,7 @@ enum RTCDeviceProperty
-   RTC_DEVICE_PROPERTY_FILTER_FUNCTION_SUPPORTED   = 66,
-   RTC_DEVICE_PROPERTY_IGNORE_INVALID_RAYS_ENABLED = 67,
-   RTC_DEVICE_PROPERTY_COMPACT_POLYS_ENABLED       = 68,
-+  RTC_DEVICE_PROPERTY_BACKFACE_CULLING_SPHERES_ENABLED = 69,
- 
-   RTC_DEVICE_PROPERTY_TRIANGLE_GEOMETRY_SUPPORTED    = 96,
-   RTC_DEVICE_PROPERTY_QUAD_GEOMETRY_SUPPORTED        = 97,
-diff --git a/kernels/common/device.cpp b/kernels/common/device.cpp
-index 3ffac7e37..215ccc961 100644
---- a/kernels/common/device.cpp
-+++ b/kernels/common/device.cpp
-@@ -170,6 +170,9 @@ namespace embree
- #if defined (EMBREE_BACKFACE_CULLING_CURVES)
-     v += "backfacecullingcurves ";
- #endif
-+#if defined (EMBREE_BACKFACE_CULLING_SPHERES)
-+    v += "backfacecullingspheres ";
-+#endif
- #if defined(EMBREE_FILTER_FUNCTION)
-     v += "intersection_filter ";
- #endif
-@@ -477,6 +480,12 @@ namespace embree
-     case RTC_DEVICE_PROPERTY_BACKFACE_CULLING_CURVES_ENABLED: return 0;
- #endif
- 
-+#if defined(EMBREE_BACKFACE_CULLING_SPHERES)
-+    case RTC_DEVICE_PROPERTY_BACKFACE_CULLING_SPHERES_ENABLED: return 1;
-+#else
-+    case RTC_DEVICE_PROPERTY_BACKFACE_CULLING_SPHERES_ENABLED: return 0;
-+#endif
-+
- #if defined(EMBREE_COMPACT_POLYS)
-     case RTC_DEVICE_PROPERTY_COMPACT_POLYS_ENABLED: return 1;
- #else
-diff --git a/kernels/config.h.in b/kernels/config.h.in
-index f02c90360..ba9acde56 100644
---- a/kernels/config.h.in
-+++ b/kernels/config.h.in
-@@ -5,6 +5,7 @@
- #cmakedefine EMBREE_STAT_COUNTERS
- #cmakedefine EMBREE_BACKFACE_CULLING
- #cmakedefine EMBREE_BACKFACE_CULLING_CURVES
-+#cmakedefine EMBREE_BACKFACE_CULLING_SPHERES
- #cmakedefine EMBREE_FILTER_FUNCTION
- #cmakedefine EMBREE_IGNORE_INVALID_RAYS
- #cmakedefine EMBREE_GEOMETRY_TRIANGLE
-diff --git a/kernels/geometry/sphere_intersector.h b/kernels/geometry/sphere_intersector.h
-index 074f910a2..30f490818 100644
---- a/kernels/geometry/sphere_intersector.h
-+++ b/kernels/geometry/sphere_intersector.h
-@@ -106,8 +106,13 @@ namespace embree
-         const vbool<M> valid_front = valid & (ray.tnear() <= t_front) & (t_front <= ray.tfar);
-         const vbool<M> valid_back  = valid & (ray.tnear() <= t_back ) & (t_back  <= ray.tfar);
- 
-+#if defined (EMBREE_BACKFACE_CULLING_SPHERES)
-+        /* check if there is a first hit */
-+        const vbool<M> valid_first = valid_front;
-+#else
-         /* check if there is a first hit */
-         const vbool<M> valid_first = valid_front | valid_back;
-+#endif
-         if (unlikely(none(valid_first)))
-           return false;
- 
-@@ -120,7 +125,8 @@ namespace embree
- 
-         /* invoke intersection filter for first hit */
-         const bool is_hit_first = epilog(valid_first, hit);
--                
-+
-+#if !defined (EMBREE_BACKFACE_CULLING_SPHERES)
-         /* check for possible second hits before potentially accepted hit */
-         const vfloat<M> t_second = t_back;
-         const vbool<M> valid_second = valid_front & valid_back & (t_second <= ray.tfar);
-@@ -131,7 +137,9 @@ namespace embree
-         const Vec3vf<M> Ng_second = td_back * ray_dir - perp;
-         hit = SphereIntersectorHitM<M> (t_second, Ng_second);
-         const bool is_hit_second = epilog(valid_second, hit);
--        
-+#else
-+        constexpr bool is_hit_second = false;
-+#endif
-         return is_hit_first | is_hit_second;
-       }
- 
-@@ -186,8 +194,13 @@ namespace embree
-         const vbool<M> valid_front = valid & (ray.tnear()[k] <= t_front) & (t_front <= ray.tfar[k]);
-         const vbool<M> valid_back  = valid & (ray.tnear()[k] <= t_back ) & (t_back  <= ray.tfar[k]);
- 
-+#if defined (EMBREE_BACKFACE_CULLING_SPHERES)
-+        /* check if there is a first hit */
-+        const vbool<M> valid_first = valid_front;
-+#else
-         /* check if there is a first hit */
-         const vbool<M> valid_first = valid_front | valid_back;
-+#endif
-         if (unlikely(none(valid_first)))
-           return false;
- 
-@@ -200,7 +213,8 @@ namespace embree
- 
-         /* invoke intersection filter for first hit */
-         const bool is_hit_first = epilog(valid_first, hit);
--                
-+
-+#if !defined (EMBREE_BACKFACE_CULLING_SPHERES)
-         /* check for possible second hits before potentially accepted hit */
-         const vfloat<M> t_second = t_back;
-         const vbool<M> valid_second = valid_front & valid_back & (t_second <= ray.tfar[k]);
-@@ -211,7 +225,9 @@ namespace embree
-         const Vec3vf<M> Ng_second = td_back * ray_dir - perp;
-         hit = SphereIntersectorHitM<M> (t_second, Ng_second);
-         const bool is_hit_second = epilog(valid_second, hit);
--        
-+#else
-+        constexpr bool is_hit_second = false;
-+#endif
-         return is_hit_first | is_hit_second;
-       }
-     };
-diff -ruN a/kernels/sycl/rthwif_embree_builder.cpp b/kernels/sycl/rthwif_embree_builder.cpp
---- a/kernels/sycl/rthwif_embree_builder.cpp    2023-03-28 17:23:06.429190200 +0200
-+++ b/kernels/sycl/rthwif_embree_builder.cpp    2023-03-28 17:35:01.291938600 +0200
-@@ -540,7 +540,12 @@
-       assert(offset <= geomDescrData.size());
-     }
-
-+    /* Force running BVH building sequentially from the calling thread if using TBB < 2021, as it otherwise leads to runtime issues. */
-+#if TBB_VERSION_MAJOR<2021
-+    RTHWIF_PARALLEL_OPERATION parallelOperation = nullptr;
-+#else
-     RTHWIF_PARALLEL_OPERATION parallelOperation = rthwifNewParallelOperation();
-+#endif
-
-     /* estimate static accel size */
-     BBox1f time_range(0,1);

build_files/build_environment/patches/igc_opencl_clang.diff

@@ -1,7 +1,7 @@
 diff -Naur external_igc_opencl_clang.orig/CMakeLists.txt external_igc_opencl_clang/CMakeLists.txt
 --- external_igc_opencl_clang.orig/CMakeLists.txt	2022-03-16 05:51:10 -0600
 +++ external_igc_opencl_clang/CMakeLists.txt	2022-05-23 10:40:09 -0600
-@@ -147,22 +147,24 @@
+@@ -126,22 +126,24 @@
          )
      endif()
  

build_files/cmake/Modules/FindClang.cmake

@@ -80,7 +80,6 @@ set(_CLANG_FIND_COMPONENTS
   clangAST
   clangLex
   clangBasic
-  clangSupport
 )
 
 set(_CLANG_LIBRARIES)
@@ -95,9 +94,7 @@ foreach(COMPONENT ${_CLANG_FIND_COMPONENTS})
     PATH_SUFFIXES
       lib64 lib
     )
-  if(CLANG_${UPPERCOMPONENT}_LIBRARY)
+  list(APPEND _CLANG_LIBRARIES "${CLANG_${UPPERCOMPONENT}_LIBRARY}")
-    list(APPEND _CLANG_LIBRARIES "${CLANG_${UPPERCOMPONENT}_LIBRARY}")
-  endif()
 endforeach()
 
 

build_files/cmake/Modules/FindEmbree.cmake

@@ -23,7 +23,6 @@ SET(_embree_SEARCH_DIRS
 
 FIND_PATH(EMBREE_INCLUDE_DIR
   NAMES
-    embree4/rtcore.h
     embree3/rtcore.h
   HINTS
     ${_embree_SEARCH_DIRS}
@@ -31,67 +30,28 @@ FIND_PATH(EMBREE_INCLUDE_DIR
     include
 )
 
-IF(EXISTS ${EMBREE_INCLUDE_DIR}/embree4/rtcore_config.h)
+IF(NOT (("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64") OR (APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))))
-  SET(EMBREE_MAJOR_VERSION 4)
+  SET(_embree_SIMD_COMPONENTS
-ELSE()
+    embree_sse42
-  SET(EMBREE_MAJOR_VERSION 3)
+    embree_avx
-ENDIF()
+    embree_avx2
-
-IF(EMBREE_INCLUDE_DIR)
-  FILE(READ ${EMBREE_INCLUDE_DIR}/embree${EMBREE_MAJOR_VERSION}/rtcore_config.h _embree_config_header)
-  IF(_embree_config_header MATCHES "#define EMBREE_STATIC_LIB")
-    SET(EMBREE_STATIC_LIB TRUE)
-  ELSE()
-    SET(EMBREE_STATIC_LIB FALSE)
-  ENDIF()
-  IF(_embree_config_header MATCHES "#define EMBREE_SYCL_SUPPORT")
-    SET(EMBREE_SYCL_SUPPORT TRUE)
-  ELSE()
-    SET(EMBREE_SYCL_SUPPORT FALSE)
-  ENDIF()
-  UNSET(_embree_config_header)
-ENDIF()
-
-IF(EMBREE_STATIC_LIB)
-  IF(NOT (("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64") OR (APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))))
-    SET(_embree_SIMD_COMPONENTS
-      embree_sse42
-      embree_avx
-      embree_avx2
-    )
-  ENDIF()
-
-  IF(EMBREE_SYCL_SUPPORT)
-    SET(_embree_GPU_COMPONENTS
-      embree4_sycl
-      embree_rthwif
-    )
-  ENDIF()
-
-  SET(_embree_FIND_COMPONENTS
-    embree${EMBREE_MAJOR_VERSION}
-    ${_embree_SIMD_COMPONENTS}
-    ${_embree_GPU_COMPONENTS}
-    lexers
-    math
-    simd
-    sys
-    tasking
   )
-ELSE()
-  SET(_embree_FIND_COMPONENTS
-    embree${EMBREE_MAJOR_VERSION}
-  )
-  IF(EMBREE_SYCL_SUPPORT)
-    LIST(APPEND _embree_FIND_COMPONENTS
-      embree4_sycl
-    )
-  ENDIF()
 ENDIF()
 
+SET(_embree_FIND_COMPONENTS
+  embree3
+  ${_embree_SIMD_COMPONENTS}
+  lexers
+  math
+  simd
+  sys
+  tasking
+)
+
 SET(_embree_LIBRARIES)
 FOREACH(COMPONENT ${_embree_FIND_COMPONENTS})
   STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+
   FIND_LIBRARY(EMBREE_${UPPERCOMPONENT}_LIBRARY
     NAMES
       ${COMPONENT}
@@ -100,9 +60,18 @@ FOREACH(COMPONENT ${_embree_FIND_COMPONENTS})
     PATH_SUFFIXES
       lib64 lib
     )
+  IF(NOT EMBREE_${UPPERCOMPONENT}_LIBRARY)
+    IF(EMBREE_EMBREE3_LIBRARY)
+      # If we can't find all the static libraries, try to fall back to the shared library if found.
+      # This allows building with a shared embree library
+      SET(_embree_LIBRARIES ${EMBREE_EMBREE3_LIBRARY})
+      BREAK()
+    ENDIF()
+  ENDIF()
   LIST(APPEND _embree_LIBRARIES "${EMBREE_${UPPERCOMPONENT}_LIBRARY}")
 ENDFOREACH()
 
+
 # handle the QUIETLY and REQUIRED arguments and set EMBREE_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
@@ -116,9 +85,6 @@ ENDIF()
 
 MARK_AS_ADVANCED(
   EMBREE_INCLUDE_DIR
-  EMBREE_MAJOR_VERSION
-  EMBREE_SYCL_SUPPORT
-  EMBREE_STATIC_LIB
 )
 
 FOREACH(COMPONENT ${_embree_FIND_COMPONENTS})

build_files/cmake/Modules/FindHIP.cmake

@@ -37,24 +37,18 @@ elseif(HIP_HIPCC_EXECUTABLE)
   set(HIP_VERSION_MINOR 0)
   set(HIP_VERSION_PATCH 0)
 
-  if(WIN32)
-    set(_hipcc_executable ${HIP_HIPCC_EXECUTABLE}.bat)
-  else()
-    set(_hipcc_executable ${HIP_HIPCC_EXECUTABLE})
-  endif()
-
   # Get version from the output.
-  execute_process(COMMAND ${_hipcc_executable} --version
+  execute_process(COMMAND ${HIP_HIPCC_EXECUTABLE} --version
-                  OUTPUT_VARIABLE _hip_version_raw
+                  OUTPUT_VARIABLE HIP_VERSION_RAW
                   ERROR_QUIET
                   OUTPUT_STRIP_TRAILING_WHITESPACE)
 
   # Parse parts.
-  if(_hip_version_raw MATCHES "HIP version: .*")
+  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}")
+           HIP_SEMANTIC_VERSION "${HIP_VERSION_RAW}")
     string(REPLACE "." ";" HIP_VERSION_PARTS "${HIP_SEMANTIC_VERSION}")
     list(LENGTH HIP_VERSION_PARTS NUM_HIP_VERSION_PARTS)
 
@@ -77,13 +71,7 @@ elseif(HIP_HIPCC_EXECUTABLE)
 
   # Construct full semantic version.
   set(HIP_VERSION "${HIP_VERSION_MAJOR}.${HIP_VERSION_MINOR}.${HIP_VERSION_PATCH}")
-  unset(_hip_version_raw)
+  unset(HIP_VERSION_RAW)
-  unset(_hipcc_executable)
 else()
   set(HIP_FOUND FALSE)
 endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(HIP
-    REQUIRED_VARS HIP_HIPCC_EXECUTABLE
-    VERSION_VAR HIP_VERSION)

build_files/cmake/Modules/FindOpenEXR.cmake

@@ -120,8 +120,9 @@ UNSET(_openexr_libs_ver)
 
 IF(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0")
   # For OpenEXR 3.x, we also need to find the now separate Imath library.
-  # For simplicity we also add it to the OpenEXR includes and libraries,
+  # For simplicity we add it to the OpenEXR includes and libraries, as we
-  # as it's simpler to support both 2.x and 3.x this way.
+  # have no direct dependency on Imath and it's simpler to support both
+  # 2.x and 3.x this way.
 
   # Find include directory
   FIND_PATH(IMATH_INCLUDE_DIR
@@ -168,12 +169,6 @@ IF(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0")
   UNSET(_imath_build_specification)
 ENDIF()
 
-IF(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0")
-	SET(IMATH_LIBRARIES ${IMATH_LIBRARY})
-ELSE()
-	SET(IMATH_LIBRARIES ${OPENEXR_IMATH_LIBRARY})
-ENDIF()
-
 # handle the QUIETLY and REQUIRED arguments and set OPENEXR_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
@@ -201,7 +196,6 @@ MARK_AS_ADVANCED(
   OPENEXR_VERSION
   IMATH_INCLUDE_DIR
   IMATH_LIBRARY
-  IMATH_LIBRARIES
 )
 FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
   STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)

build_files/cmake/Modules/FindSYCL.cmake

@@ -108,11 +108,6 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(SYCL
 
 IF(SYCL_FOUND)
   SET(SYCL_INCLUDE_DIR ${SYCL_INCLUDE_DIR} ${SYCL_INCLUDE_DIR}/sycl)
-  IF(WIN32 AND SYCL_LIBRARY_DEBUG)
-    SET(SYCL_LIBRARIES optimized ${SYCL_LIBRARY} debug ${SYCL_LIBRARY_DEBUG})
-  ELSE()
-    SET(SYCL_LIBRARIES ${SYCL_LIBRARY})
-  ENDIF()
 ELSE()
   SET(SYCL_SYCL_FOUND FALSE)
 ENDIF()

build_files/cmake/buildinfo.cmake

@@ -23,19 +23,19 @@ if(EXISTS ${SOURCE_DIR}/.git)
 
   if(MY_WC_BRANCH STREQUAL "HEAD")
     # Detached HEAD, check whether commit hash is reachable
-    # in the main branch
+    # in the master branch
     execute_process(COMMAND git rev-parse --short=12 HEAD
                     WORKING_DIRECTORY ${SOURCE_DIR}
                     OUTPUT_VARIABLE MY_WC_HASH
                     OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-    execute_process(COMMAND git branch --list main blender-v* --contains ${MY_WC_HASH}
+    execute_process(COMMAND git branch --list master blender-v* --contains ${MY_WC_HASH}
                     WORKING_DIRECTORY ${SOURCE_DIR}
                     OUTPUT_VARIABLE _git_contains_check
                     OUTPUT_STRIP_TRAILING_WHITESPACE)
 
     if(NOT _git_contains_check STREQUAL "")
-      set(MY_WC_BRANCH "main")
+      set(MY_WC_BRANCH "master")
     else()
       execute_process(COMMAND git show-ref --tags -d
                       WORKING_DIRECTORY ${SOURCE_DIR}
@@ -48,7 +48,7 @@ if(EXISTS ${SOURCE_DIR}/.git)
                       OUTPUT_STRIP_TRAILING_WHITESPACE)
 
       if(_git_tag_hashes MATCHES "${_git_head_hash}")
-        set(MY_WC_BRANCH "main")
+        set(MY_WC_BRANCH "master")
       else()
         execute_process(COMMAND git branch --contains ${MY_WC_HASH}
                         WORKING_DIRECTORY ${SOURCE_DIR}

build_files/cmake/config/blender_full.cmake

@@ -26,8 +26,11 @@ set(WITH_HARU                ON  CACHE BOOL "" FORCE)
 set(WITH_IK_ITASC            ON  CACHE BOOL "" FORCE)
 set(WITH_IK_SOLVER           ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_CINEON        ON  CACHE BOOL "" FORCE)
+set(WITH_IMAGE_DDS           ON  CACHE BOOL "" FORCE)
+set(WITH_IMAGE_HDR           ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENEXR       ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENJPEG      ON  CACHE BOOL "" FORCE)
+set(WITH_IMAGE_TIFF          ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_WEBP          ON  CACHE BOOL "" FORCE)
 set(WITH_INPUT_NDOF          ON  CACHE BOOL "" FORCE)
 set(WITH_INPUT_IME           ON  CACHE BOOL "" FORCE)

build_files/cmake/config/blender_lite.cmake

@@ -27,13 +27,15 @@ set(WITH_HARU                OFF CACHE BOOL "" FORCE)
 set(WITH_IK_ITASC            OFF CACHE BOOL "" FORCE)
 set(WITH_IK_SOLVER           OFF CACHE BOOL "" FORCE)
 set(WITH_IMAGE_CINEON        OFF CACHE BOOL "" FORCE)
+set(WITH_IMAGE_DDS           OFF CACHE BOOL "" FORCE)
+set(WITH_IMAGE_HDR           OFF CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENEXR       OFF CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENJPEG      OFF CACHE BOOL "" FORCE)
+set(WITH_IMAGE_TIFF          OFF CACHE BOOL "" FORCE)
 set(WITH_IMAGE_WEBP          OFF CACHE BOOL "" FORCE)
 set(WITH_INPUT_IME           OFF CACHE BOOL "" FORCE)
 set(WITH_INPUT_NDOF          OFF CACHE BOOL "" FORCE)
 set(WITH_INTERNATIONAL       OFF CACHE BOOL "" FORCE)
-set(WITH_IO_PLY              OFF CACHE BOOL "" FORCE)
 set(WITH_IO_STL              OFF CACHE BOOL "" FORCE)
 set(WITH_IO_WAVEFRONT_OBJ    OFF CACHE BOOL "" FORCE)
 set(WITH_IO_GPENCIL          OFF CACHE BOOL "" FORCE)
@@ -50,6 +52,7 @@ set(WITH_OPENAL              OFF CACHE BOOL "" FORCE)
 set(WITH_OPENCOLLADA         OFF CACHE BOOL "" FORCE)
 set(WITH_OPENCOLORIO         OFF CACHE BOOL "" FORCE)
 set(WITH_OPENIMAGEDENOISE    OFF CACHE BOOL "" FORCE)
+set(WITH_OPENIMAGEIO         OFF CACHE BOOL "" FORCE)
 set(WITH_OPENMP              OFF CACHE BOOL "" FORCE)
 set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
 set(WITH_OPENVDB             OFF CACHE BOOL "" FORCE)

build_files/cmake/config/blender_release.cmake

@@ -27,8 +27,11 @@ set(WITH_HARU                ON  CACHE BOOL "" FORCE)
 set(WITH_IK_ITASC            ON  CACHE BOOL "" FORCE)
 set(WITH_IK_SOLVER           ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_CINEON        ON  CACHE BOOL "" FORCE)
+set(WITH_IMAGE_DDS           ON  CACHE BOOL "" FORCE)
+set(WITH_IMAGE_HDR           ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENEXR       ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENJPEG      ON  CACHE BOOL "" FORCE)
+set(WITH_IMAGE_TIFF          ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_WEBP          ON  CACHE BOOL "" FORCE)
 set(WITH_INPUT_NDOF          ON  CACHE BOOL "" FORCE)
 set(WITH_INPUT_IME           ON  CACHE BOOL "" FORCE)

build_files/cmake/example_scripts/cmake_linux_install.sh

@@ -11,11 +11,11 @@
 mkdir ~/blender-git
 cd ~/blender-git
 
-git clone https://projects.blender.org/blender/blender.git
+git clone http://git.blender.org/blender.git
 cd blender
 git submodule update --init --recursive
-git submodule foreach git checkout main
+git submodule foreach git checkout master
-git submodule foreach git pull --rebase origin main
+git submodule foreach git pull --rebase origin master
 
 # create build dir
 mkdir ~/blender-git/build-cmake
@@ -35,7 +35,7 @@ ln -s ~/blender-git/build-cmake/bin/blender ~/blender-git/blender/blender.bin
 echo ""
 echo "* Useful Commands *"
 echo "   Run Blender: ~/blender-git/blender/blender.bin"
-echo "   Update Blender: git pull --rebase; git submodule foreach git pull --rebase origin main"
+echo "   Update Blender: git pull --rebase; git submodule foreach git pull --rebase origin master"
 echo "   Reconfigure Blender: cd ~/blender-git/build-cmake ; cmake ."
 echo "   Build Blender: cd ~/blender-git/build-cmake ; make"
 echo ""

build_files/cmake/have_features.cmake

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2022 Blender Foundation
+# Copyright 2022 Blender Foundation. All rights reserved.
 
 # This file is used to test the system for headers & symbols.
 # Variables should use the `HAVE_` prefix.

build_files/cmake/macros.cmake

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2006 Blender Foundation
+# Copyright 2006 Blender Foundation. All rights reserved.
 
 macro(list_insert_after
   list_id item_check item_add
@@ -544,7 +544,7 @@ endfunction()
 function(setup_platform_linker_libs
   target
   )
-  # jemalloc must be early in the list, to be before pthread (see #57998).
+  # jemalloc must be early in the list, to be before pthread (see T57998)
   if(WITH_MEM_JEMALLOC)
     target_link_libraries(${target} ${JEMALLOC_LIBRARIES})
   endif()
@@ -702,7 +702,6 @@ macro(remove_strict_flags)
   endif()
 
   if(MSVC)
-    remove_cc_flag(/w34100) # Restore warn C4100 (unreferenced formal parameter) back to w4
     remove_cc_flag(/w34189) # Restore warn C4189 (unused variable) back to w4
   endif()
 
@@ -722,7 +721,7 @@ macro(remove_extra_strict_flags)
   endif()
 
   if(MSVC)
-    remove_cc_flag(/w34100) # Restore warn C4100 (unreferenced formal parameter) back to w4
+    # TODO
   endif()
 endmacro()
 
@@ -1091,7 +1090,7 @@ function(msgfmt_simple
   add_custom_command(
     OUTPUT  ${_file_to}
     COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
-    COMMAND ${CMAKE_COMMAND} -E env ${PLATFORM_ENV_BUILD} "$<TARGET_FILE:msgfmt>" ${_file_from} ${_file_to}
+    COMMAND "$<TARGET_FILE:msgfmt>" ${_file_from} ${_file_to}
     DEPENDS msgfmt ${_file_from})
 
   set_source_files_properties(${_file_to} PROPERTIES GENERATED TRUE)
@@ -1300,29 +1299,16 @@ macro(windows_install_shared_manifest)
   endif()
   if(WINDOWS_INSTALL_DEBUG)
     set(WINDOWS_CONFIGURATIONS "${WINDOWS_CONFIGURATIONS};Debug")
+    list(APPEND WINDOWS_SHARED_MANIFEST_DEBUG ${WINDOWS_INSTALL_FILES})
   endif()
   if(WINDOWS_INSTALL_RELEASE)
+    list(APPEND WINDOWS_SHARED_MANIFEST_RELEASE ${WINDOWS_INSTALL_FILES})
     set(WINDOWS_CONFIGURATIONS "${WINDOWS_CONFIGURATIONS};Release;RelWithDebInfo;MinSizeRel")
   endif()
-  if(NOT WITH_PYTHON_MODULE)
+  install(FILES ${WINDOWS_INSTALL_FILES}
-    # Blender executable with manifest.
+          CONFIGURATIONS ${WINDOWS_CONFIGURATIONS}
-    if(WINDOWS_INSTALL_DEBUG)
+          DESTINATION "./blender.shared"
-      list(APPEND WINDOWS_SHARED_MANIFEST_DEBUG ${WINDOWS_INSTALL_FILES})
+  )
-    endif()
-    if(WINDOWS_INSTALL_RELEASE)
-      list(APPEND WINDOWS_SHARED_MANIFEST_RELEASE ${WINDOWS_INSTALL_FILES})
-    endif()
-    install(FILES ${WINDOWS_INSTALL_FILES}
-            CONFIGURATIONS ${WINDOWS_CONFIGURATIONS}
-            DESTINATION "./blender.shared"
-    )
-  else()
-    # Python module without manifest.
-    install(FILES ${WINDOWS_INSTALL_FILES}
-            CONFIGURATIONS ${WINDOWS_CONFIGURATIONS}
-            DESTINATION "./bpy"
-    )
-  endif()
 endmacro()
 
 macro(windows_generate_manifest)
@@ -1339,48 +1325,24 @@ macro(windows_generate_manifest)
 endmacro()
 
 macro(windows_generate_shared_manifest)
-  if(WINDOWS_SHARED_MANIFEST_DEBUG)
+  windows_generate_manifest(
-    windows_generate_manifest(
+    FILES "${WINDOWS_SHARED_MANIFEST_DEBUG}"
-      FILES "${WINDOWS_SHARED_MANIFEST_DEBUG}"
+    OUTPUT "${CMAKE_BINARY_DIR}/Debug/blender.shared.manifest"
-      OUTPUT "${CMAKE_BINARY_DIR}/Debug/blender.shared.manifest"
+    NAME "blender.shared"
-      NAME "blender.shared"
+  )
-    )
+  windows_generate_manifest(
-    install(
+    FILES "${WINDOWS_SHARED_MANIFEST_RELEASE}"
-      FILES ${CMAKE_BINARY_DIR}/Debug/blender.shared.manifest
+    OUTPUT "${CMAKE_BINARY_DIR}/Release/blender.shared.manifest"
-      DESTINATION "./blender.shared"
+    NAME "blender.shared"
-      CONFIGURATIONS Debug
+  )
-    )
+  install(
-  endif()
+    FILES ${CMAKE_BINARY_DIR}/Release/blender.shared.manifest
-  if(WINDOWS_SHARED_MANIFEST_RELEASE)
+    DESTINATION "./blender.shared"
-    windows_generate_manifest(
+    CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
-      FILES "${WINDOWS_SHARED_MANIFEST_RELEASE}"
+  )
-      OUTPUT "${CMAKE_BINARY_DIR}/Release/blender.shared.manifest"
+  install(
-      NAME "blender.shared"
+    FILES ${CMAKE_BINARY_DIR}/Debug/blender.shared.manifest
-    )
+    DESTINATION "./blender.shared"
-    install(
+    CONFIGURATIONS Debug
-      FILES ${CMAKE_BINARY_DIR}/Release/blender.shared.manifest
+  )
-      DESTINATION "./blender.shared"
-      CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
-    )
-  endif()
-endmacro()
-
-macro(windows_process_platform_bundled_libraries library_deps)
-  if(NOT "${library_deps}" STREQUAL "")
-    set(next_library_mode "ALL")
-    foreach(library ${library_deps})
-      string(TOUPPER "${library}" library_upper)
-      if(("${library_upper}" STREQUAL "RELEASE") OR
-         ("${library_upper}" STREQUAL "DEBUG") OR
-         ("${library_upper}" STREQUAL "ALL"))
-        set(next_library_mode "${library_upper}")
-      else()
-        windows_install_shared_manifest(
-            FILES ${library}
-            ${next_library_mode}
-        )
-        set(next_library_mode "ALL")
-      endif()
-    endforeach()
-  endif()
 endmacro()

build_files/cmake/platform/platform_apple.cmake

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2016 Blender Foundation
+# Copyright 2016 Blender Foundation. All rights reserved.
 
 # Libraries configuration for Apple.
 
@@ -174,7 +174,7 @@ if(SYSTEMSTUBS_LIBRARY)
   list(APPEND PLATFORM_LINKLIBS SystemStubs)
 endif()
 
-string(APPEND PLATFORM_CFLAGS " -pipe -funsigned-char -fno-strict-aliasing -ffp-contract=off")
+string(APPEND PLATFORM_CFLAGS " -pipe -funsigned-char -fno-strict-aliasing")
 set(PLATFORM_LINKFLAGS
   "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework Metal -framework QuartzCore"
 )
@@ -221,8 +221,10 @@ find_package(PNG REQUIRED)
 set(JPEG_ROOT ${LIBDIR}/jpeg)
 find_package(JPEG REQUIRED)
 
-set(TIFF_ROOT ${LIBDIR}/tiff)
+if(WITH_IMAGE_TIFF)
-find_package(TIFF REQUIRED)
+  set(TIFF_ROOT ${LIBDIR}/tiff)
+  find_package(TIFF REQUIRED)
+endif()
 
 if(WITH_IMAGE_WEBP)
   set(WEBP_ROOT_DIR ${LIBDIR}/webp)
@@ -243,7 +245,6 @@ if(WITH_BOOST)
   if(WITH_USD AND USD_PYTHON_SUPPORT)
     list(APPEND _boost_FIND_COMPONENTS python${PYTHON_VERSION_NO_DOTS})
   endif()
-  set(Boost_NO_WARN_NEW_VERSIONS ON)
   find_package(Boost COMPONENTS ${_boost_FIND_COMPONENTS})
 
   # Boost Python is separate to avoid linking Python into tests that don't need it.
@@ -269,7 +270,19 @@ if(WITH_PUGIXML)
   find_package(PugiXML REQUIRED)
 endif()
 
-find_package(OpenImageIO REQUIRED)
+if(WITH_OPENIMAGEIO)
+  find_package(OpenImageIO)
+  list(APPEND OPENIMAGEIO_LIBRARIES
+    ${PNG_LIBRARIES}
+    ${JPEG_LIBRARIES}
+    ${TIFF_LIBRARY}
+    ${OPENEXR_LIBRARIES}
+    ${OPENJPEG_LIBRARIES}
+    ${ZLIB_LIBRARIES}
+  )
+  set(OPENIMAGEIO_DEFINITIONS "-DOIIO_STATIC_BUILD")
+  set(OPENIMAGEIO_IDIFF "${LIBDIR}/openimageio/bin/idiff")
+endif()
 add_bundled_libraries(openimageio/lib)
 
 if(WITH_OPENCOLORIO)
@@ -328,7 +341,6 @@ if(WITH_CYCLES AND WITH_CYCLES_EMBREE)
   endforeach()
   set(EMBREE_LIBRARIES ${_embree_libraries_force_load})
 endif()
-add_bundled_libraries(embree/lib)
 
 if(WITH_OPENIMAGEDENOISE)
   find_package(OpenImageDenoise REQUIRED)
@@ -428,7 +440,7 @@ string(APPEND PLATFORM_LINKFLAGS " -stdlib=libc++")
 # Make stack size more similar to Embree, required for Embree.
 string(APPEND PLATFORM_LINKFLAGS_EXECUTABLE " -Wl,-stack_size,0x100000")
 
-# Suppress ranlib "has no symbols" warnings (workaround for #48250).
+# 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.
@@ -451,31 +463,6 @@ if(WITH_COMPILER_CCACHE)
   endif()
 endif()
 
-unset(_custom_LINKER_FUSE_FLAG)
-if(WITH_LINKER_LLD)
-  find_program(LLD_PROGRAM ld.lld)
-  if(LLD_PROGRAM)
-    set(_custom_LINKER_FUSE_FLAG "-fuse-ld=lld")
-  else()
-    message(WARNING "LLD linker NOT found, disabling WITH_LINKER_LLD")
-    set(WITH_LINKER_LLD OFF)
-  endif()
-endif()
-if(WITH_LINKER_MOLD)
-  find_program(MOLD_PROGRAM mold)
-  if(MOLD_PROGRAM)
-    set(_custom_LINKER_FUSE_FLAG "-fuse-ld=mold")
-  else()
-    message(WARNING "Mold linker NOT found, disabling WITH_LINKER_MOLD")
-    set(WITH_LINKER_MOLD OFF)
-  endif()
-endif()
-
-if(_custom_LINKER_FUSE_FLAG)
-  add_link_options(${_custom_LINKER_FUSE_FLAG})
-endif()
-
-
 if(WITH_COMPILER_ASAN)
   list(APPEND PLATFORM_BUNDLED_LIBRARIES ${COMPILER_ASAN_LIBRARY})
 endif()

build_files/cmake/platform/platform_apple_xcode.cmake

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2016 Blender Foundation
+# Copyright 2016 Blender Foundation. All rights reserved.
 
 # Xcode and system configuration for Apple.
 

build_files/cmake/platform/platform_old_libs_update.cmake

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2022 Blender Foundation
+# Copyright 2022 Blender Foundation. All rights reserved.
 
 # Auto update existing CMake caches for new libraries.
 

build_files/cmake/platform/platform_unix.cmake

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2016 Blender Foundation
+# Copyright 2016 Blender Foundation. All rights reserved.
 
 # Libraries configuration for any *nix system including Linux and Unix (excluding APPLE).
 
@@ -109,10 +109,6 @@ find_package_wrapper(ZLIB REQUIRED)
 find_package_wrapper(Zstd REQUIRED)
 find_package_wrapper(Epoxy REQUIRED)
 
-# XXX Linking errors with debian static tiff :/
-# find_package_wrapper(TIFF REQUIRED)
-find_package(TIFF)
-
 if(WITH_VULKAN_BACKEND)
   find_package_wrapper(Vulkan REQUIRED)
   find_package_wrapper(ShaderC REQUIRED)
@@ -194,6 +190,13 @@ if(WITH_IMAGE_OPENJPEG)
   set_and_warn_library_found("OpenJPEG" OPENJPEG_FOUND WITH_IMAGE_OPENJPEG)
 endif()
 
+if(WITH_IMAGE_TIFF)
+  # XXX Linking errors with debian static tiff :/
+#       find_package_wrapper(TIFF)
+  find_package(TIFF)
+  set_and_warn_library_found("TIFF" TIFF_FOUND WITH_IMAGE_TIFF)
+endif()
+
 if(WITH_OPENAL)
   find_package_wrapper(OpenAL)
   set_and_warn_library_found("OpenAL" OPENAL_FOUND WITH_OPENAL)
@@ -314,7 +317,7 @@ if(WITH_CYCLES AND WITH_CYCLES_OSL)
   endif()
 endif()
 
-if(WITH_CYCLES AND (WITH_CYCLES_DEVICE_ONEAPI OR (WITH_CYCLES_EMBREE AND EMBREE_SYCL_SUPPORT)))
+if(WITH_CYCLES AND WITH_CYCLES_DEVICE_ONEAPI)
   set(CYCLES_LEVEL_ZERO ${LIBDIR}/level-zero CACHE PATH "Path to Level Zero installation")
   if(EXISTS ${CYCLES_LEVEL_ZERO} AND NOT LEVEL_ZERO_ROOT_DIR)
     set(LEVEL_ZERO_ROOT_DIR ${CYCLES_LEVEL_ZERO})
@@ -391,7 +394,6 @@ if(WITH_BOOST)
       list(APPEND __boost_packages python${PYTHON_VERSION_NO_DOTS})
     endif()
     list(APPEND __boost_packages system)
-    set(Boost_NO_WARN_NEW_VERSIONS ON)
     find_package(Boost 1.48 COMPONENTS ${__boost_packages})
     if(NOT Boost_FOUND)
       # try to find non-multithreaded if -mt not found, this flag
@@ -436,7 +438,32 @@ if(WITH_IMAGE_WEBP)
   set_and_warn_library_found("WebP" WEBP_FOUND WITH_IMAGE_WEBP)
 endif()
 
-find_package_wrapper(OpenImageIO REQUIRED)
+if(WITH_OPENIMAGEIO)
+  find_package_wrapper(OpenImageIO)
+  set(OPENIMAGEIO_LIBRARIES
+    ${OPENIMAGEIO_LIBRARIES}
+    ${PNG_LIBRARIES}
+    ${JPEG_LIBRARIES}
+    ${ZLIB_LIBRARIES}
+  )
+
+  set(OPENIMAGEIO_DEFINITIONS "")
+
+  if(WITH_BOOST)
+    list(APPEND OPENIMAGEIO_LIBRARIES "${BOOST_LIBRARIES}")
+  endif()
+  if(WITH_IMAGE_TIFF)
+    list(APPEND OPENIMAGEIO_LIBRARIES "${TIFF_LIBRARY}")
+  endif()
+  if(WITH_IMAGE_OPENEXR)
+    list(APPEND OPENIMAGEIO_LIBRARIES "${OPENEXR_LIBRARIES}")
+  endif()
+  if(WITH_IMAGE_WEBP)
+    list(APPEND OPENIMAGEIO_LIBRARIES "${WEBP_LIBRARIES}")
+  endif()
+
+  set_and_warn_library_found("OPENIMAGEIO" OPENIMAGEIO_FOUND WITH_OPENIMAGEIO)
+endif()
 add_bundled_libraries(openimageio/lib)
 
 if(WITH_OPENCOLORIO)
@@ -450,7 +477,6 @@ add_bundled_libraries(opencolorio/lib)
 if(WITH_CYCLES AND WITH_CYCLES_EMBREE)
   find_package(Embree 3.8.0 REQUIRED)
 endif()
-add_bundled_libraries(embree/lib)
 
 if(WITH_OPENIMAGEDENOISE)
   find_package_wrapper(OpenImageDenoise)
@@ -639,29 +665,15 @@ if(WITH_GHOST_WAYLAND)
     pkg_check_modules(wayland-egl wayland-egl)
     pkg_check_modules(wayland-scanner wayland-scanner)
     pkg_check_modules(wayland-cursor wayland-cursor)
-    pkg_check_modules(wayland-protocols wayland-protocols>=1.31)
+    pkg_check_modules(wayland-protocols wayland-protocols>=1.15)
     pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
   else()
-    # NOTE: this file must always refer to the newest API which is used, so older
-    # `wayland-protocols` are never found and used which then fail to locate required protocols.
-    set(_wayland_protocols_reference_file "staging/fractional-scale/fractional-scale-v1.xml")
-
-    # Reset the protocols directory the reference file from `wayland-protocols` is not found.
-    # This avoids developers having build failures when a cached directory is used that no
-    # longer contains the required file.
-    if(DEFINED WAYLAND_PROTOCOLS_DIR)
-      if(NOT EXISTS "${WAYLAND_PROTOCOLS_DIR}/${_wayland_protocols_reference_file}")
-        unset(WAYLAND_PROTOCOLS_DIR CACHE)
-      endif()
-    endif()
-
     # Rocky8 packages have too old a version, a newer version exist in the pre-compiled libraries.
     find_path(WAYLAND_PROTOCOLS_DIR
-      NAMES ${_wayland_protocols_reference_file}
+      NAMES unstable/xdg-decoration/xdg-decoration-unstable-v1.xml
       PATH_SUFFIXES share/wayland-protocols
       PATHS ${LIBDIR}/wayland-protocols
     )
-    unset(_wayland_protocols_reference_file)
 
     if(EXISTS ${WAYLAND_PROTOCOLS_DIR})
       set(wayland-protocols_FOUND ON)
@@ -803,7 +815,8 @@ if(CMAKE_COMPILER_IS_GNUCC)
   # Automatically turned on when building with "-march=native". This is
   # explicitly turned off here as it will make floating point math give a bit
   # different results. This will lead to automated test failures. So disable
-  # this until we support it.
+  # this until we support it. Seems to default to off in clang and the intel
+  # compiler.
   set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -ffp-contract=off")
 
   # `maybe-uninitialized` is unreliable in release builds, but fine in debug builds.
@@ -814,49 +827,64 @@ 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)
-    elseif(CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1)
-      message(STATUS "GCC 12.1 or newer is required for th MOLD linker.")
-      set(WITH_LINKER_MOLD OFF)
     else()
-      get_filename_component(MOLD_BIN_DIR "${MOLD_BIN}" DIRECTORY)
+      # By default mold installs the binary to:
-      # Check if the `-B` argument is required.
+      # - `{PREFIX}/bin/mold` as well as a symbolic-link in...
-      # This will happen when `MOLD_BIN` points to a non-standard location.
+      # - `{PREFIX}/lib/mold/ld`.
-      # Keep this option as mold is not yet a standard system component and
+      # (where `PREFIX` is typically `/usr/`).
-      # users may have it installed in some unexpected place.
+      #
-      set(_mold_args "-fuse-ld=mold")
+      # This block of code finds `{PREFIX}/lib/mold` from the `mold` binary.
-      execute_process(
+      # Other methods of searching for the path could also be made to work,
-        COMMAND ${CMAKE_C_COMPILER} -B ${MOLD_BIN_DIR} ${_mold_args} -Wl,--version
+      # we could even make our own directory and symbolic-link, however it's more
-        ERROR_QUIET OUTPUT_VARIABLE LD_VERSION_WITH_DIR
+      # 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
       )
-      execute_process(
+      if(NOT MOLD_BIN_DIR)
-        COMMAND ${CMAKE_C_COMPILER} ${_mold_args} -Wl,--version
+        message(STATUS
-        ERROR_QUIET OUTPUT_VARIABLE LD_VERSION
+          "The mold linker could not find the directory containing the linker command "
-      )
+          "(typically "
-      if(NOT (LD_VERSION STREQUAL LD_VERSION_WITH_DIR))
+          "\"${MOLD_PREFIX}/libexec/mold/ld\") or "
-        string(PREPEND _mold_args "-B \"${MOLD_BIN_DIR}\" ")
+          "\"${MOLD_PREFIX}/lib/mold/ld\") using system linker."
-        set(LD_VERSION "${LD_VERSION_WITH_DIR}")
+        )
+        set(WITH_LINKER_MOLD OFF)
       endif()
+      unset(MOLD_PREFIX)
+    endif()
 
-      if("${LD_VERSION}" MATCHES "mold ")
+    if(WITH_LINKER_MOLD)
-        string(APPEND CMAKE_EXE_LINKER_FLAGS    " ${_mold_args}")
+      # GCC will search for `ld` in this directory first.
-        string(APPEND CMAKE_SHARED_LINKER_FLAGS " ${_mold_args}")
+      string(APPEND CMAKE_EXE_LINKER_FLAGS    " -B \"${MOLD_BIN_DIR}\"")
-        string(APPEND CMAKE_MODULE_LINKER_FLAGS " ${_mold_args}")
+      string(APPEND CMAKE_SHARED_LINKER_FLAGS " -B \"${MOLD_BIN_DIR}\"")
-        set(_IS_LINKER_DEFAULT OFF)
+      string(APPEND CMAKE_MODULE_LINKER_FLAGS " -B \"${MOLD_BIN_DIR}\"")
-      else()
+      set(_IS_LINKER_DEFAULT OFF)
-        message(STATUS "GNU mold linker isn't available, using the default system linker.")
-      endif()
-      unset(_mold_args)
-      unset(MOLD_BIN_DIR)
-      unset(LD_VERSION)
     endif()
     unset(MOLD_BIN)
+    unset(MOLD_BIN_DIR)
   endif()
 
   if(WITH_LINKER_GOLD AND _IS_LINKER_DEFAULT)
@@ -891,7 +919,7 @@ 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 -ffp-contract=off")
+  set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
 
   if(WITH_LINKER_MOLD AND _IS_LINKER_DEFAULT)
     find_program(MOLD_BIN "mold")

build_files/cmake/platform/platform_win32.cmake

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2016 Blender Foundation
+# Copyright 2016 Blender Foundation. All rights reserved.
 
 # Libraries configuration for Windows.
 
@@ -114,15 +114,14 @@ add_definitions(-D_WIN32_WINNT=0x603)
 # First generate the manifest for tests since it will not need the dependency on the CRT.
 configure_file(${CMAKE_SOURCE_DIR}/release/windows/manifest/blender.exe.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/tests.exe.manifest @ONLY)
 
-# Always detect CRT paths, but only manually install with WITH_WINDOWS_BUNDLE_CRT.
-set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
-set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
-set(CMAKE_INSTALL_OPENMP_LIBRARIES ${WITH_OPENMP})
-include(InstallRequiredSystemLibraries)
-
 if(WITH_WINDOWS_BUNDLE_CRT)
+  set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
+  set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
+  set(CMAKE_INSTALL_OPENMP_LIBRARIES ${WITH_OPENMP})
+  include(InstallRequiredSystemLibraries)
+
   # ucrtbase(d).dll cannot be in the manifest, due to the way windows 10 handles
-  # redirects for this dll, for details see #88813.
+  # redirects for this dll, for details see T88813.
   foreach(lib ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS})
     string(FIND ${lib} "ucrtbase" pos)
     if(NOT pos EQUAL -1)
@@ -142,9 +141,7 @@ if(WITH_WINDOWS_BUNDLE_CRT)
   install(FILES ${CMAKE_BINARY_DIR}/blender.crt.manifest DESTINATION ./blender.crt)
   set(BUNDLECRT "<dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"blender.crt\" version=\"1.0.0.0\" /></dependentAssembly></dependency>")
 endif()
-if(NOT WITH_PYTHON_MODULE)
+set(BUNDLECRT "${BUNDLECRT}<dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"blender.shared\" version=\"1.0.0.0\" /></dependentAssembly></dependency>")
-  set(BUNDLECRT "${BUNDLECRT}<dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"blender.shared\" version=\"1.0.0.0\" /></dependentAssembly></dependency>")
-endif()
 configure_file(${CMAKE_SOURCE_DIR}/release/windows/manifest/blender.exe.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/blender.exe.manifest @ONLY)
 
 
@@ -181,8 +178,8 @@ if(NOT MSVC_CLANG)
 endif()
 
 if(WITH_WINDOWS_SCCACHE AND CMAKE_VS_MSBUILD_COMMAND)
-  message(WARNING "Disabling sccache, sccache is not supported with msbuild")
+    message(WARNING "Disabling sccache, sccache is not supported with msbuild")
-  set(WITH_WINDOWS_SCCACHE OFF)
+    set(WITH_WINDOWS_SCCACHE OFF)
 endif()
 
 # Debug Symbol format
@@ -298,7 +295,7 @@ unset(MATERIALX_LIB_FOLDER_EXISTS)
 if(NOT MSVC_CLANG                  AND # Available with MSVC 15.7+ but not for CLANG.
    NOT WITH_WINDOWS_SCCACHE        AND # And not when sccache is enabled
    NOT VS_CLANG_TIDY)                  # Clang-tidy does not like these options
-  add_compile_options(/experimental:external /external:I "${LIBDIR}" /external:W0)
+  add_compile_options(/experimental:external /external:templates- /external:I "${LIBDIR}" /external:W0)
 endif()
 
 # Add each of our libraries to our cmake_prefix_path so find_package() could work
@@ -487,12 +484,14 @@ if(WITH_IMAGE_OPENEXR)
   endif()
 endif()
 
-# Try to find tiff first then complain and set static and maybe wrong paths
+if(WITH_IMAGE_TIFF)
-windows_find_package(TIFF)
+  # Try to find tiff first then complain and set static and maybe wrong paths
-if(NOT TIFF_FOUND)
+  windows_find_package(TIFF)
-  warn_hardcoded_paths(libtiff)
+  if(NOT TIFF_FOUND)
-  set(TIFF_LIBRARY ${LIBDIR}/tiff/lib/libtiff.lib)
+    warn_hardcoded_paths(libtiff)
-  set(TIFF_INCLUDE_DIR ${LIBDIR}/tiff/include)
+    set(TIFF_LIBRARY ${LIBDIR}/tiff/lib/libtiff.lib)
+    set(TIFF_INCLUDE_DIR ${LIBDIR}/tiff/include)
+  endif()
 endif()
 
 if(WITH_JACK)
@@ -523,28 +522,6 @@ if(WITH_PYTHON)
   set(PYTHON_LIBRARIES debug "${PYTHON_LIBRARY_DEBUG}" optimized "${PYTHON_LIBRARY}" )
 endif()
 
-if(NOT WITH_WINDOWS_FIND_MODULES)
-  # even if boost is off, we still need to install the dlls when we use our lib folder since
-  # some of the other dependencies may need them. For this to work, BOOST_VERSION,
-  # BOOST_POSTFIX, and BOOST_DEBUG_POSTFIX need to be set.
-  set(BOOST ${LIBDIR}/boost)
-  set(BOOST_INCLUDE_DIR ${BOOST}/include)
-  set(BOOST_LIBPATH ${BOOST}/lib)
-  set(BOOST_VERSION_HEADER ${BOOST_INCLUDE_DIR}/boost/version.hpp)
-  if(EXISTS ${BOOST_VERSION_HEADER})
-    file(STRINGS "${BOOST_VERSION_HEADER}" BOOST_LIB_VERSION REGEX "#define BOOST_LIB_VERSION ")
-    if(BOOST_LIB_VERSION MATCHES "#define BOOST_LIB_VERSION \"([0-9_]+)\"")
-      set(BOOST_VERSION "${CMAKE_MATCH_1}")
-    endif()
-  endif()
-  if(NOT BOOST_VERSION)
-    message(FATAL_ERROR "Unable to determine Boost version")
-  endif()
-  set(BOOST_POSTFIX "vc142-mt-x64-${BOOST_VERSION}")
-  set(BOOST_DEBUG_POSTFIX "vc142-mt-gyd-x64-${BOOST_VERSION}")
-  set(BOOST_PREFIX "")
-endif()
-
 if(WITH_BOOST)
   if(WITH_CYCLES AND WITH_CYCLES_OSL)
     set(boost_extra_libs wave)
@@ -560,6 +537,22 @@ if(WITH_BOOST)
   endif()
   if(NOT Boost_FOUND)
     warn_hardcoded_paths(BOOST)
+    set(BOOST ${LIBDIR}/boost)
+    set(BOOST_INCLUDE_DIR ${BOOST}/include)
+    set(BOOST_LIBPATH ${BOOST}/lib)
+    set(BOOST_VERSION_HEADER ${BOOST_INCLUDE_DIR}/boost/version.hpp)
+    if(EXISTS ${BOOST_VERSION_HEADER})
+      file(STRINGS "${BOOST_VERSION_HEADER}" BOOST_LIB_VERSION REGEX "#define BOOST_LIB_VERSION ")
+      if(BOOST_LIB_VERSION MATCHES "#define BOOST_LIB_VERSION \"([0-9_]+)\"")
+        set(BOOST_VERSION "${CMAKE_MATCH_1}")
+      endif()
+    endif()
+    if(NOT BOOST_VERSION)
+      message(FATAL_ERROR "Unable to determine Boost version")
+    endif()
+    set(BOOST_POSTFIX "vc142-mt-x64-${BOOST_VERSION}")
+    set(BOOST_DEBUG_POSTFIX "vc142-mt-gyd-x64-${BOOST_VERSION}")
+    set(BOOST_PREFIX "")
     # This is file new in 3.4 if it does not exist, assume we are building against 3.3 libs
     set(BOOST_34_TRIGGER_FILE ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_python310-${BOOST_DEBUG_POSTFIX}.lib)
     if(NOT EXISTS ${BOOST_34_TRIGGER_FILE})
@@ -609,18 +602,25 @@ if(WITH_BOOST)
   set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
 endif()
 
-windows_find_package(OpenImageIO)
+if(WITH_OPENIMAGEIO)
-if(NOT OpenImageIO_FOUND)
+  windows_find_package(OpenImageIO)
-  set(OPENIMAGEIO ${LIBDIR}/OpenImageIO)
+  if(NOT OpenImageIO_FOUND)
-  set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
+    set(OPENIMAGEIO ${LIBDIR}/OpenImageIO)
-  set(OPENIMAGEIO_INCLUDE_DIR ${OPENIMAGEIO}/include)
+    set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
-  set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR})
+    set(OPENIMAGEIO_INCLUDE_DIR ${OPENIMAGEIO}/include)
-  set(OIIO_OPTIMIZED optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO.lib optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util.lib)
+    set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR})
-  set(OIIO_DEBUG debug ${OPENIMAGEIO_LIBPATH}/OpenImageIO_d.lib debug ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util_d.lib)
+    set(OIIO_OPTIMIZED optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO.lib optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util.lib)
-  set(OPENIMAGEIO_LIBRARIES ${OIIO_OPTIMIZED} ${OIIO_DEBUG})
+    set(OIIO_DEBUG debug ${OPENIMAGEIO_LIBPATH}/OpenImageIO_d.lib debug ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util_d.lib)
+    set(OPENIMAGEIO_LIBRARIES ${OIIO_OPTIMIZED} ${OIIO_DEBUG})
+  endif()
+  set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0")
   set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe")
+  # If the .dll does not exist, assume it is a static OIIO
+  if(NOT EXISTS ${OPENIMAGEIO}/bin/OpenImageIO.dll)
+    add_definitions(-DOIIO_STATIC_DEFINE)
+  endif()
+  add_definitions(-DOIIO_NO_SSE=1)
 endif()
-add_definitions(-DOIIO_NO_SSE=1)
 
 if(WITH_LLVM)
   set(LLVM_ROOT_DIR ${LIBDIR}/llvm CACHE PATH "Path to the LLVM installation")
@@ -848,75 +848,27 @@ endif()
 if(WITH_CYCLES AND WITH_CYCLES_EMBREE)
   windows_find_package(Embree)
   if(NOT Embree_FOUND)
-    set(EMBREE_ROOT_DIR ${LIBDIR}/embree)
     set(EMBREE_INCLUDE_DIRS ${LIBDIR}/embree/include)
-
-    if(EXISTS ${LIBDIR}/embree/include/embree4/rtcore_config.h)
-      set(EMBREE_MAJOR_VERSION 4)
-    else()
-      set(EMBREE_MAJOR_VERSION 3)
-    endif()
-
-    file(READ ${LIBDIR}/embree/include/embree${EMBREE_MAJOR_VERSION}/rtcore_config.h _embree_config_header)
-    if(_embree_config_header MATCHES "#define EMBREE_STATIC_LIB")
-      set(EMBREE_STATIC_LIB TRUE)
-    else()
-      set(EMBREE_STATIC_LIB FALSE)
-    endif()
-
-    if(_embree_config_header MATCHES "#define EMBREE_SYCL_SUPPORT")
-      set(EMBREE_SYCL_SUPPORT TRUE)
-    else()
-      set(EMBREE_SYCL_SUPPORT FALSE)
-    endif()
-
     set(EMBREE_LIBRARIES
-      optimized ${LIBDIR}/embree/lib/embree${EMBREE_MAJOR_VERSION}.lib
+      optimized ${LIBDIR}/embree/lib/embree3.lib
-      debug ${LIBDIR}/embree/lib/embree${EMBREE_MAJOR_VERSION}_d.lib
+      optimized ${LIBDIR}/embree/lib/embree_avx2.lib
-    )
+      optimized ${LIBDIR}/embree/lib/embree_avx.lib
+      optimized ${LIBDIR}/embree/lib/embree_sse42.lib
+      optimized ${LIBDIR}/embree/lib/lexers.lib
+      optimized ${LIBDIR}/embree/lib/math.lib
+      optimized ${LIBDIR}/embree/lib/simd.lib
+      optimized ${LIBDIR}/embree/lib/sys.lib
+      optimized ${LIBDIR}/embree/lib/tasking.lib
 
-    if(EMBREE_SYCL_SUPPORT)
+      debug ${LIBDIR}/embree/lib/embree3_d.lib
-      set(EMBREE_LIBRARIES
+      debug ${LIBDIR}/embree/lib/embree_avx2_d.lib
-        ${EMBREE_LIBRARIES}
+      debug ${LIBDIR}/embree/lib/embree_avx_d.lib
-        optimized ${LIBDIR}/embree/lib/embree4_sycl.lib
+      debug ${LIBDIR}/embree/lib/embree_sse42_d.lib
-        debug ${LIBDIR}/embree/lib/embree4_sycl_d.lib
+      debug ${LIBDIR}/embree/lib/lexers_d.lib
-      )
+      debug ${LIBDIR}/embree/lib/math_d.lib
-    endif()
+      debug ${LIBDIR}/embree/lib/simd_d.lib
-
+      debug ${LIBDIR}/embree/lib/sys_d.lib
-    if(EMBREE_STATIC_LIB)
+      debug ${LIBDIR}/embree/lib/tasking_d.lib
-      set(EMBREE_LIBRARIES
-        ${EMBREE_LIBRARIES}
-        optimized ${LIBDIR}/embree/lib/embree_avx2.lib
-        optimized ${LIBDIR}/embree/lib/embree_avx.lib
-        optimized ${LIBDIR}/embree/lib/embree_sse42.lib
-        optimized ${LIBDIR}/embree/lib/lexers.lib
-        optimized ${LIBDIR}/embree/lib/math.lib
-        optimized ${LIBDIR}/embree/lib/simd.lib
-        optimized ${LIBDIR}/embree/lib/sys.lib
-        optimized ${LIBDIR}/embree/lib/tasking.lib
-        debug ${LIBDIR}/embree/lib/embree_avx2_d.lib
-        debug ${LIBDIR}/embree/lib/embree_avx_d.lib
-        debug ${LIBDIR}/embree/lib/embree_sse42_d.lib
-        debug ${LIBDIR}/embree/lib/lexers_d.lib
-        debug ${LIBDIR}/embree/lib/math_d.lib
-        debug ${LIBDIR}/embree/lib/simd_d.lib
-        debug ${LIBDIR}/embree/lib/sys_d.lib
-        debug ${LIBDIR}/embree/lib/tasking_d.lib
-      )
-
-      if(EMBREE_SYCL_SUPPORT)
-        set(EMBREE_LIBRARIES
-          ${EMBREE_LIBRARIES}
-          optimized ${LIBDIR}/embree/lib/embree_rthwif.lib
-          debug ${LIBDIR}/embree/lib/embree_rthwif_d.lib
-        )
-      endif()
-    endif()
-  endif()
-  if(NOT EMBREE_STATIC_LIB)
-    list(APPEND PLATFORM_BUNDLED_LIBRARIES
-      RELEASE ${EMBREE_ROOT_DIR}/bin/embree${EMBREE_MAJOR_VERSION}.dll
-      DEBUG ${EMBREE_ROOT_DIR}/bin/embree${EMBREE_MAJOR_VERSION}_d.dll
     )
   endif()
 endif()
@@ -949,11 +901,11 @@ endif()
 
 if(WINDOWS_PYTHON_DEBUG)
   # Include the system scripts in the blender_python_system_scripts project.
-  file(GLOB_RECURSE inFiles "${CMAKE_SOURCE_DIR}/scripts/*.*" )
+  file(GLOB_RECURSE inFiles "${CMAKE_SOURCE_DIR}/release/scripts/*.*" )
   add_custom_target(blender_python_system_scripts SOURCES ${inFiles})
   foreach(_source IN ITEMS ${inFiles})
     get_filename_component(_source_path "${_source}" PATH)
-    string(REPLACE "${CMAKE_SOURCE_DIR}/scripts/" "" _source_path "${_source_path}")
+    string(REPLACE "${CMAKE_SOURCE_DIR}/release/scripts/" "" _source_path "${_source_path}")
     string(REPLACE "/" "\\" _group_path "${_source_path}")
     source_group("${_group_path}" FILES "${_source}")
   endforeach()
@@ -988,7 +940,7 @@ if(WINDOWS_PYTHON_DEBUG)
     file(WRITE ${USER_PROPS_FILE} "<?xml version=\"1.0\" encoding=\"utf-8\"?>
 <Project DefaultTargets=\"Build\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">
   <PropertyGroup>
-    <LocalDebuggerCommandArguments>-con --env-system-scripts \"${CMAKE_SOURCE_DIR}/scripts\" </LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-con --env-system-scripts \"${CMAKE_SOURCE_DIR}/release/scripts\" </LocalDebuggerCommandArguments>
   </PropertyGroup>
 </Project>")
   endif()
@@ -1042,23 +994,6 @@ if(WITH_VULKAN_BACKEND)
   endif()
 endif()
 
-if(WITH_VULKAN_BACKEND)
-  if(EXISTS ${LIBDIR}/shaderc)
-    set(SHADERC_FOUND On)
-    set(SHADERC_ROOT_DIR ${LIBDIR}/shaderc)
-    set(SHADERC_INCLUDE_DIR ${SHADERC_ROOT_DIR}/include)
-    set(SHADERC_INCLUDE_DIRS ${SHADERC_INCLUDE_DIR})
-    set(SHADERC_LIBRARY
-      DEBUG ${SHADERC_ROOT_DIR}/lib/shaderc_shared_d.lib
-      OPTIMIZED ${SHADERC_ROOT_DIR}/lib/shaderc_shared.lib
-    )
-    set(SHADERC_LIBRARIES ${SHADERC_LIBRARY})
-  else()
-    message(WARNING "Shaderc was not found, disabling WITH_VULKAN_BACKEND")
-    set(WITH_VULKAN_BACKEND OFF)
-  endif()
-endif()
-
 if(WITH_CYCLES AND WITH_CYCLES_PATH_GUIDING)
   find_package(openpgl QUIET)
   if(openpgl_FOUND)
@@ -1075,7 +1010,7 @@ endif()
 set(ZSTD_INCLUDE_DIRS ${LIBDIR}/zstd/include)
 set(ZSTD_LIBRARIES ${LIBDIR}/zstd/lib/zstd_static.lib)
 
-if(WITH_CYCLES AND (WITH_CYCLES_DEVICE_ONEAPI OR (WITH_CYCLES_EMBREE AND EMBREE_SYCL_SUPPORT)))
+if(WITH_CYCLES AND WITH_CYCLES_DEVICE_ONEAPI)
   set(LEVEL_ZERO_ROOT_DIR ${LIBDIR}/level_zero)
   set(CYCLES_SYCL ${LIBDIR}/dpcpp CACHE PATH "Path to oneAPI DPC++ compiler")
   if(EXISTS ${CYCLES_SYCL} AND NOT SYCL_ROOT_DIR)
@@ -1086,9 +1021,8 @@ if(WITH_CYCLES AND (WITH_CYCLES_DEVICE_ONEAPI OR (WITH_CYCLES_EMBREE AND EMBREE_
     ${SYCL_ROOT_DIR}/bin/sycl[0-9].dll
   )
   foreach(sycl_runtime_library IN LISTS _sycl_runtime_libraries_glob)
-    string(REPLACE ".dll" "d.dll" sycl_runtime_library_debug ${sycl_runtime_library})
+    string(REPLACE ".dll" "$<$<CONFIG:Debug>:d>.dll" sycl_runtime_library ${sycl_runtime_library})
-    list(APPEND _sycl_runtime_libraries RELEASE ${sycl_runtime_library})
+    list(APPEND _sycl_runtime_libraries ${sycl_runtime_library})
-    list(APPEND _sycl_runtime_libraries DEBUG ${sycl_runtime_library_debug})
   endforeach()
   unset(_sycl_runtime_libraries_glob)
 
@@ -1101,14 +1035,12 @@ if(WITH_CYCLES AND (WITH_CYCLES_DEVICE_ONEAPI OR (WITH_CYCLES_EMBREE AND EMBREE_
 
   list(APPEND PLATFORM_BUNDLED_LIBRARIES ${_sycl_runtime_libraries})
   unset(_sycl_runtime_libraries)
-
-  set(SYCL_LIBRARIES optimized ${SYCL_LIBRARY} debug ${SYCL_LIBRARY_DEBUG})
 endif()
 
 
 # Environment variables to run precompiled executables that needed libraries.
 list(JOIN PLATFORM_BUNDLED_LIBRARY_DIRS ";" _library_paths)
-set(PLATFORM_ENV_BUILD_DIRS "${LIBDIR}/tbb/bin\;${LIBDIR}/OpenImageIO/bin\;${LIBDIR}/boost/lib\;${LIBDIR}/openexr/bin\;${LIBDIR}/imath/bin\;${PATH}")
+set(PLATFORM_ENV_BUILD_DIRS "${LIBDIR}/OpenImageIO/bin\;${LIBDIR}/boost/lib\;${LIBDIR}/openexr/bin\;${LIBDIR}/imath/bin\;${PATH}")
 set(PLATFORM_ENV_BUILD "PATH=${PLATFORM_ENV_BUILD_DIRS}")
 # Install needs the additional folders from PLATFORM_ENV_BUILD_DIRS as well, as tools like idiff and abcls use the release mode dlls
 set(PLATFORM_ENV_INSTALL "PATH=${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/blender.shared/\;${PLATFORM_ENV_BUILD_DIRS}\;$ENV{PATH}")

build_files/cmake/project_info.py

@@ -142,7 +142,7 @@ def cmake_advanced_info() -> Union[Tuple[List[str], List[Tuple[str, str]]], Tupl
 
     make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM")
     if make_exe is None:
-        print("Make command not found: CMAKE_MAKE_PROGRAM")
+        print("Make command not found in: %r not found" % project_path)
         return None, None
 
     make_exe_basename = os.path.basename(make_exe)

build_files/config/pipeline_config.yaml

@@ -1,3 +1,53 @@
+#
+# Used by Buildbot build pipeline make_update.py script only for now
+# We intended to update the make_update.py in the branches to use this file eventually
+#
+update-code:
+    git:
+        submodules:
+        -   branch: master
+            commit_id: HEAD
+            path: release/scripts/addons
+        -   branch: master
+            commit_id: HEAD
+            path: release/scripts/addons_contrib
+        -   branch: master
+            commit_id: HEAD
+            path: release/datafiles/locale
+        -   branch: master
+            commit_id: HEAD
+            path: source/tools
+    svn:
+        libraries:
+            darwin-arm64:
+                branch: trunk
+                commit_id: HEAD
+                path: lib/darwin_arm64
+            darwin-x86_64:
+                branch: trunk
+                commit_id: HEAD
+                path: lib/darwin
+            linux-x86_64:
+                branch: trunk
+                commit_id: HEAD
+                path: lib/linux_x86_64_glibc_228
+            windows-amd64:
+                branch: trunk
+                commit_id: HEAD
+                path: lib/win64_vc15
+        tests:
+            branch: trunk
+            commit_id: HEAD
+            path: lib/tests
+        benchmarks:
+            branch: trunk
+            commit_id: HEAD
+            path: lib/benchmarks
+        assets:
+            branch: trunk
+            commit_id: HEAD
+            path: lib/assets
+
 #
 # Buildbot only configs
 #
@@ -9,7 +59,7 @@ buildbot:
     cuda11:
         version: '11.4.1'
     hip:
-        version: '5.5.30571'
+        version: '5.3.22480'
     optix:
         version: '7.3.0'
     ocloc:

build_files/utils/make_bpy_wheel.py

@@ -58,7 +58,7 @@ Each Blender release supports one Python version, and the package is only compat
 ## Source Code
 
 * [Releases](https://download.blender.org/source/)
-* Repository: [projects.blender.org/blender/blender.git](https://projects.blender.org/blender/blender)
+* Repository: [git.blender.org/blender.git](https://git.blender.org/gitweb/gitweb.cgi/blender.git)
 
 ## Credits
 

build_files/utils/make_source_archive.py

@@ -112,7 +112,6 @@ def create_manifest(
     print(f'Building manifest of files:  "{outpath}"...', end="", flush=True)
     with outpath.open("w", encoding="utf-8") as outfile:
         main_files_to_manifest(blender_srcdir, outfile)
-        assets_to_manifest(blender_srcdir, outfile)
         submodules_to_manifest(blender_srcdir, version, outfile)
 
         if packages_dir:
@@ -132,27 +131,17 @@ def submodules_to_manifest(
     skip_addon_contrib = version.is_release()
     assert not blender_srcdir.is_absolute()
 
-    for submodule in ("scripts/addons", "scripts/addons_contrib"):
+    for line in git_command("-C", blender_srcdir, "submodule"):
+        submodule = line.split()[1]
+
         # Don't use native slashes as GIT for MS-Windows outputs forward slashes.
-        if skip_addon_contrib and submodule == "scripts/addons_contrib":
+        if skip_addon_contrib and submodule == "release/scripts/addons_contrib":
             continue
 
         for path in git_ls_files(blender_srcdir / submodule):
             print(path, file=outfile)
 
 
-def assets_to_manifest(blender_srcdir: Path, outfile: TextIO) -> None:
-    assert not blender_srcdir.is_absolute()
-
-    assets_dir = blender_srcdir.parent / "lib" / "assets"
-    for path in assets_dir.glob("*"):
-        if path.name == "working":
-            continue
-        if path.name in SKIP_NAMES:
-            continue
-        print(path, file=outfile)
-
-
 def packages_to_manifest(outfile: TextIO, packages_dir: Path) -> None:
     for path in packages_dir.glob("*"):
         if not path.is_file():
@@ -183,9 +172,7 @@ def create_tarball(
     command += [
         "--transform",
         f"s,^{blender_srcdir.name}/,blender-{version}/,g",
-        "--transform",
+        "--use-compress-program=xz -9",
-        f"s,^lib/assets/,blender-{version}/release/datafiles/assets/,g",
-        "--use-compress-program=xz -1",
         "--create",
         f"--file={tarball}",
         f"--files-from={manifest}",

build_files/utils/make_update.py

@@ -16,28 +16,14 @@ import shutil
 import sys
 
 import make_utils
-from pathlib import Path
 from make_utils import call, check_output
-from urllib.parse import urljoin
 
 from typing import (
     List,
-    Iterable,
     Optional,
 )
 
 
-class Submodule:
-    path: str
-    branch: str
-    branch_fallback: str
-
-    def __init__(self, path: str, branch: str, branch_fallback: str) -> None:
-        self.path = path
-        self.branch = branch
-        self.branch_fallback = branch_fallback
-
-
 def print_stage(text: str) -> None:
     print("")
     print(text)
@@ -56,7 +42,6 @@ def parse_arguments() -> argparse.Namespace:
     parser.add_argument("--svn-branch", default=None)
     parser.add_argument("--git-command", default="git")
     parser.add_argument("--use-linux-libraries", action="store_true")
-    parser.add_argument("--architecture", type=str, choices=("x86_64", "amd64", "arm64",))
     return parser.parse_args()
 
 
@@ -66,19 +51,6 @@ def get_blender_git_root() -> str:
 # Setup for precompiled libraries and tests from svn.
 
 
-def get_effective_architecture(args: argparse.Namespace) -> str:
-    architecture = args.architecture
-    if architecture:
-        assert isinstance(architecture, str)
-        return architecture
-
-    # Check platform.version to detect arm64 with x86_64 python binary.
-    if "ARM64" in platform.version():
-        return "arm64"
-
-    return platform.machine().lower()
-
-
 def svn_update(args: argparse.Namespace, release_version: Optional[str]) -> None:
     svn_non_interactive = [args.svn_command, '--non-interactive']
 
@@ -86,11 +58,11 @@ def svn_update(args: argparse.Namespace, release_version: Optional[str]) -> None
     svn_url = make_utils.svn_libraries_base_url(release_version, args.svn_branch)
 
     # Checkout precompiled libraries
-    architecture = get_effective_architecture(args)
     if sys.platform == 'darwin':
-        if architecture == 'arm64':
+        # Check platform.version to detect arm64 with x86_64 python binary.
+        if platform.machine() == 'arm64' or ('ARM64' in platform.version()):
             lib_platform = "darwin_arm64"
-        elif architecture == 'x86_64':
+        elif platform.machine() == 'x86_64':
             lib_platform = "darwin"
         else:
             lib_platform = None
@@ -198,7 +170,7 @@ def git_update_skip(args: argparse.Namespace, check_remote_exists: bool = True)
         return "rebase or merge in progress, complete it first"
 
     # Abort if uncommitted changes.
-    changes = check_output([args.git_command, 'status', '--porcelain', '--untracked-files=no', '--ignore-submodules'])
+    changes = check_output([args.git_command, 'status', '--porcelain', '--untracked-files=no'])
     if len(changes) != 0:
         return "you have unstaged changes"
 
@@ -212,297 +184,97 @@ def git_update_skip(args: argparse.Namespace, check_remote_exists: bool = True)
     return ""
 
 
-def use_upstream_workflow(args: argparse.Namespace) -> bool:
-    return make_utils.git_remote_exist(args.git_command, "upstream")
-
-
-def work_tree_update_upstream_workflow(args: argparse.Namespace, use_fetch: bool = True) -> str:
-    """
-    Update the Blender repository using the Github style of fork organization
-
-    Returns true if the current local branch has been updated to the upstream state.
-    Otherwise false is returned.
-    """
-
-    branch_name = make_utils.git_branch(args.git_command)
-
-    if use_fetch:
-        call((args.git_command, "fetch", "upstream"))
-
-    upstream_branch = f"upstream/{branch_name}"
-    if not make_utils.git_branch_exists(args.git_command, upstream_branch):
-        return "no_branch"
-
-    retcode = call((args.git_command, "merge", "--ff-only", upstream_branch), exit_on_error=False)
-    if retcode != 0:
-        return "Unable to fast forward\n"
-
-    return ""
-
-
-def work_tree_update(args: argparse.Namespace, use_fetch: bool = True) -> str:
-    """
-    Update the Git working tree using the best strategy
-
-    This function detects whether it is a github style of fork remote organization is used, or
-    is it a repository which origin is an upstream.
-    """
-
-    if use_upstream_workflow(args):
-        message = work_tree_update_upstream_workflow(args, use_fetch)
-        if message != "no_branch":
-            return message
-
-        # If there is upstream configured but the local branch is not in the upstream, try to
-        # update the branch from the fork.
-
-    update_command = [args.git_command, "pull", "--rebase"]
-
-    call(update_command)
-
-    return ""
-
-
 # Update blender repository.
-def blender_update(args: argparse.Namespace) -> str:
+def blender_update(args: argparse.Namespace) -> None:
     print_stage("Updating Blender Git Repository")
-
+    call([args.git_command, "pull", "--rebase"])
-    return work_tree_update(args)
 
 
-def resolve_external_url(blender_url: str, repo_name: str) -> str:
+# Update submodules.
-    return urljoin(blender_url + "/", "../" + repo_name)
+def submodules_update(
+        args: argparse.Namespace,
+        release_version: Optional[str],
+        branch: Optional[str],
+) -> str:
+    print_stage("Updating Submodules")
+    if make_utils.command_missing(args.git_command):
+        sys.stderr.write("git not found, can't update code\n")
+        sys.exit(1)
 
-
+    # Update submodules to appropriate given branch,
-def external_script_copy_old_submodule_over(args: argparse.Namespace, directory_name: str) -> None:
+    # falling back to master if none is given and/or found in a sub-repository.
-    blender_git_root = Path(get_blender_git_root())
+    branch_fallback = "master"
-    scripts_dir = blender_git_root / "scripts"
-    external_dir = scripts_dir / directory_name
-
-    old_submodule_relative_dir = Path("release") / "scripts" / directory_name
-    print(f"Moving {old_submodule_relative_dir} to scripts/{directory_name} ...")
-
-    old_submodule_dir = blender_git_root / old_submodule_relative_dir
-    shutil.move(old_submodule_dir, external_dir)
-
-    # Remove old ".git" which is a file with path to a submodule bare repo inside of main
-    # repo .git/modules directory.
-    (external_dir / ".git").unlink()
-
-    bare_repo_relative_dir = Path(".git") / "modules" / "release" / "scripts" / directory_name
-    print(f"Copying {bare_repo_relative_dir} to scripts/{directory_name}/.git ...")
-    bare_repo_dir = blender_git_root / bare_repo_relative_dir
-    shutil.copytree(bare_repo_dir, external_dir / ".git")
-
-    git_config = external_dir / ".git" / "config"
-    call((args.git_command, "config", "--file", str(git_config), "--unset", "core.worktree"))
-
-
-def external_script_initialize_if_needed(args: argparse.Namespace,
-                                         repo_name: str,
-                                         directory_name: str) -> None:
-    """Initialize checkout of an external repository scripts directory"""
-
-    blender_git_root = Path(get_blender_git_root())
-    blender_dot_git = blender_git_root / ".git"
-    scripts_dir = blender_git_root / "scripts"
-    external_dir = scripts_dir / directory_name
-
-    if external_dir.exists():
-        return
-
-    print(f"Initializing scripts/{directory_name} ...")
-
-    old_submodule_dot_git = blender_git_root / "release" / "scripts" / directory_name / ".git"
-    if old_submodule_dot_git.exists() and blender_dot_git.is_dir():
-        external_script_copy_old_submodule_over(args, directory_name)
-        return
-
-    origin_name = "upstream" if use_upstream_workflow(args) else "origin"
-    blender_url = make_utils.git_get_remote_url(args.git_command, origin_name)
-    external_url = resolve_external_url(blender_url, repo_name)
-
-    # When running `make update` from a freshly cloned fork check whether the fork of the submodule is
-    # available, If not, switch to the submodule relative to the main blender repository.
-    if origin_name == "origin" and not make_utils.git_is_remote_repository(args.git_command, external_url):
-        external_url = resolve_external_url("https://projects.blender.org/blender/blender", repo_name)
-
-    call((args.git_command, "clone", "--origin", origin_name, external_url, str(external_dir)))
-
-
-def external_script_add_origin_if_needed(args: argparse.Namespace,
-                                         repo_name: str,
-                                         directory_name: str) -> None:
-    """
-    Add remote called 'origin' if there is a fork of the external repository available
-
-    This is only done when using Github style upstream workflow in the main repository.
-    """
-
-    if not use_upstream_workflow(args):
-        return
-
-    cwd = os.getcwd()
-
-    blender_git_root = Path(get_blender_git_root())
-    scripts_dir = blender_git_root / "scripts"
-    external_dir = scripts_dir / directory_name
-
-    origin_blender_url = make_utils.git_get_remote_url(args.git_command, "origin")
-    origin_external_url = resolve_external_url(origin_blender_url, repo_name)
-
-    try:
-        os.chdir(external_dir)
-
-        if (make_utils.git_remote_exist(args.git_command, "origin") or
-                not make_utils.git_remote_exist(args.git_command, "upstream")):
-            return
-
-        if not make_utils.git_is_remote_repository(args.git_command, origin_external_url):
-            return
-
-        print(f"Adding origin remote to {directory_name} pointing to fork ...")
-
-        # Non-obvious tricks to introduce the new remote called "origin" to the existing
-        # submodule configuration.
-        #
-        # This is all within the content of creating a fork of a submodule after `make update`
-        # has been run and possibly local branches tracking upstream were added.
-        #
-        # The idea here goes as following:
-        #
-        #  - Rename remote "upstream" to "origin", which takes care of changing the names of
-        #    remotes the local branches are tracking.
-        #
-        #  - Change the URL to the "origin", which so was was still pointing to upstream.
-        #
-        #  - Re-introduce the "upstream" remote, with the same URL as it had prior to rename.
-
-        upstream_url = make_utils.git_get_remote_url(args.git_command, "upstream")
-
-        call((args.git_command, "remote", "rename", "upstream", "origin"))
-        make_utils.git_set_config(args.git_command, f"remote.origin.url", origin_external_url)
-
-        call((args.git_command, "remote", "add", "upstream", upstream_url))
-    finally:
-        os.chdir(cwd)
-
-    return
-
-
-def external_scripts_update(args: argparse.Namespace,
-                            repo_name: str,
-                            directory_name: str,
-                            branch: Optional[str]) -> str:
-    """Update a single external checkout with the given name in the scripts folder"""
-
-    external_script_initialize_if_needed(args, repo_name, directory_name)
-    external_script_add_origin_if_needed(args, repo_name, directory_name)
-
-    print(f"Updating scripts/{directory_name} ...")
-
-    cwd = os.getcwd()
-
-    blender_git_root = Path(get_blender_git_root())
-    scripts_dir = blender_git_root / "scripts"
-    external_dir = scripts_dir / directory_name
-
-    # Update externals to appropriate given branch, falling back to main if none is given and/or
-    # found in a sub-repository.
-    branch_fallback = "main"
     if not branch:
         branch = branch_fallback
 
+    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),
+    ]
+
+    # Initialize submodules only if needed.
+    for submodule_path, submodule_branch, submodule_branch_fallback 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:
-    try:
+        cwd = os.getcwd()
-        os.chdir(external_dir)
+        try:
-        msg = git_update_skip(args, check_remote_exists=False)
+            os.chdir(submodule_path)
-        if msg:
+            msg = git_update_skip(args, check_remote_exists=False)
-            skip_msg += directory_name + " skipped: " + msg + "\n"
+            if msg:
-        else:
+                skip_msg += submodule_path + " skipped: " + msg + "\n"
-            # Find a matching branch that exists.
-            for remote in ("origin", "upstream"):
-                if make_utils.git_remote_exist(args.git_command, remote):
-                    call([args.git_command, "fetch", remote])
-
-            submodule_branch = branch
-
-            if make_utils.git_branch_exists(args.git_command, submodule_branch):
-                pass
-            elif make_utils.git_branch_exists(args.git_command, branch_fallback):
-                submodule_branch = branch_fallback
             else:
-                # Skip.
+                # Find a matching branch that exists.
-                submodule_branch = ""
+                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:
+                    # Skip.
+                    submodule_branch = ""
 
-            # Switch to branch and pull.
+                # Switch to branch and pull.
-            if submodule_branch:
+                if submodule_branch:
-                if make_utils.git_branch(args.git_command) != submodule_branch:
+                    if make_utils.git_branch(args.git_command) != submodule_branch:
-                    # If the local branch exists just check out to it.
-                    # If there is no local branch but only remote specify an explicit remote.
-                    # Without this explicit specification Git attempts to set-up tracking
-                    # automatically and fails when the branch is available in multiple remotes.
-                    if make_utils.git_local_branch_exists(args.git_command, submodule_branch):
                         call([args.git_command, "checkout", submodule_branch])
-                    elif make_utils.git_remote_exist(args.git_command, "origin"):
+                    call([args.git_command, "pull", "--rebase", "origin", submodule_branch])
-                        call([args.git_command, "checkout", "-t", f"origin/{submodule_branch}"])
+        finally:
-                    elif make_utils.git_remote_exist(args.git_command, "upstream"):
+            os.chdir(cwd)
-                        call([args.git_command, "checkout", "-t", f"upstream/{submodule_branch}"])
-                # Don't use extra fetch since all remotes of interest have been already fetched
-                # some lines above.
-                skip_msg += work_tree_update(args, use_fetch=False)
-    finally:
-        os.chdir(cwd)
 
     return skip_msg
 
 
-def scripts_submodules_update(args: argparse.Namespace, branch: Optional[str]) -> str:
-    """Update working trees of addons and addons_contrib within the scripts/ directory"""
-    msg = ""
-
-    msg += external_scripts_update(args, "blender-addons", "addons", branch)
-    msg += external_scripts_update(args, "blender-addons-contrib", "addons_contrib", branch)
-
-    return msg
-
-
-def submodules_update(args: argparse.Namespace, branch: Optional[str]) -> str:
-    """Update submodules or other externally tracked source trees"""
-    msg = ""
-
-    msg += scripts_submodules_update(args, branch)
-
-    return msg
-
-
 if __name__ == "__main__":
     args = parse_arguments()
     blender_skip_msg = ""
     submodules_skip_msg = ""
 
-    blender_version = make_utils. parse_blender_version()
+    # Test if we are building a specific release version.
-    if blender_version.cycle != 'alpha':
+    branch = make_utils.git_branch(args.git_command)
-        major = blender_version.version // 100
+    if branch == 'HEAD':
-        minor = blender_version.version % 100
+        sys.stderr.write('Blender git repository is in detached HEAD state, must be in a branch\n')
-        branch = f"blender-v{major}.{minor}-release"
+        sys.exit(1)
-        release_version: Optional[str] = f"{major}.{minor}"
+
-    else:
+    tag = make_utils.git_tag(args.git_command)
-        # TODO !!!!! remove this before merge !!!!!
+    release_version = make_utils.git_branch_release_version(branch, tag)
-        branch = 'asset-shelf'
-        release_version = None
 
     if not args.no_libraries:
         svn_update(args, release_version)
     if not args.no_blender:
         blender_skip_msg = git_update_skip(args)
-        if not blender_skip_msg:
-            blender_skip_msg = blender_update(args)
         if blender_skip_msg:
             blender_skip_msg = "Blender repository skipped: " + blender_skip_msg + "\n"
+        else:
+            blender_update(args)
     if not args.no_submodules:
-        submodules_skip_msg = submodules_update(args, branch)
+        submodules_skip_msg = submodules_update(args, release_version, branch)
 
     # Report any skipped repositories at the end, so it's not as easy to miss.
     skip_msg = blender_skip_msg + submodules_skip_msg

build_files/utils/make_utils.py

@@ -9,9 +9,7 @@ import re
 import shutil
 import subprocess
 import sys
-import os
 from pathlib import Path
-from urllib.parse import urljoin
 
 from typing import (
     Sequence,
@@ -21,7 +19,7 @@ from typing import (
 
 def call(cmd: Sequence[str], exit_on_error: bool = True, silent: bool = False) -> int:
     if not silent:
-        print(" ".join([str(x) for x in cmd]))
+        print(" ".join(cmd))
 
     # Flush to ensure correct order output on Windows.
     sys.stdout.flush()
@@ -54,57 +52,13 @@ def check_output(cmd: Sequence[str], exit_on_error: bool = True) -> str:
     return output.strip()
 
 
-def git_local_branch_exists(git_command: str, branch: str) -> bool:
-    return (
-        call([git_command, "rev-parse", "--verify", branch], exit_on_error=False, silent=True) == 0
-    )
-
-
 def git_branch_exists(git_command: str, branch: str) -> bool:
     return (
-        git_local_branch_exists(git_command, branch) or
+        call([git_command, "rev-parse", "--verify", branch], exit_on_error=False, silent=True) == 0 or
-        call([git_command, "rev-parse", "--verify", "remotes/upstream/" + 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_get_remote_url(git_command: str, remote_name: str) -> str:
-    return check_output((git_command, "ls-remote", "--get-url", remote_name))
-
-
-def git_remote_exist(git_command: str, remote_name: str) -> bool:
-    """Check whether there is a remote with the given name"""
-    # `git ls-remote --get-url upstream` will print an URL if there is such remote configured, and
-    # otherwise will print "upstream".
-    remote_url = check_output((git_command, "ls-remote", "--get-url", remote_name))
-    return remote_url != remote_name
-
-
-def git_get_resolved_submodule_url(git_command: str, blender_url: str, submodule_path: str) -> str:
-    git_root = check_output([git_command, "rev-parse", "--show-toplevel"])
-    dot_gitmodules = os.path.join(git_root, ".gitmodules")
-
-    submodule_key_prefix = f"submodule.{submodule_path}"
-    submodule_key_url = f"{submodule_key_prefix}.url"
-
-    gitmodule_url = git_get_config(
-        git_command, submodule_key_url, file=dot_gitmodules)
-
-    # A bit of a trickery to construct final URL.
-    # Only works for the relative submodule URLs.
-    #
-    # Note that unless the LHS URL ends up with a slash urljoin treats the last component as a
-    # file.
-    assert gitmodule_url.startswith('..')
-    return urljoin(blender_url + "/", gitmodule_url)
-
-
-def git_is_remote_repository(git_command: str, repo: str) -> bool:
-    """Returns true if the given repository is a valid/clonable git repo"""
-    exit_code = call((git_command, "ls-remote", repo, "HEAD"), exit_on_error=False, silent=True)
-    return exit_code == 0
-
-
 def git_branch(git_command: str) -> str:
     # Get current branch name.
     try:
@@ -116,20 +70,6 @@ def git_branch(git_command: str) -> str:
     return branch.strip().decode('utf8')
 
 
-def git_get_config(git_command: str, key: str, file: Optional[str] = None) -> str:
-    if file:
-        return check_output([git_command, "config", "--file", file, "--get", key])
-
-    return check_output([git_command, "config", "--get", key])
-
-
-def git_set_config(git_command: str, key: str, value: str, file: Optional[str] = None) -> str:
-    if file:
-        return check_output([git_command, "config", "--file", file, key, value])
-
-    return check_output([git_command, "config", key, value])
-
-
 def git_tag(git_command: str) -> Optional[str]:
     # Get current tag name.
     try:

build_files/windows/check_submodules.cmd

@@ -0,0 +1,20 @@
+if NOT exist "%BLENDER_DIR%\source\tools\.git" (
+	echo Checking out sub-modules 
+	if not "%GIT%" == "" (
+		"%GIT%" submodule update --init --recursive --progress
+		if errorlevel 1 goto FAIL
+		"%GIT%" submodule foreach git checkout master
+		if errorlevel 1 goto FAIL
+		"%GIT%" submodule foreach git pull --rebase origin master
+		if errorlevel 1 goto FAIL
+		goto EOF
+	) else (
+		echo Blender submodules not found, and git not found in path to retrieve them.
+		goto FAIL
+	)
+)
+goto EOF
+
+:FAIL
+exit /b 1
+:EOF

build_files/windows/format.cmd

@@ -14,7 +14,7 @@ if NOT EXIST %PYTHON% (
     exit /b 1
 )
 
-set FORMAT_PATHS=%BLENDER_DIR%\tools\utils_maintenance\clang_format_paths.py
+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.
 set PATH=%CF_PATH%;%PATH%

build_files/windows/show_hashes.cmd

@@ -4,9 +4,9 @@ if "%GIT%" == "" (
 )
 cd "%BLENDER_DIR%"
 for /f "delims=" %%i in ('"%GIT%" rev-parse HEAD') do echo Branch_hash=%%i
-cd "%BLENDER_DIR%/locale"
+cd "%BLENDER_DIR%/release/datafiles/locale"
 for /f "delims=" %%i in ('"%GIT%" rev-parse HEAD') do echo Locale_hash=%%i
-cd "%BLENDER_DIR%/scripts/addons"
+cd "%BLENDER_DIR%/release/scripts/addons"
 for /f "delims=" %%i in ('"%GIT%" rev-parse HEAD') do echo Addons_Hash=%%i
 cd "%BLENDER_DIR%"
 :EOF

doc/blender_file_format/BlendFileReader.py

@@ -231,7 +231,7 @@ class FileBlockHeader:
             self.SDNAIndex = 0
             self.Count = 0
             self.FileOffset = handle.tell()
-        # self.Code += ' ' * (4 - len(self.Code))
+        #self.Code += ' ' * (4 - len(self.Code))
         log.debug("found blend-file-block-fileheader {0} {1}".format(self.Code, self.FileOffset))
 
     def skip(self, handle):

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.6
+PROJECT_NUMBER         = V3.5
 
 # 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

doc/manpage/blender.1.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-"""
+'''
 This script generates the blender.1 man page, embedding the help text
 from the Blender executable itself. Invoke it as follows:
 
@@ -9,7 +9,7 @@ from the Blender executable itself. Invoke it as follows:
 
 where <path-to-blender> is the path to the Blender executable,
 and <output-filename> is where to write the generated man page.
-"""
+'''
 
 import argparse
 import os
@@ -87,29 +87,29 @@ def man_page_from_blender_help(fh: TextIO, blender_bin: str, verbose: bool) -> N
         (blender_info["date"], blender_info["version"].replace(".", "\\&."))
     )
 
-    fh.write(r"""
+    fh.write(r'''
 .SH NAME
-blender \- a full-featured 3D application""")
+blender \- a full-featured 3D application''')
 
-    fh.write(r"""
+    fh.write(r'''
 .SH SYNOPSIS
-.B blender [args ...] [file] [args ...]""")
+.B blender [args ...] [file] [args ...]''')
 
-    fh.write(r"""
+    fh.write(r'''
 .br
 .SH DESCRIPTION
 .PP
 .B blender
-is a full-featured 3D application. It supports the entirety of the 3D pipeline - """
+is a full-featured 3D application. It supports the entirety of the 3D pipeline - '''
-             """modeling, rigging, animation, simulation, rendering, compositing, motion tracking, and video editing.
+             '''modeling, rigging, animation, simulation, rendering, compositing, motion tracking, and video editing.
 
-Use Blender to create 3D images and animations, films and commercials, content for games, """
+Use Blender to create 3D images and animations, films and commercials, content for games, '''
-             r"""architectural and industrial visualizations, and scientific visualizations.
+             r'''architectural and industrial visualizations, and scientific visualizations.
 
-https://www.blender.org""")
+https://www.blender.org''')
 
-    fh.write(r"""
+    fh.write(r'''
-.SH OPTIONS""")
+.SH OPTIONS''')
 
     fh.write("\n\n")
 
@@ -152,7 +152,7 @@ https://www.blender.org""")
 
     # Footer Content.
 
-    fh.write(r"""
+    fh.write(r'''
 .br
 .SH SEE ALSO
 .B luxrender(1)
@@ -162,7 +162,7 @@ https://www.blender.org""")
 This manpage was written for a Debian GNU/Linux system by Daniel Mester
 <mester@uni-bremen.de> and updated by Cyril Brulebois
 <cyril.brulebois@enst-bretagne.fr> and Dan Eicher <dan@trollwerks.org>.
-""")
+''')
 
 
 def create_argparse() -> argparse.ArgumentParser:

doc/python_api/examples/blf.py

@@ -37,7 +37,7 @@ def draw_callback_px(self, context):
     # BLF drawing routine
     font_id = font_info["font_id"]
     blf.position(font_id, 2, 80, 0)
-    blf.size(font_id, 50)
+    blf.size(font_id, 50, 72)
     blf.draw(font_id, "Hello World")
 
 

doc/python_api/rst/include__bmesh.rst

@@ -31,7 +31,7 @@ For an overview of BMesh data types and how they reference each other see:
 Example Script
 --------------
 
-.. literalinclude:: __/__/__/scripts/templates_py/bmesh_simple.py
+.. literalinclude:: __/__/__/release/scripts/templates_py/bmesh_simple.py
 
 
 Standalone Module

doc/python_api/rst/info_quickstart.rst

@@ -288,7 +288,7 @@ In Python, this is done by defining a class, which is a subclass of an existing
 Example Operator
 ----------------
 
-.. literalinclude:: __/__/__/scripts/templates_py/operator_simple.py
+.. literalinclude:: __/__/__/release/scripts/templates_py/operator_simple.py
 
 Once this script runs, ``SimpleOperator`` is registered with Blender
 and can be called from Operator Search or added to the toolbar.
@@ -320,7 +320,7 @@ Example Panel
 Panels are registered as a class, like an operator.
 Notice the extra ``bl_`` variables used to set the context they display in.
 
-.. literalinclude:: __/__/__/scripts/templates_py/ui_panel_simple.py
+.. literalinclude:: __/__/__/release/scripts/templates_py/ui_panel_simple.py
 
 To run the script:
 

doc/python_api/sphinx_doc_gen.py

@@ -367,13 +367,13 @@ except ImportError:
 # Note that ".." is replaced by "__" in the RST files,
 # to avoid having to match Blender's source tree.
 EXTRA_SOURCE_FILES = (
-    "../../../scripts/templates_py/bmesh_simple.py",
+    "../../../release/scripts/templates_py/bmesh_simple.py",
-    "../../../scripts/templates_py/gizmo_operator.py",
+    "../../../release/scripts/templates_py/gizmo_operator.py",
-    "../../../scripts/templates_py/gizmo_operator_target.py",
+    "../../../release/scripts/templates_py/gizmo_operator_target.py",
-    "../../../scripts/templates_py/gizmo_simple.py",
+    "../../../release/scripts/templates_py/gizmo_simple.py",
-    "../../../scripts/templates_py/operator_simple.py",
+    "../../../release/scripts/templates_py/operator_simple.py",
-    "../../../scripts/templates_py/ui_panel_simple.py",
+    "../../../release/scripts/templates_py/ui_panel_simple.py",
-    "../../../scripts/templates_py/ui_previews_custom_icon.py",
+    "../../../release/scripts/templates_py/ui_previews_custom_icon.py",
     "../examples/bmesh.ops.1.py",
     "../examples/bpy.app.translations.py",
 )
@@ -476,7 +476,7 @@ MODULE_GROUPING = {
 
 # -------------------------------BLENDER----------------------------------------
 
-# Converting bytes to strings, due to #30154.
+# converting bytes to strings, due to T30154
 BLENDER_REVISION = str(bpy.app.build_hash, 'utf_8')
 BLENDER_REVISION_TIMESTAMP = bpy.app.build_commit_timestamp
 
@@ -487,7 +487,7 @@ BLENDER_VERSION_DOTS = "%d.%d" % (bpy.app.version[0], bpy.app.version[1])
 if BLENDER_REVISION != "Unknown":
     # SHA1 Git hash
     BLENDER_VERSION_HASH = BLENDER_REVISION
-    BLENDER_VERSION_HASH_HTML_LINK = "<a href=https://projects.blender.org/blender/blender/commit/%s>%s</a>" % (
+    BLENDER_VERSION_HASH_HTML_LINK = "<a href=https://developer.blender.org/rB%s>%s</a>" % (
         BLENDER_VERSION_HASH, BLENDER_VERSION_HASH,
     )
     BLENDER_VERSION_DATE = time.strftime("%d/%m/%Y", time.localtime(BLENDER_REVISION_TIMESTAMP))
@@ -647,7 +647,7 @@ def undocumented_message(module_name, type_name, identifier):
         module_name, type_name, identifier,
     )
 
-    return "Undocumented, consider `contributing <https://developer.blender.org/>`__."
+    return "Undocumented, consider `contributing <https://developer.blender.org/T51061>`__."
 
 
 def range_str(val):
@@ -1816,9 +1816,9 @@ def pyrna2sphinx(basepath):
 
     # operators
     def write_ops():
-        API_BASEURL = "https://projects.blender.org/blender/blender/src/branch/main/scripts"
+        API_BASEURL = "https://developer.blender.org/diffusion/B/browse/master/release/scripts"
-        API_BASEURL_ADDON = "https://projects.blender.org/blender/blender-addons"
+        API_BASEURL_ADDON = "https://developer.blender.org/diffusion/BA"
-        API_BASEURL_ADDON_CONTRIB = "https://projects.blender.org/blender/blender-addons-contrib"
+        API_BASEURL_ADDON_CONTRIB = "https://developer.blender.org/diffusion/BAC"
 
         op_modules = {}
         op = None
@@ -1853,6 +1853,8 @@ def pyrna2sphinx(basepath):
                 fw("   %s\n\n" % operator_description)
                 for prop in op.args:
                     write_param("   ", fw, prop)
+                if op.args:
+                    fw("\n")
 
                 location = op.get_location()
                 if location != (None, None):
@@ -1863,12 +1865,9 @@ def pyrna2sphinx(basepath):
                     else:
                         url_base = API_BASEURL
 
-                    fw("   :File: `%s\\:%d <%s/%s#L%d>`__\n\n" %
+                    fw("   :file: `%s\\:%d <%s/%s$%d>`_\n\n" %
                        (location[0], location[1], url_base, location[0], location[1]))
 
-                if op.args:
-                    fw("\n")
-
             file.close()
 
     if "bpy.ops" not in EXCLUDE_MODULES:
@@ -2201,7 +2200,7 @@ def write_rst_enum_items(basepath, key, key_no_prefix, enum_items):
     Write a single page for a static enum in RST.
 
     This helps avoiding very large lists being in-lined in many places which is an issue
-    especially with icons in ``bpy.types.UILayout``. See #87008.
+    especially with icons in ``bpy.types.UILayout``. See T87008.
     """
     filepath = os.path.join(basepath, "%s.rst" % key_no_prefix)
     with open(filepath, "w", encoding="utf-8") as fh:

doc/python_api/static/js/version_switch.js

@@ -156,7 +156,7 @@ var Popover = function() {
     },
     getNamed : function(v) {
       $.each(all_versions, function(ix, title) {
-        if (ix === "master" || ix === "main" || ix === "latest") {
+        if (ix === "master" || ix === "latest") {
           var m = title.match(/\d\.\d[\w\d\.]*/)[0];
           if (parseFloat(m) == v) {
             v = ix;

extern/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2006 Blender Foundation
+# Copyright 2006 Blender Foundation. All rights reserved.
 
 # Libs that adhere to strict flags
 add_subdirectory(curve_fit_nd)

extern/audaspace/AUTHORS

@@ -14,13 +14,3 @@ The first three of them were employed by the Blender Foundation during that time
 Some features (random sounds, dynamic music, playback manager, convolution and HRTFs support) were added as part of the VALS (Virtual Alliances for Learning Society) project by
 
 - Juan Francisco Crespo Galán <dethon_5@outlook.com>
-
-The Equalizer sound effect has been added by
-
-- Marcos Perez
-
-Several people provided fixes:
-
-- Aaron Carlisle
-- Sebastian Parborg
-- Leon Zandman

extern/audaspace/CHANGES

@@ -1,104 +1,3 @@
-Audaspace 1.4
-
-- Support for OS specific/native audio devices/backends has been added, that is PulseAudio (Linux), WASAPI (Windows) and CoreAudio (MacOS).
-- New sound effects have been added, namely Modulator and Equalizer. Thanks to Marcos Perez for contributing the Equalizer.
-- File stream info: if an audio file contains multiple streams you can choose which one to process instead of taking the first one (this feature is only supported by ffmpeg, not libsndfile).
-- API Change: double instead of float for time values for more precise timing control.
-- There have been lots of bugfixes, which are basically the majority of all changes.
-- And some other minor improvements were implemented as well.
-
-Detailed list of changes:
-
-d4042d9 Port changes in Blender to upstream.
-b60fb45 Equalizer
-ab04e84 Fixes
-8f0c305 Fix build error with MSVC 17.4+ ported from Blender.
-ce44342 Minor documentation update.
-cdcb3f4 Migrate from distuils to setuptools for python module.
-21eccef Fix FindFFTW to find the float version fftw3f.
-ab15e2f Bugfix: API change in new ffmpeg version.
-a097be8 Clang format file added, valid from now on.
-2fc9fb7 Porting bugfix from Blender upstream.
-bb655b7 Bugfix: wrong sample size computation for PulseAudio.
-a150495 Bugfix: Buffer did not support buffers > 2 GB.
-034645c Update for ffmpeg 5.
-932739c Bugfix: WASAPI hangs.
-4fcd47c WASAPI: fix bug when switching the default device while there is no playback.
-a16fbd2 Python API: fix to get convolution in the python API.
-27ac5c1 WASAPI: always switch to default audio device.
-1b03e6c Bugfix: catch exception if file cannot be read.
-369ff6e PulseAudio: remove unused underflow callback.
-2d8bf3a PulseAudio: improve synchronization accuracy.
-4868e14 Revert PulseAudioDevice back from ThreadedDevice to threaded mainloop.
-6a04446 Adding a jack style mixing thread with a ring buffer for pulseaudio.
-5d4b57b Implement RingBuffer class.
-e02d3aa FFMPEG: fix seeking and duration calculation.
-07b9fa0 Adding file stream functionality.
-5a8ad27 Porting changes from Blender.
-fa47258 Bugfix: PulseAudio writing to little data on request.
-ca3edb5 PulseAudio: increase buffersize.
-6d36f3e Pulseaudio: may fix crackling playback start bug.
-dbeac4b WASAPI: reinitialize device when lost.
-0cba4d3 Bugfix Pulseaudio: might hang.
-b73dc6d Bugfix: ffmpeg 4.4 requires channels to be set.
-f1ecbe0 Fixed typo.
-09e4f27 Rewrite PulseAudioDevice to use ThreadedDevice.
-9516924 WASAPI: refactor to simplify and use ThreadedDevice.
-749c974 Add ThreadedDevice.
-e68b355 Fix some locks in SoftwareDevice.
-44b57af Bugfix for deadlock in WASAPIDevice.
-8c4b266 CMake: fix ERROR to FATAL_ERROR in MESSAGE.
-5a17338 Rename NullDevice's reported name to None.
-cd138d7 PulseAudio: add dynamic loading and threading fixes.
-6e0250f CoreAudio: add CoreAudioClock as synchronizer.
-43aff35 Fix leakage in CoreAudioDevice.cpp
-7f6f059 Remove unnecessary cmake code.
-a5c1a02 Add CoreAudio device for Apple.
-af96f67 Indentation fix.
-eec8fd5 WASAPI: use padding also for first buffer submission.
-c63bd9b WASAPI: deal with IsFormatSupported case.
-079cccb Hide WITH_PULSEAUDIO when not on Linux.
-67b5013 Add mingw64 cross compilation toolchain on Linux.
-a7bfa58 Add WASAPI backend for Windows.
-be1cb25 Allow AUD_init with nullptr to use default device.
-fc68868 Compilation fix for mingw.
-bb79d25 Add a PulseAudio output device.
-a11f593 Bugfix for unwanted volume fading at the beginning of sounds.
-8510acf Bugfix: more accurate positioning of sequences.
-cb816c1 Fix API docs for python playback manager play function
-d125fa2 Add callback for mixing down audio.
-789832e Fix numpy import.
-9a6a802 Bugfix: JOS resampling type bugfix caused integer underflow.
-ece0842 Fix corrupted document in python bindings
-28b2ea2 SDL 2: support more audio formats.
-a39b7e3 Trying to fix Travis CI build for OS X.
-c924007 Some more changes of times from flaot to double.
-659afd4 Porting fixes from blender.
-8e5e2e6 Fix documentation warnings.
-7a6054f API: All times are now double instead of float.
-452a724 Mixer sample buffer added channels twice
-8ddb6c1 Docs: Cleanup Line Wrapping for python examples
-a0c37b2 Docs: Use class methods for api docs
-2f8b2e3 Bugfix for invalid offsets provided by ffmpeg's seeking code.
-20a7a28 Bug fixes for files with more than 8 channels.
-94dc527 Bugfix: Fading from full volume.
-2fb9862 Fix: Missing include in FileManager.h.
-afadb94 Minor CMakeLists.txt formatting fixes.
-734ef03 Add sample rate parameter to silence generation.
-ed50f3b Bugfix: Return correct length for modulator and superpose.
-cb7a314 Adding a modulator sound effect.
-101c714 Bugfix: don't add non-existing devices to the device manager.
-7ad99df OpenAL: recreate device if disconnected.
-a2ff4e8 Bugfix: memory leak in python API.
-5fb21bb Silence some warnings.
-9b38605 Some fixes backported from Blender.
-40a0a34 Udpate for travis.ci.
-212b4b6 Support newer ffmpeg versions.
-d27746c Build option: configure whether to build versioned plugins.
-19c8d9f Make fftw3 optional.
-aa11968 Bugfix for building with gcc7.
-10413c5 Fix for seeking with modified pitch.
-
 Audaspace 1.3
 =============
 
@@ -111,8 +10,6 @@ Audaspace 1.3
  - filter python API parameter check
  - finding ffmpeg with pkgconfig
 
- Detailed list of changes:
-
 64884a7 Windows fixes.
 53ba3e6 Implemented JACK dynamic loading.
 5ee0ee1 Continues last commit.
@@ -149,8 +46,6 @@ Audaspace 1.2
  - assuring numpy is installed
  - building the Python module on Mac OS X with CMake
 
- Detailed list of changes:
-
 a6b6e70 Changing default sample rate from 44.1 to 48 kHz.
 20f0164 Bugfix: CMake custom command for python module on OS X.
 98679a2 Bugfix: using standard library (s)rand.

extern/audaspace/CMakeLists.txt

@@ -23,7 +23,7 @@ endif()
 
 project(audaspace)
 
-set(AUDASPACE_VERSION 1.4)
+set(AUDASPACE_VERSION 1.3)
 set(AUDASPACE_LONG_VERSION ${AUDASPACE_VERSION}.0)
 
 if(DEFINED AUDASPACE_CMAKE_CFG)

extern/audaspace/INSTALL

@@ -15,7 +15,7 @@ Audaspace is written in C++ 11 so a fairly recent compiler (g++ 4.8.2, clang 3.3
 - Jack (output device)
 - libsndfile (file access)
 - ffmpeg (file access)
-- Python (language binding, needs NumPy as well)
+- Python (language binding)
 
 Getting the Code
 ----------------

extern/audaspace/README.md

@@ -32,7 +32,7 @@ The following (probably incomplete) features are supported by audaspace:
 License
 -------
 
-> Copyright © 2009-2023 Jörg Müller. All rights reserved.
+> Copyright © 2009-2015 Jörg Müller. All rights reserved.
 >
 > Licensed under the Apache License, Version 2.0 (the "License");
 > you may not use this file except in compliance with the License.

extern/audaspace/bindings/C/AUD_Sequence.cpp

@@ -165,12 +165,6 @@ AUD_API void AUD_SequenceEntry_move(AUD_SequenceEntry* entry, double begin, doub
 	(*entry)->move(begin, end, skip);
 }
 
-AUD_API void AUD_SequenceEntry_setConstantRangeAnimationData(AUD_SequenceEntry* entry, AUD_AnimateablePropertyType type, int frame_start, int frame_end, float* data)
-{
-	AnimateableProperty* prop = (*entry)->getAnimProperty(static_cast<AnimateablePropertyType>(type));
-	prop->writeConstantRange(data, frame_start, frame_end);
-}
-
 AUD_API void AUD_SequenceEntry_setAnimationData(AUD_SequenceEntry* entry, AUD_AnimateablePropertyType type, int frame, float* data, char animated)
 {
 	AnimateableProperty* prop = (*entry)->getAnimProperty(static_cast<AnimateablePropertyType>(type));

extern/audaspace/bindings/C/AUD_Sequence.h

@@ -68,16 +68,6 @@ extern AUD_API void AUD_Sequence_remove(AUD_Sound* sequence, AUD_SequenceEntry*
  * Writes animation data to a sequence.
  * \param sequence The sound scene.
  * \param type The type of animation data.
- * \param frame_start Start of the frame range.
- * \param frame_end End of the frame range.
- * \param data The data to write.
- */
-AUD_API void AUD_SequenceEntry_setConstantRangeAnimationData(AUD_SequenceEntry* entry, AUD_AnimateablePropertyType type, int frame_start, int frame_end, float* data);
-
-/**
- * Writes animation data to a sequenced entry.
- * \param entry The sequenced entry.
- * \param type The type of animation data.
  * \param frame The frame this data is for.
  * \param data The data to write.
  * \param animated Whether the attribute is animated.

extern/audaspace/include/sequence/AnimateableProperty.h

@@ -112,14 +112,6 @@ public:
 	 */
 	void write(const float* data, int position, int count);
 
-	/**
-	 * Fills the properties frame range with constant value and marks it animated.
-	 * \param data The new value.
-	 * \param position_start The start position in the animation in frames.
-	 * \param position_end The end position in the animation in frames.
-	 */
-	void writeConstantRange(const float* data, int position_start, int position_end);
-
 	/**
 	 * Reads the properties value.
 	 * \param position The position in the animation in frames.

extern/audaspace/include/sequence/SequenceData.h

@@ -198,13 +198,12 @@ public:
 	/**
 	 * Adds a new entry to the scene.
 	 * \param sound The sound this entry should play.
-	 * \param sequence_data Reference to sequence_data. Mainly needed to get the FPS of the scene.
 	 * \param begin The start time.
 	 * \param end The end time or a negative value if determined by the sound.
 	 * \param skip How much seconds should be skipped at the beginning.
 	 * \return The entry added.
 	 */
-	std::shared_ptr<SequenceEntry> add(std::shared_ptr<ISound> sound, std::shared_ptr<SequenceData> sequence_data, double begin, double end, double skip);
+	std::shared_ptr<SequenceEntry> add(std::shared_ptr<ISound> sound, double begin, double end, double skip);
 
 	/**
 	 * Removes an entry from the scene.

extern/audaspace/include/sequence/SequenceEntry.h

@@ -23,7 +23,6 @@
  */
 
 #include "sequence/AnimateableProperty.h"
-#include "sequence/SequenceData.h"
 #include "util/ILockable.h"
 
 #include <mutex>
@@ -64,9 +63,6 @@ private:
 	/// How many seconds are skipped at the beginning.
 	double m_skip;
 
-	/// reference to sequence_data. Mainly needed to get the FPS of the scene.
-	std::shared_ptr<SequenceData> m_sequence_data;
-
 	/// Whether the entry is muted.
 	bool m_muted;
 
@@ -126,10 +122,9 @@ public:
 	 * \param begin The start time.
 	 * \param end The end time or a negative value if determined by the sound.
 	 * \param skip How much seconds should be skipped at the beginning.
-	 * \param sequence_data Reference to sequence_data. Mainly needed to get the FPS of the scene.
 	 * \param id The ID of the entry.
 	 */
-	SequenceEntry(std::shared_ptr<ISound> sound, double begin, double end, double skip, std::shared_ptr<SequenceData> sequence_data, int id);
+	SequenceEntry(std::shared_ptr<ISound> sound, double begin, double end, double skip, int id);
 	virtual ~SequenceEntry();
 
 	/**

extern/audaspace/src/sequence/AnimateableProperty.cpp

@@ -65,19 +65,6 @@ void AnimateableProperty::write(const float* data)
 	std::memcpy(getBuffer(), data, m_count * sizeof(float));
 }
 
-void AnimateableProperty::writeConstantRange(const float* data, int position_start, int position_end)
-{
-	assureSize(position_end * m_count * sizeof(float), true);
-	float* buffer = getBuffer();
-
-	for(int i = position_start; i < position_end; i++)
-	{
-		std::memcpy(buffer + i * m_count, data, m_count * sizeof(float));
-	}
-
-	m_isAnimated = true;
-}
-
 void AnimateableProperty::write(const float* data, int position, int count)
 {
 	std::lock_guard<std::recursive_mutex> lock(m_mutex);

extern/audaspace/src/sequence/Sequence.cpp

@@ -92,7 +92,7 @@ AnimateableProperty* Sequence::getAnimProperty(AnimateablePropertyType type)
 
 std::shared_ptr<SequenceEntry> Sequence::add(std::shared_ptr<ISound> sound, double begin, double end, double skip)
 {
-	return m_sequence->add(sound, m_sequence, begin, end, skip);
+	return m_sequence->add(sound, begin, end, skip);
 }
 
 void Sequence::remove(std::shared_ptr<SequenceEntry> entry)

extern/audaspace/src/sequence/SequenceData.cpp

@@ -149,11 +149,11 @@ AnimateableProperty* SequenceData::getAnimProperty(AnimateablePropertyType type)
 	}
 }
 
-std::shared_ptr<SequenceEntry> SequenceData::add(std::shared_ptr<ISound> sound, std::shared_ptr<SequenceData> sequence_data, double begin, double end, double skip)
+std::shared_ptr<SequenceEntry> SequenceData::add(std::shared_ptr<ISound> sound, double begin, double end, double skip)
 {
 	std::lock_guard<std::recursive_mutex> lock(m_mutex);
 
-	std::shared_ptr<SequenceEntry> entry = std::shared_ptr<SequenceEntry>(new SequenceEntry(sound, begin, end, skip, sequence_data, m_id++));
+	std::shared_ptr<SequenceEntry> entry = std::shared_ptr<SequenceEntry>(new SequenceEntry(sound, begin, end, skip, m_id++));
 
 	m_entries.push_back(entry);
 	m_entry_status++;

extern/audaspace/src/sequence/SequenceEntry.cpp

@@ -22,7 +22,7 @@
 
 AUD_NAMESPACE_BEGIN
 
-SequenceEntry::SequenceEntry(std::shared_ptr<ISound> sound, double begin, double end, double skip, std::shared_ptr<SequenceData> sequence_data, int id) :
+SequenceEntry::SequenceEntry(std::shared_ptr<ISound> sound, double begin, double end, double skip, int id) :
 	m_status(0),
 	m_pos_status(1),
 	m_sound_status(0),
@@ -31,7 +31,6 @@ SequenceEntry::SequenceEntry(std::shared_ptr<ISound> sound, double begin, double
 	m_begin(begin),
 	m_end(end),
 	m_skip(skip),
-	m_sequence_data(sequence_data),
 	m_muted(false),
 	m_relative(true),
 	m_volume_max(1.0f),

extern/audaspace/src/sequence/SequenceHandle.cpp

@@ -241,38 +241,10 @@ bool SequenceHandle::seek(double position)
 		return false;
 
 	std::lock_guard<ILockable> lock(*m_entry);
-
+	double seekpos = position - m_entry->m_begin;
-	double seek_frame = (position - m_entry->m_begin) * m_entry->m_sequence_data->getFPS();
+	if(seekpos < 0)
-
+		seekpos = 0;
-	if(seek_frame < 0)
+	seekpos += m_entry->m_skip;
-		seek_frame = 0;
-
-	seek_frame += m_entry->m_skip * m_entry->m_sequence_data->getFPS();
-
-	AnimateableProperty* pitch_property = m_entry->getAnimProperty(AP_PITCH);
-
-	double target_frame = 0;
-
-	if(pitch_property != nullptr)
-	{
-		int frame_start = (m_entry->m_begin - m_entry->m_skip) * m_entry->m_sequence_data->getFPS();
-
-		for(int i = 0; seek_frame > 0; i++)
-		{
-			float pitch;
-			pitch_property->read(frame_start + i, &pitch);
-			const double factor = seek_frame > 1.0 ? 1.0 : seek_frame;
-			target_frame += pitch * factor;
-			seek_frame--;
-		}
-	}
-	else
-	{
-		target_frame = seek_frame;
-	}
-
-	double seekpos = target_frame / m_entry->m_sequence_data->getFPS();
-
 	m_handle->setPitch(1.0f);
 	m_handle->seek(seekpos);
 

extern/binreloc/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2008 Blender Foundation
+# Copyright 2008 Blender Foundation. All rights reserved.
 
 set(INC
   include

extern/bullet2/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2006 Blender Foundation
+# Copyright 2006 Blender Foundation. All rights reserved.
 
 # avoid noisy warnings
 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")

extern/ceres/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2012 Blender Foundation
+# Copyright 2012 Blender Foundation. All rights reserved.
 
 set(INC
   .

extern/clew/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2006 Blender Foundation
+# Copyright 2006 Blender Foundation. All rights reserved.
 
 set(INC
   .

extern/cuew/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2006 Blender Foundation
+# Copyright 2006 Blender Foundation. All rights reserved.
 
 set(INC
   .

extern/cuew/include/cuew.h

@@ -127,7 +127,7 @@ typedef uint32_t cuuint32_t;
 typedef uint64_t cuuint64_t;
 #endif
 
-#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined (__aarch64__) || defined(__ppc64__) || defined(__PPC64__)
+#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined (__aarch64__)
 typedef unsigned long long CUdeviceptr;
 #else
 typedef unsigned int CUdeviceptr;

extern/draco/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2019 Blender Foundation
+# Copyright 2019 Blender Foundation. All rights reserved.
 
 # Build Draco library.
 add_subdirectory(draco)