Merge remote-tracking branch 'origin/master' into lineart-bvh

This is due to cam->obmat precision issue, where it affects view vector precision.

CMakeLists.txt

@@ -110,10 +110,6 @@ if(POLICY CMP0074)
   cmake_policy(SET CMP0074 NEW)
 endif()
 
-# Install CODE|SCRIPT allow the use of generator expressions.
-if(POLICY CMP0087)
-  cmake_policy(SET CMP0087 NEW)
-endif()
 #-----------------------------------------------------------------------------
 # Load some macros.
 include(build_files/cmake/macros.cmake)
@@ -353,7 +349,7 @@ mark_as_advanced(WITH_SYSTEM_GLOG)
 option(WITH_FREESTYLE     "Enable Freestyle (advanced edges rendering)" ON)
 
 # Misc
-if(WIN32 OR APPLE)
+if(WIN32)
   option(WITH_INPUT_IME "Enable Input Method Editor (IME) for complex Asian character input" ON)
 endif()
 option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
@@ -407,14 +403,14 @@ set(CYCLES_TEST_DEVICES CPU CACHE STRING "Run regression tests on the specified
 set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 sm_86 compute_75 CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
 unset(PLATFORM_DEFAULT)
-option(WITH_CYCLES_LOGGING      "Build Cycles with logging support" ON)
-option(WITH_CYCLES_DEBUG_NAN    "Build Cycles with additional asserts for detecting NaNs and invalid values" OFF)
+option(WITH_CYCLES_LOGGING  "Build Cycles with logging support" ON)
+option(WITH_CYCLES_DEBUG    "Build Cycles with extra debug capabilities" OFF)
 option(WITH_CYCLES_NATIVE_ONLY  "Build Cycles with native kernel only (which fits current CPU, use for development only)" OFF)
 option(WITH_CYCLES_KERNEL_ASAN  "Build Cycles kernels with address sanitizer when WITH_COMPILER_ASAN is on, even if it's very slow" OFF)
 mark_as_advanced(WITH_CYCLES_KERNEL_ASAN)
 mark_as_advanced(WITH_CYCLES_CUBIN_COMPILER)
 mark_as_advanced(WITH_CYCLES_LOGGING)
-mark_as_advanced(WITH_CYCLES_DEBUG_NAN)
+mark_as_advanced(WITH_CYCLES_DEBUG)
 mark_as_advanced(WITH_CYCLES_NATIVE_ONLY)
 
 option(WITH_CYCLES_DEVICE_CUDA              "Enable Cycles CUDA compute support" ON)
@@ -428,10 +424,6 @@ mark_as_advanced(WITH_CYCLES_NETWORK)
 option(WITH_CUDA_DYNLOAD "Dynamically load CUDA libraries at runtime" ON)
 mark_as_advanced(WITH_CUDA_DYNLOAD)
 
-# Draw Manager
-option(WITH_DRAW_DEBUG "Add extra debug capabilities to Draw Manager" OFF)
-mark_as_advanced(WITH_DRAW_DEBUG)
-
 # LLVM
 option(WITH_LLVM                    "Use LLVM" OFF)
 if(APPLE)
@@ -612,6 +604,12 @@ if(WIN32)
   option(WITH_WINDOWS_FIND_MODULES "Use find_package to locate libraries" OFF)
   mark_as_advanced(WITH_WINDOWS_FIND_MODULES)
 
+  option(WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS "Organize the visual studio projects according to source folder structure." ON)
+  mark_as_advanced(WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS)
+
+  option(WINDOWS_USE_VISUAL_STUDIO_SOURCE_FOLDERS "Organize the source files in filters matching the source folders." ON)
+  mark_as_advanced(WINDOWS_USE_VISUAL_STUDIO_SOURCE_FOLDERS)
+
   option(WINDOWS_PYTHON_DEBUG "Include the files needed for debugging python scripts with visual studio 2017+." OFF)
   mark_as_advanced(WINDOWS_PYTHON_DEBUG)
 
@@ -629,18 +627,6 @@ if(WIN32)
 
 endif()
 
-if(WIN32 OR XCODE)
-  option(IDE_GROUP_SOURCES_IN_FOLDERS "Organize the source files in filters matching the source folders." ON)
-  mark_as_advanced(IDE_GROUP_SOURCES_IN_FOLDERS)
-
-  option(IDE_GROUP_PROJECTS_IN_FOLDERS "Organize the projects according to source folder structure." ON)
-  mark_as_advanced(IDE_GROUP_PROJECTS_IN_FOLDERS)
-
-  if (IDE_GROUP_PROJECTS_IN_FOLDERS)
-    set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-  endif()
-endif()
-
 if(UNIX)
   # See WITH_WINDOWS_SCCACHE for Windows.
   option(WITH_COMPILER_CCACHE "Use ccache to improve rebuild times (Works with Ninja, Makefiles and Xcode)" OFF)
@@ -1598,9 +1584,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
   ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter)
 
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
-  # Using C++20 features while having C++17 as the project language isn't allowed by MSVC.
-  ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_CXX20_DESIGNATOR -Wc++20-designator)
-
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_AUTOLOGICAL_COMPARE -Wno-tautological-compare)
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_UNKNOWN_PRAGMAS     -Wno-unknown-pragmas)
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_CHAR_SUBSCRIPTS     -Wno-char-subscripts)
@@ -1722,18 +1705,22 @@ if(WITH_PYTHON)
   endif()
 endif()
 
-# Select C++17 as the standard for C++ projects.
-set(CMAKE_CXX_STANDARD 17)
-# If C++17 is not available, downgrading to an earlier standard is NOT OK.
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-# Do not enable compiler specific language extentions.
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-# Make MSVC properly report the value of the __cplusplus preprocessor macro
-# Available MSVC 15.7 (1914) and up, without this it reports 199711L regardless
-# of the C++ standard chosen above.
-if(MSVC AND MSVC_VERSION GREATER 1913)
-  string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus")
+if(MSVC)
+  string(APPEND CMAKE_CXX_FLAGS " /std:c++17")
+  # Make MSVC properly report the value of the __cplusplus preprocessor macro
+  # Available MSVC 15.7 (1914) and up, without this it reports 199711L regardless
+  # of the C++ standard chosen above
+  if(MSVC_VERSION GREATER 1913)
+    string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus")
+  endif()
+elseif(
+  CMAKE_COMPILER_IS_GNUCC OR
+  CMAKE_C_COMPILER_ID MATCHES "Clang" OR
+  CMAKE_C_COMPILER_ID MATCHES "Intel"
+)
+  string(APPEND CMAKE_CXX_FLAGS " -std=c++17")
+else()
+  message(FATAL_ERROR "Unknown compiler ${CMAKE_C_COMPILER_ID}, can't enable C++17 build")
 endif()
 
 # Visual Studio has all standards it supports available by default
@@ -1928,7 +1915,6 @@ if(FIRST_RUN)
   info_cfg_option(WITH_IK_ITASC)
   info_cfg_option(WITH_IK_SOLVER)
   info_cfg_option(WITH_INPUT_NDOF)
-  info_cfg_option(WITH_INPUT_IME)
   info_cfg_option(WITH_INTERNATIONAL)
   info_cfg_option(WITH_OPENCOLLADA)
   info_cfg_option(WITH_OPENCOLORIO)

GNUmakefile

@@ -63,7 +63,7 @@ Package Targets
 
    * package_debian:    Build a debian package.
    * package_pacman:    Build an arch linux pacman package.
-   * package_archive:   Build an archive package.
+   * package_archive:	Build an archive package.
 
 Testing Targets
    Not associated with building Blender.
@@ -167,7 +167,7 @@ endef
 
 # This makefile is not meant for Windows
 ifeq ($(OS),Windows_NT)
-	$(error On Windows, use "cmd //c make.bat" instead of "make")
+    $(error On Windows, use "cmd //c make.bat" instead of "make")
 endif
 
 # System Vars
@@ -379,7 +379,7 @@ deps: .FORCE
 
 	@cmake -H"$(DEPS_SOURCE_DIR)" \
 	       -B"$(DEPS_BUILD_DIR)" \
-	       -DHARVEST_TARGET=$(DEPS_INSTALL_DIR)
+		   -DHARVEST_TARGET=$(DEPS_INSTALL_DIR)
 
 	@echo
 	@echo Building dependencies ...
@@ -456,8 +456,7 @@ project_eclipse: .FORCE
 check_cppcheck: .FORCE
 	$(CMAKE_CONFIG)
 	cd "$(BUILD_DIR)" ; \
-	$(PYTHON) \
-	    "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py" 2> \
+	$(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py" 2> \
 	    "$(BLENDER_DIR)/check_cppcheck.txt"
 	@echo "written: check_cppcheck.txt"
 
@@ -519,9 +518,8 @@ source_archive: .FORCE
 	python3 ./build_files/utils/make_source_archive.py
 
 source_archive_complete: .FORCE
-	cmake \
-	    -S "$(BLENDER_DIR)/build_files/build_environment" -B"$(BUILD_DIR)/source_archive" \
-	    -DCMAKE_BUILD_TYPE_INIT:STRING=$(BUILD_TYPE) -DPACKAGE_USE_UPSTREAM_SOURCES=OFF
+	cmake -S "$(BLENDER_DIR)/build_files/build_environment" -B"$(BUILD_DIR)/source_archive" \
+		-DCMAKE_BUILD_TYPE_INIT:STRING=$(BUILD_TYPE) -DPACKAGE_USE_UPSTREAM_SOURCES=OFF
 # This assumes CMake is still using a default `PACKAGE_DIR` variable:
 	python3 ./build_files/utils/make_source_archive.py --include-packages "$(BUILD_DIR)/source_archive/packages"
 
@@ -529,11 +527,9 @@ source_archive_complete: .FORCE
 INKSCAPE_BIN?="inkscape"
 icons: .FORCE
 	BLENDER_BIN=$(BLENDER_BIN) INKSCAPE_BIN=$(INKSCAPE_BIN) \
-	    "$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
-	INKSCAPE_BIN=$(INKSCAPE_BIN) \
-	    "$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
-	INKSCAPE_BIN=$(INKSCAPE_BIN) \
-	    "$(BLENDER_DIR)/release/datafiles/alert_icons_update.py"
+		"$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
+	BLENDER_BIN=$(BLENDER_BIN) INKSCAPE_BIN=$(INKSCAPE_BIN) \
+		"$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
 
 icons_geom: .FORCE
 	BLENDER_BIN=$(BLENDER_BIN) \
@@ -547,7 +543,7 @@ update_code: .FORCE
 
 format: .FORCE
 	PATH="../lib/${OS_NCASE}_${CPU}/llvm/bin/:../lib/${OS_NCASE}_centos7_${CPU}/llvm/bin/:../lib/${OS_NCASE}/llvm/bin/:$(PATH)" \
-	    $(PYTHON) source/tools/utils_maintenance/clang_format_paths.py $(PATHS)
+		$(PYTHON) source/tools/utils_maintenance/clang_format_paths.py $(PATHS)
 
 
 # -----------------------------------------------------------------------------
@@ -557,9 +553,8 @@ format: .FORCE
 # Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
 doc_py: .FORCE
 	ASAN_OPTIONS=halt_on_error=0:${ASAN_OPTIONS} \
-	$(BLENDER_BIN) \
-	    --background -noaudio --factory-startup \
-	    --python doc/python_api/sphinx_doc_gen.py
+	$(BLENDER_BIN) --background -noaudio --factory-startup \
+		--python doc/python_api/sphinx_doc_gen.py
 	sphinx-build -b html -j $(NPROCS) doc/python_api/sphinx-in doc/python_api/sphinx-out
 	@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/index.html'"
 
@@ -568,9 +563,8 @@ doc_doxy: .FORCE
 	@echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"
 
 doc_dna: .FORCE
-	$(BLENDER_BIN) \
-	    --background -noaudio --factory-startup \
-	    --python doc/blender_file_format/BlendFileDnaExporter_25.py
+	$(BLENDER_BIN) --background -noaudio --factory-startup \
+		--python doc/blender_file_format/BlendFileDnaExporter_25.py
 	@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
 
 doc_man: .FORCE

build_files/build_environment/CMakeLists.txt

@@ -56,7 +56,6 @@ else()
 endif()
 
 include(cmake/zlib.cmake)
-include(cmake/zstd.cmake)
 include(cmake/openal.cmake)
 include(cmake/png.cmake)
 include(cmake/jpeg.cmake)
@@ -82,11 +81,7 @@ if(UNIX)
 endif()
 include(cmake/openimageio.cmake)
 include(cmake/tiff.cmake)
-if(WIN32)
-  include(cmake/flexbison.cmake)
-elseif(UNIX AND NOT APPLE)
-  include(cmake/flex.cmake)
-endif()
+include(cmake/flexbison.cmake)
 include(cmake/osl.cmake)
 include(cmake/tbb.cmake)
 include(cmake/openvdb.cmake)
@@ -169,7 +164,6 @@ endif()
 if(UNIX AND NOT APPLE)
   include(cmake/libglu.cmake)
   include(cmake/mesa.cmake)
-  include(cmake/wayland_protocols.cmake)
 endif()
 
 include(cmake/harvest.cmake)

build_files/build_environment/cmake/download.cmake

@@ -87,10 +87,7 @@ download_source(LIBGLU)
 download_source(MESA)
 download_source(NASM)
 download_source(XR_OPENXR_SDK)
-download_source(WL_PROTOCOLS)
 download_source(ISPC)
 download_source(GMP)
 download_source(POTRACE)
 download_source(HARU)
-download_source(ZSTD)
-download_source(FLEX)

build_files/build_environment/cmake/ffmpeg.cmake

@@ -30,7 +30,6 @@ if(WIN32)
     --enable-w32threads
     --disable-pthreads
     --enable-libopenjpeg
-    --disable-mediafoundation
   )
   if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
     set(FFMPEG_EXTRA_FLAGS

build_files/build_environment/cmake/flex.cmake

@@ -1,28 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-ExternalProject_Add(external_flex
-  URL file://${PACKAGE_DIR}/${FLEX_FILE}
-  URL_HASH ${FLEX_HASH_TYPE}=${FLEX_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/flex
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flex/src/external_flex/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/flex
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flex/src/external_flex/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flex/src/external_flex/ && make install
-  INSTALL_DIR ${LIBDIR}/flex
-)

build_files/build_environment/cmake/harvest.cmake

@@ -106,7 +106,6 @@ harvest(llvm/include llvm/include "*")
 harvest(llvm/bin llvm/bin "llvm-config")
 harvest(llvm/lib llvm/lib "libLLVM*.a")
 harvest(llvm/lib llvm/lib "libclang*.a")
-harvest(llvm/lib/clang llvm/lib/clang "*.h")
 if(APPLE)
   harvest(openmp/lib openmp/lib "*")
   harvest(openmp/include openmp/include "*.h")
@@ -127,8 +126,6 @@ if(UNIX AND NOT APPLE)
 
   harvest(xml2/include xml2/include "*.h")
   harvest(xml2/lib xml2/lib "*.a")
-
-  harvest(wayland-protocols/share/wayland-protocols wayland-protocols/share/wayland-protocols/ "*.xml")
 else()
   harvest(blosc/lib openvdb/lib "*.a")
   harvest(xml2/lib opencollada/lib "*.a")
@@ -193,8 +190,6 @@ harvest(potrace/include potrace/include "*.h")
 harvest(potrace/lib potrace/lib "*.a")
 harvest(haru/include haru/include "*.h")
 harvest(haru/lib haru/lib "*.a")
-harvest(zstd/include zstd/include "*.h")
-harvest(zstd/lib zstd/lib "*.a")
 
 if(UNIX AND NOT APPLE)
   harvest(libglu/lib mesa/lib "*.so*")

build_files/build_environment/cmake/ispc.cmake

@@ -35,7 +35,6 @@ elseif(APPLE)
   else()
     set(ISPC_EXTRA_ARGS_APPLE
       -DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison
-      -DFLEX_EXECUTABLE=/usr/local/opt/flex/bin/flex
       -DARM_ENABLED=Off
     )
   endif()
@@ -44,7 +43,6 @@ elseif(UNIX)
     -DCMAKE_C_COMPILER=${LIBDIR}/llvm/bin/clang
     -DCMAKE_CXX_COMPILER=${LIBDIR}/llvm/bin/clang++
     -DARM_ENABLED=Off
-    -DFLEX_EXECUTABLE=${LIBDIR}/flex/bin/flex
   )
 endif()
 
@@ -84,9 +82,4 @@ if(WIN32)
     external_ispc
     external_flexbison
   )
-elseif(UNIX AND NOT APPLE)
-  add_dependencies(
-    external_ispc
-    external_flex
-  )
 endif()

build_files/build_environment/cmake/llvm.cmake

@@ -66,11 +66,7 @@ ExternalProject_Add(ll
 
 if(MSVC)
   if(BUILD_MODE STREQUAL Release)
-    set(LLVM_HARVEST_COMMAND
-      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib ${HARVEST_TARGET}/llvm/lib &&
-      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/include ${HARVEST_TARGET}/llvm/include &&
-      ${CMAKE_COMMAND} -E copy ${LIBDIR}/llvm/bin/clang-format.exe ${HARVEST_TARGET}/llvm/bin/clang-format.exe
-    )
+    set(LLVM_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/ ${HARVEST_TARGET}/llvm/ )
   else()
     set(LLVM_HARVEST_COMMAND
       ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib/ ${HARVEST_TARGET}/llvm/debug/lib/ &&

build_files/build_environment/cmake/openimagedenoise.cmake

@@ -45,6 +45,7 @@ ExternalProject_Add(external_openimagedenoise
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OIDN_HASH_TYPE}=${OIDN_HASH}
   PREFIX ${BUILD_DIR}/openimagedenoise
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimagedenoise/src/external_openimagedenoise < ${PATCH_DIR}/oidn.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimagedenoise ${DEFAULT_CMAKE_FLAGS} ${OIDN_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/openimagedenoise
 )

build_files/build_environment/cmake/openmp.cmake

@@ -16,20 +16,15 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-if(APPLE)
-  set(OPENMP_PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openmp/src/external_openmp < ${PATCH_DIR}/openmp.diff)
-else()
-  set(OPENMP_PATCH_COMMAND)
-endif()
 
 ExternalProject_Add(external_openmp
   URL file://${PACKAGE_DIR}/${OPENMP_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OPENMP_HASH_TYPE}=${OPENMP_HASH}
   PREFIX ${BUILD_DIR}/openmp
-  PATCH_COMMAND ${OPENMP_PATCH_COMMAND}
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openmp/src/external_openmp < ${PATCH_DIR}/openmp.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openmp ${DEFAULT_CMAKE_FLAGS}
-  INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id @rpath/libomp.dylib runtime/src/libomp.dylib && make install
+  INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id @executable_path/../Resources/lib/libomp.dylib runtime/src/libomp.dylib && make install
   INSTALL_DIR ${LIBDIR}/openmp
 )
 

build_files/build_environment/cmake/osl.cmake

@@ -20,10 +20,12 @@ if(WIN32)
   set(OSL_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
   set(OSL_FLEX_BISON -DFLEX_EXECUTABLE=${LIBDIR}/flexbison/win_flex.exe -DBISON_EXECUTABLE=${LIBDIR}/flexbison/win_bison.exe)
   set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=sse2)
+  SET(OSL_PLATFORM_FLAGS -DLINKSTATIC=ON)
 else()
   set(OSL_CMAKE_CXX_STANDARD_LIBRARIES)
   set(OSL_FLEX_BISON)
   set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/${LIBPREFIX}png16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
+  SET(OSL_PLATFORM_FLAGS)
 endif()
 
 set(OSL_ILMBASE_CUSTOM_LIBRARIES "${LIBDIR}/openexr/lib/Imath${OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/Half{OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/IlmThread${OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/Iex${OPENEXR_VERSION_POSTFIX}.lib")
@@ -49,13 +51,12 @@ set(OSL_EXTRA_ARGS
   -DOpenImageIO_ROOT=${LIBDIR}/openimageio/
   -DOSL_BUILD_TESTS=OFF
   -DOSL_BUILD_MATERIALX=OFF
-  -DPNG_ROOT=${LIBDIR}/png
   -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
   -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
   ${OSL_FLEX_BISON}
   -DCMAKE_CXX_STANDARD_LIBRARIES=${OSL_CMAKE_CXX_STANDARD_LIBRARIES}
   -DBUILD_SHARED_LIBS=OFF
-  -DLINKSTATIC=ON
+  ${OSL_PLATFORM_FLAGS}
   -DOSL_BUILD_PLUGINS=OFF
   -DSTOP_ON_WARNING=OFF
   -DUSE_LLVM_BITCODE=OFF
@@ -68,9 +69,13 @@ set(OSL_EXTRA_ARGS
   ${OSL_SIMD_FLAGS}
   -Dpugixml_ROOT=${LIBDIR}/pugixml
   -DUSE_PYTHON=OFF
-  -DCMAKE_CXX_STANDARD=14
 )
 
+# Apple arm64 uses LLVM 11, LLVM 10+ requires C++14
+if (APPLE AND "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
+  list(APPEND OSL_EXTRA_ARGS -DCMAKE_CXX_STANDARD=14)
+endif()
+
 ExternalProject_Add(external_osl
   URL file://${PACKAGE_DIR}/${OSL_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
@@ -88,20 +93,10 @@ add_dependencies(
   ll
   external_openexr
   external_zlib
+  external_flexbison
   external_openimageio
   external_pugixml
 )
-if(WIN32)
-  add_dependencies(
-    external_osl
-    external_flexbison
-  )
-elseif(UNIX AND NOT APPLE)
-  add_dependencies(
-    external_osl
-    external_flex
-  )
-endif()
 
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)

build_files/build_environment/cmake/png.cmake

@@ -23,7 +23,7 @@ set(PNG_EXTRA_ARGS
 )
 
 if(BLENDER_PLATFORM_ARM)
-  set(PNG_EXTRA_ARGS ${PNG_EXTRA_ARGS} -DPNG_HARDWARE_OPTIMIZATIONS=ON -DPNG_ARM_NEON=on -DCMAKE_SYSTEM_PROCESSOR="aarch64")
+  set(PNG_EXTRA_ARGS ${PNG_EXTRA_ARGS} -DPNG_HARDWARE_OPTIMIZATIONS=ON -DPNG_ARM_NEON=ON -DCMAKE_SYSTEM_PROCESSOR="aarch64")
 endif()
 
 ExternalProject_Add(external_png

build_files/build_environment/cmake/versions.cmake

@@ -152,28 +152,35 @@ set(OPENCOLORIO_HASH 1a2e3478b6cd9a1549f24e1b2205e3f0)
 set(OPENCOLORIO_HASH_TYPE MD5)
 set(OPENCOLORIO_FILE OpenColorIO-${OPENCOLORIO_VERSION}.tar.gz)
 
-set(LLVM_VERSION 12.0.0)
-set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz)
-set(LLVM_HASH 5a4fab4d7fc84aefffb118ac2c8a4fc0)
-set(LLVM_HASH_TYPE MD5)
-set(LLVM_FILE llvm-project-${LLVM_VERSION}.src.tar.xz)
+if(BLENDER_PLATFORM_ARM)
+  # Newer version required by ISPC with arm support.
+  set(LLVM_VERSION 11.0.1)
+  set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz)
+  set(LLVM_HASH e700af40ab83463e4e9ab0ba3708312e)
+  set(LLVM_HASH_TYPE MD5)
+  set(LLVM_FILE llvm-project-${LLVM_VERSION}.src.tar.xz)
 
-if(APPLE)
-  # Cloth physics test is crashing due to this bug:
-  # https://bugs.llvm.org/show_bug.cgi?id=50579
   set(OPENMP_VERSION 9.0.1)
+  set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${OPENMP_VERSION}/openmp-${OPENMP_VERSION}.src.tar.xz)
   set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf)
+  set(OPENMP_HASH_TYPE MD5)
+  set(OPENMP_FILE openmp-${OPENMP_VERSION}.src.tar.xz)
 else()
-  set(OPENMP_VERSION ${LLVM_VERSION})
-  set(OPENMP_HASH ac48ce3e4582ccb82f81ab59eb3fc9dc)
-endif()
-set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${OPENMP_VERSION}/openmp-${OPENMP_VERSION}.src.tar.xz)
-set(OPENMP_HASH_TYPE MD5)
-set(OPENMP_FILE openmp-${OPENMP_VERSION}.src.tar.xz)
+  set(LLVM_VERSION 9.0.1)
+  set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.tar.xz)
+  set(LLVM_HASH b4268e733dfe352960140dc07ef2efcb)
+  set(LLVM_HASH_TYPE MD5)
+  set(LLVM_FILE llvm-project-${LLVM_VERSION}.tar.xz)
 
-set(OPENIMAGEIO_VERSION 2.2.15.1)
+  set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/openmp-${LLVM_VERSION}.src.tar.xz)
+  set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf)
+  set(OPENMP_HASH_TYPE MD5)
+  set(OPENMP_FILE openmp-${LLVM_VERSION}.src.tar.xz)
+endif()
+
+set(OPENIMAGEIO_VERSION 2.1.15.0)
 set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/Release-${OPENIMAGEIO_VERSION}.tar.gz)
-set(OPENIMAGEIO_HASH 3db5c5f0b3dc91597c75e5df09eb9072)
+set(OPENIMAGEIO_HASH f03aa5e3ac4795af04771ee4146e9832)
 set(OPENIMAGEIO_HASH_TYPE MD5)
 set(OPENIMAGEIO_FILE OpenImageIO-${OPENIMAGEIO_VERSION}.tar.gz)
 
@@ -183,9 +190,9 @@ set(TIFF_HASH 2165e7aba557463acc0664e71a3ed424)
 set(TIFF_HASH_TYPE MD5)
 set(TIFF_FILE tiff-${TIFF_VERSION}.tar.gz)
 
-set(OSL_VERSION 1.11.14.1)
+set(OSL_VERSION 1.11.10.0)
 set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.tar.gz)
-set(OSL_HASH 1abd7ce40481771a9fa937f19595d2f2)
+set(OSL_HASH dfdc23597aeef083832cbada62211756)
 set(OSL_HASH_TYPE MD5)
 set(OSL_FILE OpenShadingLanguage-${OSL_VERSION}.tar.gz)
 
@@ -363,18 +370,12 @@ set(PUGIXML_HASH 0c208b0664c7fb822bf1b49ad035e8fd)
 set(PUGIXML_HASH_TYPE MD5)
 set(PUGIXML_FILE pugixml-${PUGIXML_VERSION}.tar.gz)
 
-set(FLEXBISON_VERSION 2.5.24)
+set(FLEXBISON_VERSION 2.5.5)
 set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison/win_flex_bison-${FLEXBISON_VERSION}.zip)
-set(FLEXBISON_HASH 6b549d43e34ece0e8ed05af92daa31c4)
+set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce)
 set(FLEXBISON_HASH_TYPE MD5)
 set(FLEXBISON_FILE win_flex_bison-${FLEXBISON_VERSION}.zip)
 
-set(FLEX_VERSION 2.6.4)
-set(FLEX_URI https://github.com/westes/flex/releases/download/v${FLEX_VERSION}/flex-${FLEX_VERSION}.tar.gz)
-set(FLEX_HASH 2882e3179748cc9f9c23ec593d6adc8d)
-set(FLEX_HASH_TYPE MD5)
-set(FLEX_FILE flex-${FLEX_VERSION}.tar.gz)
-
 # Libraries to keep Python modules static on Linux.
 
 # NOTE: bzip.org domain does no longer belong to BZip 2 project, so we download
@@ -431,9 +432,9 @@ set(USD_HASH 1dd1e2092d085ed393c1f7c450a4155a)
 set(USD_HASH_TYPE MD5)
 set(USD_FILE usd-v${USD_VERSION}.tar.gz)
 
-set(OIDN_VERSION 1.4.1)
+set(OIDN_VERSION 1.4.0)
 set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.tar.gz)
-set(OIDN_HASH df4007b0ab93b1c41cdf223b075d01c0)
+set(OIDN_HASH 421824019becc5b664a22a2b98332bc5)
 set(OIDN_HASH_TYPE MD5)
 set(OIDN_FILE oidn-${OIDN_VERSION}.src.tar.gz)
 
@@ -443,10 +444,10 @@ set(LIBGLU_HASH 151aef599b8259efe9acd599c96ea2a3)
 set(LIBGLU_HASH_TYPE MD5)
 set(LIBGLU_FILE glu-${LIBGLU_VERSION}.tar.xz)
 
-set(MESA_VERSION 21.1.5)
+set(MESA_VERSION 20.3.4)
 set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa/mesa-${MESA_VERSION}.tar.xz)
-set(MESA_HASH 022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d)
-set(MESA_HASH_TYPE SHA256)
+set(MESA_HASH 556338446aef8ae947a789b3e0b5e056)
+set(MESA_HASH_TYPE MD5)
 set(MESA_FILE mesa-${MESA_VERSION}.tar.xz)
 
 set(NASM_VERSION 2.15.02)
@@ -455,23 +456,25 @@ set(NASM_HASH aded8b796c996a486a56e0515c83e414116decc3b184d88043480b32eb0a8589)
 set(NASM_HASH_TYPE SHA256)
 set(NASM_FILE nasm-${NASM_VERSION}.tar.gz)
 
-set(XR_OPENXR_SDK_VERSION 1.0.17)
+set(XR_OPENXR_SDK_VERSION 1.0.14)
 set(XR_OPENXR_SDK_URI https://github.com/KhronosGroup/OpenXR-SDK/archive/release-${XR_OPENXR_SDK_VERSION}.tar.gz)
-set(XR_OPENXR_SDK_HASH bf0fd8828837edff01047474e90013e1)
+set(XR_OPENXR_SDK_HASH 0df6b2fd6045423451a77ff6bc3e1a75)
 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.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 af5ca07e13517cdbab33504492cef54a)
-set(WL_PROTOCOLS_HASH_TYPE MD5)
-
-set(ISPC_VERSION v1.16.0)
-set(ISPC_URI https://github.com/ispc/ispc/archive/${ISPC_VERSION}.tar.gz)
-set(ISPC_HASH 2e3abedbc0ea9aaec17d6562c632454d)
-set(ISPC_HASH_TYPE MD5)
-set(ISPC_FILE ispc-${ISPC_VERSION}.tar.gz)
+if(BLENDER_PLATFORM_ARM)
+  # Unreleased version with macOS arm support.
+  set(ISPC_URI https://github.com/ispc/ispc/archive/f5949c055eb9eeb93696978a3da4bfb3a6a30b35.zip)
+  set(ISPC_HASH d382fea18d01dbd0cd05d9e1ede36d7d)
+  set(ISPC_HASH_TYPE MD5)
+  set(ISPC_FILE f5949c055eb9eeb93696978a3da4bfb3a6a30b35.zip)
+else()
+  set(ISPC_VERSION v1.14.1)
+  set(ISPC_URI https://github.com/ispc/ispc/archive/${ISPC_VERSION}.tar.gz)
+  set(ISPC_HASH 968fbc8dfd16a60ba4e32d2e0e03ea7a)
+  set(ISPC_HASH_TYPE MD5)
+  set(ISPC_FILE ispc-${ISPC_VERSION}.tar.gz)
+endif()
 
 set(GMP_VERSION 6.2.0)
 set(GMP_URI https://gmplib.org/download/gmp/gmp-${GMP_VERSION}.tar.xz)
@@ -491,11 +494,5 @@ set(HARU_HASH 4f916aa49c3069b3a10850013c507460)
 set(HARU_HASH_TYPE MD5)
 set(HARU_FILE libharu-${HARU_VERSION}.tar.gz)
 
-set(ZSTD_VERSION 1.5.0)
-set(ZSTD_URI https://github.com/facebook/zstd/releases/download/v${ZSTD_VERSION}/zstd-${ZSTD_VERSION}.tar.gz)
-set(ZSTD_HASH 5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94)
-set(ZSTD_HASH_TYPE SHA256)
-set(ZSTD_FILE zstd-${ZSTD_VERSION}.tar.gz)
-
 set(SSE2NEON_GIT https://github.com/DLTcollab/sse2neon.git)
 set(SSE2NEON_GIT_HASH fe5ff00bb8d19b327714a3c290f3e2ce81ba3525)

build_files/build_environment/cmake/wayland_protocols.cmake

@@ -1,27 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-ExternalProject_Add(external_wayland_protocols
-  URL file://${PACKAGE_DIR}/${WL_PROTOCOLS_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${WL_PROTOCOLS_HASH_TYPE}=${WL_PROTOCOLS_HASH}
-  PREFIX ${BUILD_DIR}/wayland-protocols
-  CONFIGURE_COMMAND meson --prefix ${LIBDIR}/wayland-protocols . ../external_wayland_protocols -Dtests=false
-  BUILD_COMMAND ninja
-  INSTALL_COMMAND ninja install
-)

build_files/build_environment/cmake/zstd.cmake

@@ -1,51 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(ZSTD_EXTRA_ARGS
-  -DZSTD_BUILD_PROGRAMS=OFF
-  -DZSTD_BUILD_SHARED=OFF
-  -DZSTD_BUILD_STATIC=ON
-  -DZSTD_BUILD_TESTS=OFF
-  -DZSTD_LEGACY_SUPPORT=OFF
-  -DZSTD_LZ4_SUPPORT=OFF
-  -DZSTD_LZMA_SUPPORT=OFF
-  -DZSTD_MULTITHREAD_SUPPORT=ON
-  -DZSTD_PROGRAMS_LINK_SHARED=OFF
-  -DZSTD_USE_STATIC_RUNTIME=OFF
-  -DZSTD_ZLIB_SUPPORT=OFF
-)
-
-ExternalProject_Add(external_zstd
-  URL file://${PACKAGE_DIR}/${ZSTD_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${ZSTD_HASH_TYPE}=${ZSTD_HASH}
-  PREFIX ${BUILD_DIR}/zstd
-  SOURCE_SUBDIR build/cmake
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zstd ${DEFAULT_CMAKE_FLAGS} ${ZSTD_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/zstd
-)
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_zstd after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zstd/lib/zstd_static${LIBEXT} ${HARVEST_TARGET}/zstd/lib/zstd_static${LIBEXT}
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zstd/include/ ${HARVEST_TARGET}/zstd/include/
-      DEPENDEES install
-    )
-  endif()
-endif()

build_files/build_environment/install_deps.sh

@@ -474,25 +474,25 @@ OPENEXR_FORCE_REBUILD=false
 OPENEXR_SKIP=false
 _with_built_openexr=false
 
-OIIO_VERSION="2.2.15.1"
-OIIO_VERSION_SHORT="2.2"
+OIIO_VERSION="2.1.15.0"
+OIIO_VERSION_SHORT="2.1"
 OIIO_VERSION_MIN="2.1.12"
-OIIO_VERSION_MAX="2.3.0"
+OIIO_VERSION_MAX="2.2.10"
 OIIO_FORCE_BUILD=false
 OIIO_FORCE_REBUILD=false
 OIIO_SKIP=false
 
-LLVM_VERSION="12.0.0"
-LLVM_VERSION_SHORT="12.0"
-LLVM_VERSION_MIN="11.0"
-LLVM_VERSION_MAX="13.0"
+LLVM_VERSION="9.0.1"
+LLVM_VERSION_SHORT="9.0"
+LLVM_VERSION_MIN="6.0"
+LLVM_VERSION_MAX="12.0"
 LLVM_VERSION_FOUND=""
 LLVM_FORCE_BUILD=false
 LLVM_FORCE_REBUILD=false
 LLVM_SKIP=false
 
 # OSL needs to be compiled for now!
-OSL_VERSION="1.11.14.1"
+OSL_VERSION="1.11.10.0"
 OSL_VERSION_SHORT="1.11"
 OSL_VERSION_MIN="1.11"
 OSL_VERSION_MAX="2.0"
@@ -553,7 +553,7 @@ EMBREE_FORCE_BUILD=false
 EMBREE_FORCE_REBUILD=false
 EMBREE_SKIP=false
 
-OIDN_VERSION="1.4.1"
+OIDN_VERSION="1.4.0"
 OIDN_VERSION_SHORT="1.4"
 OIDN_VERSION_MIN="1.4.0"
 OIDN_VERSION_MAX="1.5"
@@ -561,7 +561,7 @@ OIDN_FORCE_BUILD=false
 OIDN_FORCE_REBUILD=false
 OIDN_SKIP=false
 
-ISPC_VERSION="1.16.0"
+ISPC_VERSION="1.14.1"
 
 FFMPEG_VERSION="4.4"
 FFMPEG_VERSION_SHORT="4.4"
@@ -572,7 +572,7 @@ FFMPEG_FORCE_REBUILD=false
 FFMPEG_SKIP=false
 _ffmpeg_list_sep=";"
 
-XR_OPENXR_VERSION="1.0.17"
+XR_OPENXR_VERSION="1.0.14"
 XR_OPENXR_VERSION_SHORT="1.0"
 XR_OPENXR_VERSION_MIN="1.0.8"
 XR_OPENXR_VERSION_MAX="2.0"
@@ -1019,7 +1019,7 @@ PRINT ""
 PYTHON_SOURCE=( "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tgz" )
 
 _boost_version_nodots=`echo "$BOOST_VERSION" | sed -r 's/\./_/g'`
-BOOST_SOURCE=( "https://boostorg.jfrog.io/artifactory/main/release/$BOOST_VERSION/source/boost_$_boost_version_nodots.tar.bz2" )
+BOOST_SOURCE=( "https://dl.bintray.com/boostorg/release/$BOOST_VERSION/source/boost_$_boost_version_nodots.tar.bz2" )
 BOOST_BUILD_MODULES="--with-system --with-filesystem --with-thread --with-regex --with-locale --with-date_time --with-wave --with-iostreams --with-python --with-program_options --with-serialization --with-atomic"
 
 TBB_SOURCE=( "https://github.com/oneapi-src/oneTBB/archive/$TBB_VERSION$TBB_VERSION_UPDATE.tar.gz" )
@@ -1108,9 +1108,9 @@ FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" )
 
 XR_OPENXR_USE_REPO=false
 XR_OPENXR_SOURCE=("https://github.com/KhronosGroup/OpenXR-SDK/archive/release-${XR_OPENXR_VERSION}.tar.gz")
-XR_OPENXR_SOURCE_REPO=("https://github.com/KhronosGroup/OpenXR-SDK.git")
-XR_OPENXR_REPO_UID="bf21ccb1007bb531b45d9978919a56ea5059c245"
-XR_OPENXR_REPO_BRANCH="master"
+#~ XR_OPENXR_SOURCE_REPO=("https://github.com/KhronosGroup/OpenXR-SDK.git")
+#~ XR_OPENXR_REPO_UID="5900c51562769b03bea699dc0352cae56acb6419d"
+#~ XR_OPENXR_REPO_BRANCH="master"
 
 # C++11 is required now
 CXXFLAGS_BACK=$CXXFLAGS
@@ -1128,8 +1128,7 @@ Those libraries should be available as packages in all recent distributions (opt
     * Basics of dev environment (cmake, gcc, svn , git, ...).
     * libjpeg, libpng, libtiff, [openjpeg2], [libopenal].
     * libx11, libxcursor, libxi, libxrandr, libxinerama (and other libx... as needed).
-    * libwayland-client0, libwayland-cursor0, libwayland-egl1, libxkbcommon0, libdbus-1-3, libegl1 (Wayland)
-    * libsqlite3, libzstd, libbz2, libssl, libfftw3, libxml2, libtinyxml, yasm, libyaml-cpp, flex.
+    * libsqlite3, libbz2, libssl, libfftw3, libxml2, libtinyxml, yasm, libyaml-cpp.
     * libsdl2, libglew, libpugixml, libpotrace, [libgmp], [libglewmx], fontconfig, [libharu/libhpdf].\""
 
 DEPS_SPECIFIC_INFO="\"BUILDABLE DEPENDENCIES:
@@ -1447,7 +1446,9 @@ compile_Python() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "Python--$PYTHON_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -1463,9 +1464,6 @@ compile_Python() {
     INFO "If you want to force rebuild of this lib, use the --force-python option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "python-$PYTHON_VERSION_SHORT"
 
   # Extra step: install required modules with pip.
@@ -1559,7 +1557,9 @@ compile_Boost() {
          --prefix=$_inst --disable-icu boost.locale.icu=off install
     ./b2 --clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "Boost-$BOOST_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -1573,9 +1573,7 @@ compile_Boost() {
     INFO "If you want to force rebuild of this lib, use the --force-boost option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
+  # Just always run it, much simpler this way!
   run_ldconfig "boost"
 }
 
@@ -1688,7 +1686,9 @@ compile_TBB() {
 
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "TBB-$TBB_VERSION$TBB_VERSION_UPDATE failed to compile, exiting"
       exit 1
     fi
@@ -1702,9 +1702,6 @@ compile_TBB() {
     INFO "If you want to force rebuild of this lib, use the --force-tbb option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "tbb"
 }
 
@@ -1824,7 +1821,9 @@ compile_OCIO() {
 
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenColorIO-$OCIO_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -1838,9 +1837,6 @@ compile_OCIO() {
     INFO "If you want to force rebuild of this lib, use the --force-ocio option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "ocio"
 }
 
@@ -1956,7 +1952,9 @@ compile_OPENEXR() {
 
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenEXR-$OPENEXR_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -1972,9 +1970,7 @@ compile_OPENEXR() {
 
   _with_built_openexr=true
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
+  # Just always run it, much simpler this way!
   run_ldconfig "openexr"
 }
 
@@ -2115,7 +2111,9 @@ compile_OIIO() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenImageIO-$OIIO_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2129,9 +2127,7 @@ compile_OIIO() {
     INFO "If you want to force rebuild of this lib, use the --force-oiio option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
+  # Just always run it, much simpler this way!
   run_ldconfig "oiio"
 }
 
@@ -2240,7 +2236,9 @@ compile_LLVM() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "LLVM-$LLVM_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2253,10 +2251,6 @@ compile_LLVM() {
     INFO "Own LLVM-$LLVM_VERSION (CLANG included) is up to date, nothing to do!"
     INFO "If you want to force rebuild of this lib, use the --force-llvm option."
   fi
-
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
 }
 
 # ----------------------------------------------------------------------------
@@ -2321,7 +2315,6 @@ compile_OSL() {
         tar -C $SRC --transform "s,(.*/?)OpenShadingLanguage-[^/]*(.*),\1OpenShadingLanguage-$OSL_VERSION\2,x" \
             -xf $_src.tar.gz
       fi
-      patch -d $_src -p1 < $SCRIPT_DIR/patches/osl.diff
     fi
 
     cd $_src
@@ -2344,6 +2337,7 @@ compile_OSL() {
 
     cmake_d="-D CMAKE_BUILD_TYPE=Release"
     cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
+    cmake_d="$cmake_d -D BUILD_TESTING=OFF"
     cmake_d="$cmake_d -D STOP_ON_WARNING=OFF"
     cmake_d="$cmake_d -D OSL_BUILD_PLUGINS=OFF"
     cmake_d="$cmake_d -D OSL_BUILD_TESTS=OFF"
@@ -2351,10 +2345,7 @@ compile_OSL() {
     cmake_d="$cmake_d -D USE_PARTIO=OFF"
     cmake_d="$cmake_d -D OSL_BUILD_MATERIALX=OFF"
     cmake_d="$cmake_d -D USE_QT=OFF"
-    cmake_d="$cmake_d -D USE_Qt5=OFF"
     cmake_d="$cmake_d -D USE_PYTHON=OFF"
-    cmake_d="$cmake_d -D USE_PARTIO=OFF"
-    cmake_d="$cmake_d -D INSTALL_DOCS=OFF"
 
     if [ $(uname -m) != "aarch64" ]; then
       cmake_d="$cmake_d -D USE_SIMD=sse2"
@@ -2376,7 +2367,10 @@ compile_OSL() {
     fi
 
     if [ -d $INST/oiio ]; then
-      cmake_d="$cmake_d -D OpenImageIO_ROOT=$INST/oiio"
+      cmake_d="$cmake_d -D OPENIMAGEIO_ROOT_DIR=$INST/oiio"
+      # HACK! SIC!!!!
+      # Quiet incredible, but if root dir is given, path to lib is found, but not path to include...
+      cmake_d="$cmake_d -D OPENIMAGEIO_INCLUDE_DIR=$INST/oiio/include"
     fi
 
     if [ ! -z $LLVM_VERSION_FOUND ]; then
@@ -2395,7 +2389,9 @@ compile_OSL() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenShadingLanguage-$OSL_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2409,9 +2405,6 @@ compile_OSL() {
     INFO "If you want to force rebuild of this lib, use the --force-osl option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "osl"
 }
 
@@ -2512,7 +2505,9 @@ compile_OSD() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenSubdiv-$OSD_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2526,9 +2521,6 @@ compile_OSD() {
     INFO "If you want to force rebuild of this lib, use the --force-osd option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "osd"
 }
 
@@ -2618,7 +2610,9 @@ compile_BLOSC() {
 
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "Blosc-$OPENVDB_BLOSC_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2631,9 +2625,6 @@ compile_BLOSC() {
 
   magic_compile_set blosc-$OPENVDB_BLOSC_VERSION $blosc_magic
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "blosc"
 }
 
@@ -2724,7 +2715,9 @@ install_NanoVDB() {
     #~ mkdir -p $_inst
     #~ cp -r $_src/include $_inst/include
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "NanoVDB-v$OPENVDB_VERSION failed to install, exiting"
       exit 1
     fi
@@ -2736,10 +2729,6 @@ install_NanoVDB() {
   else
     INFO "Own NanoVDB-v$OPENVDB_VERSION is up to date, nothing to do!"
   fi
-
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
 }
 
 
@@ -2748,7 +2737,7 @@ _init_openvdb() {
   _git=false
   _inst=$INST/openvdb-$OPENVDB_VERSION_SHORT
   _inst_shortcut=$INST/openvdb
-
+  
   _openvdb_source=$OPENVDB_SOURCE
   if [ "$WITH_NANOVDB" = true ]; then
     _openvdb_source=$NANOVDB_SOURCE
@@ -2853,13 +2842,15 @@ compile_OPENVDB() {
     if [ -d $INST/blosc ]; then
       cmake_d="$cmake_d -D Blosc_ROOT=$INST/blosc"
     fi
-
+  
     cmake $cmake_d ..
 
     make -j$THREADS install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenVDB-$OPENVDB_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2873,9 +2864,6 @@ compile_OPENVDB() {
     INFO "If you want to force rebuild of this lib, use the --force-openvdb option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "openvdb"
 
   if [ "$WITH_NANOVDB" = true ]; then
@@ -2973,7 +2961,9 @@ compile_ALEMBIC() {
     make -j$THREADS install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "Alembic-$ALEMBIC_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2987,9 +2977,6 @@ compile_ALEMBIC() {
     INFO "If you want to force rebuild of this lib, use the --force-alembic option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "alembic"
 }
 
@@ -3074,7 +3061,9 @@ compile_USD() {
     make -j$THREADS install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "USD-$USD_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -3088,9 +3077,6 @@ compile_USD() {
     INFO "If you want to force rebuild of this lib, use the --force-usd option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "usd"
 }
 
@@ -3184,7 +3170,9 @@ compile_OpenCOLLADA() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenCOLLADA-$OPENCOLLADA_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -3197,10 +3185,6 @@ compile_OpenCOLLADA() {
     INFO "Own OpenCOLLADA-$OPENCOLLADA_VERSION is up to date, nothing to do!"
     INFO "If you want to force rebuild of this lib, use the --force-opencollada option."
   fi
-
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
 }
 
 # ----------------------------------------------------------------------------
@@ -3301,7 +3285,9 @@ compile_Embree() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "Embree-$EMBREE_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -3314,10 +3300,6 @@ compile_Embree() {
     INFO "Own Embree-$EMBREE_VERSION is up to date, nothing to do!"
     INFO "If you want to force rebuild of this lib, use the --force-embree option."
   fi
-
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
 }
 
 # ----------------------------------------------------------------------------
@@ -3380,7 +3362,9 @@ install_ISPC() {
     mkdir -p $_inst
     cp -r $_src/bin $_inst/bin
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "ISPC-v$ISPC_VERSION failed to install, exiting"
       exit 1
     fi
@@ -3393,10 +3377,6 @@ install_ISPC() {
     INFO "Own ISPC-v$ISPC_VERSION is up to date, nothing to do!"
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
-
   _ispc_path_bin=$_inst/bin
   run_ldconfig "ispc"
 }
@@ -3496,7 +3476,9 @@ compile_OIDN() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenImageDenoise-$OIDN_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -3510,9 +3492,6 @@ compile_OIDN() {
     INFO "If you want to force rebuild of this lib, use the --force-oidn option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "oidn"
 }
 
@@ -3629,7 +3608,9 @@ compile_FFmpeg() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "FFmpeg-$FFMPEG_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -3642,10 +3623,6 @@ compile_FFmpeg() {
     INFO "Own ffmpeg-$FFMPEG_VERSION is up to date, nothing to do!"
     INFO "If you want to force rebuild of this lib, use the --force-ffmpeg option."
   fi
-
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
 }
 
 # ----------------------------------------------------------------------------
@@ -3744,7 +3721,9 @@ compile_XR_OpenXR_SDK() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "XR-OpenXR-SDK-$XR_OPENXR_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -3758,9 +3737,6 @@ compile_XR_OpenXR_SDK() {
     INFO "If you want to force rebuild of this lib, use the --force-xr-openxr option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "xr-openxr-sdk"
 }
 
@@ -3863,11 +3839,10 @@ install_DEB() {
   _packages="gawk cmake cmake-curses-gui build-essential libjpeg-dev libpng-dev libtiff-dev \
              git libfreetype6-dev libfontconfig-dev libx11-dev flex bison libxxf86vm-dev \
              libxcursor-dev libxi-dev wget libsqlite3-dev libxrandr-dev libxinerama-dev \
-             libwayland-dev wayland-protocols libegl-dev libxkbcommon-dev libdbus-1-dev linux-libc-dev \
              libbz2-dev libncurses5-dev libssl-dev liblzma-dev libreadline-dev \
              libopenal-dev libglew-dev yasm $THEORA_DEV $VORBIS_DEV $OGG_DEV \
              libsdl2-dev libfftw3-dev patch bzip2 libxml2-dev libtinyxml-dev libjemalloc-dev \
-             libgmp-dev libpugixml-dev libpotrace-dev libhpdf-dev libzstd-dev"
+             libgmp-dev libpugixml-dev libpotrace-dev libhpdf-dev"
              # libglewmx-dev  (broken in deb testing currently...)
 
   VORBIS_USE=true
@@ -4135,8 +4110,6 @@ install_DEB() {
 
 
   PRINT ""
-  # Debian OIIO includes again libopencv, without even properly dealing with this dependency...
-  OIIO_FORCE_BUILD=true
   if [ "$OIIO_SKIP" = true ]; then
     WARNING "Skipping OpenImageIO installation, as requested..."
   elif [ "$OIIO_FORCE_BUILD" = true ]; then
@@ -4535,11 +4508,10 @@ install_RPM() {
   _packages="gcc gcc-c++ git make cmake tar bzip2 xz findutils flex bison fontconfig-devel \
              libtiff-devel libjpeg-devel libpng-devel sqlite-devel fftw-devel SDL2-devel \
              libX11-devel libXi-devel libXcursor-devel libXrandr-devel libXinerama-devel \
-             wayland-devel wayland-protocols-devel mesa-libEGL-devel libxkbcommon-devel dbus-devel kernel-headers \
              wget ncurses-devel readline-devel $OPENJPEG_DEV openal-soft-devel \
              glew-devel yasm $THEORA_DEV $VORBIS_DEV $OGG_DEV patch \
              libxml2-devel yaml-cpp-devel tinyxml-devel jemalloc-devel \
-             gmp-devel pugixml-devel potrace-devel libharu-devel libzstd-devel"
+             gmp-devel pugixml-devel potrace-devel libharu-devel"
 
   OPENJPEG_USE=true
   VORBIS_USE=true
@@ -5117,11 +5089,10 @@ install_ARCH() {
     BASE_DEVEL=`pacman -Sgq base-devel | sed -e 's/^gcc$/gcc-multilib/g' | paste -s -d' '`
   fi
 
-  _packages="$BASE_DEVEL git cmake fontconfig flex \
+  _packages="$BASE_DEVEL git cmake fontconfig \
              libxi libxcursor libxrandr libxinerama glew libpng libtiff wget openal \
              $OPENJPEG_DEV $VORBIS_DEV $OGG_DEV $THEORA_DEV yasm sdl2 fftw \
-             libxml2 yaml-cpp tinyxml python-requests jemalloc gmp potrace pugixml libharu \
-             zstd"
+             libxml2 yaml-cpp tinyxml python-requests jemalloc gmp potrace pugixml libharu"
 
   OPENJPEG_USE=true
   VORBIS_USE=true

build_files/build_environment/patches/ffmpeg.diff

@@ -68,32 +68,3 @@
 +
      return ret;
  }
---- a/libavcodec/rl.c
-+++ b/libavcodec/rl.c
-@@ -71,7 +71,7 @@ av_cold void ff_rl_init(RLTable *rl,
- av_cold void ff_rl_init_vlc(RLTable *rl, unsigned static_size)
- {
-     int i, q;
--    VLC_TYPE table[1500][2] = {{0}};
-+    VLC_TYPE (*table)[2] = av_calloc(sizeof(VLC_TYPE), 1500 * 2);
-     VLC vlc = { .table = table, .table_allocated = static_size };
-     av_assert0(static_size <= FF_ARRAY_ELEMS(table));
-     init_vlc(&vlc, 9, rl->n + 1, &rl->table_vlc[0][1], 4, 2, &rl->table_vlc[0][0], 4, 2, INIT_VLC_USE_NEW_STATIC);
-@@ -80,8 +80,10 @@ av_cold void ff_rl_init_vlc(RLTable *rl, unsigned static_size)
-         int qmul = q * 2;
-         int qadd = (q - 1) | 1;
- 
--        if (!rl->rl_vlc[q])
-+        if (!rl->rl_vlc[q]){
-+            av_free(table);
-             return;
-+        }
- 
-         if (q == 0) {
-             qmul = 1;
-@@ -113,4 +115,5 @@ av_cold void ff_rl_init_vlc(RLTable *rl, unsigned static_size)
-             rl->rl_vlc[q][i].run   = run;
-         }
-     }
-+    av_free(table);
- }

build_files/build_environment/patches/oidn.diff

@@ -0,0 +1,10 @@
+--- external_openimagedenoise/cmake/oidn_ispc.cmake	2021-02-15 17:29:34.000000000 +0100
++++ external_openimagedenoise/cmake/oidn_ispc.cmake2	2021-02-15 17:29:28.000000000 +0100
+@@ -98,7 +98,7 @@
+   elseif(OIDN_ARCH STREQUAL "ARM64")
+     set(ISPC_ARCHITECTURE "aarch64")
+     if(APPLE)
+-      set(ISPC_TARGET_OS "--target-os=ios")
++      set(ISPC_TARGET_OS "--target-os=macos")
+     endif()
+   endif()

build_files/build_environment/patches/openimageio.diff

@@ -34,3 +34,24 @@ diff -Naur orig/src/include/OpenImageIO/platform.h external_openimageio/src/incl
  #    include <windows.h>
  #endif
  
+diff -Naur orig/src/libutil/ustring.cpp external_openimageio/src/libutil/ustring.cpp
+--- orig/src/libutil/ustring.cpp	2020-05-11 05:43:52.000000000 +0200
++++ external_openimageio/src/libutil/ustring.cpp	2020-11-26 12:06:08.000000000 +0100
+@@ -337,6 +337,8 @@
+     // the std::string to make it point to our chars!  In such a case, the
+     // destructor will be careful not to allow a deallocation.
+ 
++    // Disable internal std::string for Apple silicon based Macs
++#if !(defined(__APPLE__) && defined(__arm64__))
+ #if defined(__GNUC__) && !defined(_LIBCPP_VERSION)                             \
+     && defined(_GLIBCXX_USE_CXX11_ABI) && _GLIBCXX_USE_CXX11_ABI
+     // NEW gcc ABI
+@@ -382,7 +384,7 @@
+         return;
+     }
+ #endif
+-
++#endif
+     // Remaining cases - just assign the internal string.  This may result
+     // in double allocation for the chars.  If you care about that, do
+     // something special for your platform, much like we did for gcc and

build_files/build_environment/patches/osl.diff

@@ -1,3 +1,18 @@
+diff -Naur OpenShadingLanguage-Release-1.9.9/src/cmake/flexbison.cmake.rej external_osl/src/cmake/flexbison.cmake.rej
+--- OpenShadingLanguage-Release-1.9.9/src/cmake/flexbison.cmake.rej	1969-12-31 17:00:00 -0700
++++ external_osl/src/cmake/flexbison.cmake.rej	2018-08-24 17:42:11 -0600
+@@ -0,0 +1,11 @@
++--- src/cmake/flexbison.cmake	2018-05-01 16:39:02 -0600
+++++ src/cmake/flexbison.cmake	2018-08-24 10:24:03 -0600
++@@ -77,7 +77,7 @@
++           DEPENDS ${${compiler_headers}}
++           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
++         ADD_CUSTOM_COMMAND ( OUTPUT ${flexoutputcxx} 
++-          COMMAND ${FLEX_EXECUTABLE} -o ${flexoutputcxx} "${CMAKE_CURRENT_SOURCE_DIR}/${flexsrc}"
+++          COMMAND ${FLEX_EXECUTABLE} ${FLEX_EXTRA_OPTIONS} -o ${flexoutputcxx} "${CMAKE_CURRENT_SOURCE_DIR}/${flexsrc}"
++           MAIN_DEPENDENCY ${flexsrc}
++           DEPENDS ${${compiler_headers}}
++           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
 diff -Naur OpenShadingLanguage-Release-1.9.9/src/include/OSL/llvm_util.h external_osl/src/include/OSL/llvm_util.h
 --- OpenShadingLanguage-Release-1.9.9/src/include/OSL/llvm_util.h	2018-05-01 16:39:02 -0600
 +++ external_osl/src/include/OSL/llvm_util.h	2018-08-25 14:05:00 -0600
@@ -48,50 +63,19 @@ diff -Naur org/CMakeLists.txt external_osl/CMakeLists.txt
 
  set (OSL_NO_DEFAULT_TEXTURESYSTEM OFF CACHE BOOL "Do not use create a raw OIIO::TextureSystem")
  if (OSL_NO_DEFAULT_TEXTURESYSTEM)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 990f50d69..46ef7351d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -252,11 +252,9 @@ install (EXPORT OSL_EXPORTED_TARGETS
-         FILE ${OSL_TARGETS_EXPORT_NAME}
-         NAMESPACE ${PROJECT_NAME}::)
- 
--
--
--
--osl_add_all_tests()
--
-+if (${PROJECT_NAME}_BUILD_TESTS AND NOT ${PROJECT_NAME}_IS_SUBPROJECT)
-+	osl_add_all_tests()
-+endif ()
- 
- if (NOT ${PROJECT_NAME}_IS_SUBPROJECT)
-     include (packaging)
-diff -Naur external_osl_orig/src/cmake/externalpackages.cmake external_osl/src/cmake/externalpackages.cmake
---- external_osl_orig/src/cmake/externalpackages.cmake  2021-06-01 13:44:18 -0600
-+++ external_osl/src/cmake/externalpackages.cmake       2021-06-28 07:44:32 -0600
-@@ -80,6 +80,7 @@
-
-
- checked_find_package (ZLIB REQUIRED)  # Needed by several packages
-+checked_find_package (PNG REQUIRED)  # Needed since OIIO needs it
-
- # IlmBase & OpenEXR
- checked_find_package (OpenEXR REQUIRED
-diff -Naur external_osl_orig/src/liboslcomp/oslcomp.cpp external_osl/src/liboslcomp/oslcomp.cpp
---- external_osl_orig/src/liboslcomp/oslcomp.cpp        2021-06-01 13:44:18 -0600
-+++ external_osl/src/liboslcomp/oslcomp.cpp     2021-06-28 09:11:06 -0600
-@@ -21,6 +21,13 @@
- #if !defined(__STDC_CONSTANT_MACROS)
- #    define __STDC_CONSTANT_MACROS 1
+diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
+index 445f6400..3d468de2 100644
+--- a/src/liboslexec/llvm_util.cpp
++++ b/src/liboslexec/llvm_util.cpp
+@@ -3430,8 +3430,9 @@ LLVM_Util::call_function (llvm::Value *func, cspan<llvm::Value *> args)
+ #endif
+     //llvm_gen_debug_printf (std::string("start ") + std::string(name));
+ #if OSL_LLVM_VERSION >= 110
+-    OSL_DASSERT(llvm::isa<llvm::Function>(func));
+-    llvm::Value *r = builder().CreateCall(llvm::cast<llvm::Function>(func), llvm::ArrayRef<llvm::Value *>(args.data(), args.size()));
++    llvm::Value* r = builder().CreateCall(
++        llvm::cast<llvm::FunctionType>(func->getType()->getPointerElementType()), func,
++        llvm::ArrayRef<llvm::Value*>(args.data(), args.size()));
+ #else
+     llvm::Value *r = builder().CreateCall (func, llvm::ArrayRef<llvm::Value *>(args.data(), args.size()));
  #endif
-+
-+// clang uses CALLBACK in its templates which causes issues if it is already defined
-+#ifdef _WIN32 && defined(CALLBACK)
-+#    undef CALLBACK
-+#endif
-+
-+//
- #include <clang/Basic/TargetInfo.h>
- #include <clang/Frontend/CompilerInstance.h>
- #include <clang/Frontend/TextDiagnosticPrinter.h>

build_files/cmake/Modules/FindZstd.cmake

@@ -1,66 +0,0 @@
-# - Find Zstd library
-# Find the native Zstd includes and library
-# This module defines
-#  ZSTD_INCLUDE_DIRS, where to find zstd.h, Set when
-#                     ZSTD_INCLUDE_DIR is found.
-#  ZSTD_LIBRARIES, libraries to link against to use Zstd.
-#  ZSTD_ROOT_DIR, The base directory to search for Zstd.
-#                 This can also be an environment variable.
-#  ZSTD_FOUND, If false, do not try to use Zstd.
-#
-# also defined, but not for general use are
-#  ZSTD_LIBRARY, where to find the Zstd library.
-
-#=============================================================================
-# Copyright 2019 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If ZSTD_ROOT_DIR was defined in the environment, use it.
-IF(NOT ZSTD_ROOT_DIR AND NOT $ENV{ZSTD_ROOT_DIR} STREQUAL "")
-  SET(ZSTD_ROOT_DIR $ENV{ZSTD_ROOT_DIR})
-ENDIF()
-
-SET(_zstd_SEARCH_DIRS
-  ${ZSTD_ROOT_DIR}
-)
-
-FIND_PATH(ZSTD_INCLUDE_DIR
-  NAMES
-    zstd.h
-  HINTS
-    ${_zstd_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(ZSTD_LIBRARY
-  NAMES
-    zstd
-  HINTS
-    ${_zstd_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# handle the QUIETLY and REQUIRED arguments and set ZSTD_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Zstd DEFAULT_MSG
-    ZSTD_LIBRARY ZSTD_INCLUDE_DIR)
-
-IF(ZSTD_FOUND)
-  SET(ZSTD_LIBRARIES ${ZSTD_LIBRARY})
-  SET(ZSTD_INCLUDE_DIRS ${ZSTD_INCLUDE_DIR})
-ENDIF()
-
-MARK_AS_ADVANCED(
-  ZSTD_INCLUDE_DIR
-  ZSTD_LIBRARY
-)

build_files/cmake/cmake_consistency_check_config.py

@@ -8,9 +8,6 @@ IGNORE_SOURCE = (
     # specific source files
     "extern/audaspace/",
 
-    # Use for `WIN32` only.
-    "source/creator/blender_launcher_win32.c",
-
     # specific source files
     "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp",
     "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp",

build_files/cmake/cmake_netbeans_project.py

@@ -82,7 +82,7 @@ def create_nb_project_main():
         make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM")
         make_exe_basename = os.path.basename(make_exe)
 
-        # --------------- NetBeans specific.
+        # --------------- NB specific
         defines = [("%s=%s" % cdef) if cdef[1] else cdef[0] for cdef in defines]
         defines += [cdef.replace("#define", "").strip() for cdef in cmake_compiler_defines()]
 

build_files/cmake/config/blender_developer.cmake

@@ -7,6 +7,7 @@
 set(WITH_ASSERT_ABORT                 ON  CACHE BOOL "" FORCE)
 set(WITH_BUILDINFO                    OFF CACHE BOOL "" FORCE)
 set(WITH_COMPILER_ASAN                ON  CACHE BOOL "" FORCE)
+set(WITH_CYCLES_DEBUG                 ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_NATIVE_ONLY           ON  CACHE BOOL "" FORCE)
 set(WITH_DOC_MANPAGE                  OFF CACHE BOOL "" FORCE)
 set(WITH_GTESTS                       ON  CACHE BOOL "" FORCE)

build_files/cmake/config/blender_full.cmake

@@ -29,7 +29,6 @@ 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_INPUT_NDOF          ON  CACHE BOOL "" FORCE)
-set(WITH_INPUT_IME           ON  CACHE BOOL "" FORCE)
 set(WITH_INTERNATIONAL       ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)

build_files/cmake/config/blender_release.cmake

@@ -30,7 +30,6 @@ 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_INPUT_NDOF          ON  CACHE BOOL "" FORCE)
-set(WITH_INPUT_IME           ON  CACHE BOOL "" FORCE)
 set(WITH_INTERNATIONAL       ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)

build_files/cmake/macros.cmake

@@ -208,7 +208,7 @@ function(blender_source_group
   )
 
   # if enabled, use the sources directories as filters.
-  if(IDE_GROUP_SOURCES_IN_FOLDERS)
+  if(WINDOWS_USE_VISUAL_STUDIO_SOURCE_FOLDERS)
     foreach(_SRC ${sources})
       # remove ../'s
       get_filename_component(_SRC_DIR ${_SRC} REALPATH)
@@ -240,8 +240,8 @@ function(blender_source_group
     endforeach()
   endif()
 
-  # if enabled, set the FOLDER property for the projects
-  if(IDE_GROUP_PROJECTS_IN_FOLDERS)
+  # if enabled, set the FOLDER property for visual studio projects
+  if(WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS)
     get_filename_component(FolderDir ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
     string(REPLACE ${CMAKE_SOURCE_DIR} "" FolderDir ${FolderDir})
     set_target_properties(${name} PROPERTIES FOLDER ${FolderDir})

build_files/cmake/platform/platform_apple.cmake

@@ -404,16 +404,32 @@ endif()
 
 # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.
 if(WITH_OPENMP)
-  if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+  if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "7.0")
     # Use OpenMP from our precompiled libraries.
     message(STATUS "Using ${LIBDIR}/openmp for OpenMP")
     set(OPENMP_CUSTOM ON)
     set(OPENMP_FOUND ON)
     set(OpenMP_C_FLAGS "-Xclang -fopenmp -I'${LIBDIR}/openmp/include'")
     set(OpenMP_CXX_FLAGS "-Xclang -fopenmp -I'${LIBDIR}/openmp/include'")
-    set(OpenMP_LIBRARY_DIR "${LIBDIR}/openmp/lib/")
-    set(OpenMP_LINKER_FLAGS "-L'${OpenMP_LIBRARY_DIR}' -lomp")
-    set(OpenMP_LIBRARY "${OpenMP_LIBRARY_DIR}/libomp.dylib")
+    set(OpenMP_LINKER_FLAGS "-L'${LIBDIR}/openmp/lib' -lomp")
+
+    # Copy libomp.dylib to allow executables like datatoc and tests to work.
+    # `@executable_path/../Resources/lib/` `LC_ID_DYLIB` is added by the deps builder.
+    # For single config generator datatoc, tests etc.
+    execute_process(
+      COMMAND mkdir -p ${CMAKE_BINARY_DIR}/Resources/lib
+      COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libomp.dylib
+    )
+    # For multi-config generator datatoc, etc.
+    execute_process(
+      COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/Resources/lib
+      COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/bin/Resources/lib/libomp.dylib
+    )
+    # For multi-config generator tests.
+    execute_process(
+      COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/tests/Resources/lib
+      COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/bin/tests/Resources/lib/libomp.dylib
+    )
   endif()
 endif()
 
@@ -441,9 +457,6 @@ if(WITH_HARU)
   endif()
 endif()
 
-set(ZSTD_ROOT_DIR ${LIBDIR}/zstd)
-find_package(Zstd REQUIRED)
-
 if(EXISTS ${LIBDIR})
   without_system_libs_end()
 endif()
@@ -467,8 +480,10 @@ else()
   set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic")
 endif()
 
-# Clang has too low template depth of 128 for libmv.
-string(APPEND CMAKE_CXX_FLAGS " -ftemplate-depth=1024")
+if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
+  # Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv
+  string(APPEND CMAKE_CXX_FLAGS " -ftemplate-depth=1024")
+endif()
 
 # Avoid conflicts with Luxrender, and other plug-ins that may use the same
 # libraries as Blender with a different version or build options.
@@ -498,15 +513,3 @@ if(WITH_COMPILER_CCACHE)
     endif()
   endif()
 endif()
-
-# For binaries that are built but not installed (also not distributed) (datatoc,
-# makesdna, tests, etc.), we add an rpath to the OpenMP library dir through
-# CMAKE_BUILD_RPATH. This avoids having to make many copies of the dylib next to each binary.
-#
-# For the installed Python module and installed Blender executable, CMAKE_INSTALL_RPATH
-# is modified to find the dylib in an adjacent folder. Install step puts the libraries there.
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
-list(APPEND CMAKE_BUILD_RPATH "${OpenMP_LIBRARY_DIR}")
-
-set(CMAKE_SKIP_INSTALL_RPATH FALSE)
-list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../Resources/${BLENDER_VERSION}/lib")

build_files/cmake/platform/platform_unix.cmake

@@ -99,7 +99,6 @@ endif()
 find_package_wrapper(JPEG REQUIRED)
 find_package_wrapper(PNG REQUIRED)
 find_package_wrapper(ZLIB REQUIRED)
-find_package_wrapper(Zstd REQUIRED)
 find_package_wrapper(Freetype REQUIRED)
 
 if(WITH_PYTHON)

build_files/cmake/platform/platform_win32.cmake

@@ -57,6 +57,8 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang")
   endif()
 endif()
 
+set_property(GLOBAL PROPERTY USE_FOLDERS ${WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS})
+
 if(NOT WITH_PYTHON_MODULE)
   set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT blender)
 endif()
@@ -151,8 +153,8 @@ if(MSVC_CLANG) # Clangs version of cl doesn't support all flags
   string(APPEND CMAKE_CXX_FLAGS " ${CXX_WARN_FLAGS} /nologo /J /Gd /EHsc -Wno-unused-command-line-argument -Wno-microsoft-enum-forward-reference ")
   set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /nologo /J /Gd -Wno-unused-command-line-argument -Wno-microsoft-enum-forward-reference")
 else()
-  string(APPEND CMAKE_CXX_FLAGS " /nologo /J /Gd /MP /EHsc /bigobj /Zc:inline")
-  set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /nologo /J /Gd /MP /bigobj /Zc:inline")
+  string(APPEND CMAKE_CXX_FLAGS " /nologo /J /Gd /MP /EHsc /bigobj")
+  set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /nologo /J /Gd /MP /bigobj")
 endif()
 
 # X64 ASAN is available and usable on MSVC 16.9 preview 4 and up)
@@ -215,8 +217,8 @@ else()
 endif()
 
 if(WITH_WINDOWS_PDB)
-  set(PDB_INFO_OVERRIDE_FLAGS "${SYMBOL_FORMAT_RELEASE}")
-  set(PDB_INFO_OVERRIDE_LINKER_FLAGS "/DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO")
+	set(PDB_INFO_OVERRIDE_FLAGS "${SYMBOL_FORMAT_RELEASE}")
+	set(PDB_INFO_OVERRIDE_LINKER_FLAGS "/DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO")
 endif()
 
 string(APPEND CMAKE_CXX_FLAGS_DEBUG " /MDd ${SYMBOL_FORMAT}")
@@ -259,7 +261,7 @@ if(NOT DEFINED LIBDIR)
   else()
     message(FATAL_ERROR "32 bit compiler detected, blender no longer provides pre-build libraries for 32 bit windows, please set the LIBDIR cmake variable to your own library folder")
   endif()
-  if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.30.30423)
+  if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.29.30130)
     message(STATUS "Visual Studio 2022 detected.")
     set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc15)
   elseif(MSVC_VERSION GREATER 1919)
@@ -873,6 +875,3 @@ if(WITH_HARU)
     set(WITH_HARU OFF)
   endif()
 endif()
-
-set(ZSTD_INCLUDE_DIRS ${LIBDIR}/zstd/include)
-set(ZSTD_LIBRARIES ${LIBDIR}/zstd/lib/zstd_static.lib)

build_files/config/README.md

@@ -1,10 +1,8 @@
 Pipeline Config
 ===============
 
-The `yaml` configuration file is used by buildbot build pipeline `update-code` step.
+This configuration file is used by buildbot new pipeline for the `update-code` step.
 
-The file allows to set branches or specific commits for both git submodules and svn artifacts. Can also define various build package versions for use by build workers. Especially useful in experimental and release branches. 
+It will soon be used by the ../utils/make_update.py script.
 
-NOTE:
-* The configuration file is ```NOT``` used by the `../utils/make_update.py` script.
-* That will implemented in the future.
+Both buildbot and developers will eventually use the same configuration file.

build_files/config/pipeline_config.json

@@ -0,0 +1,87 @@
+{
+    "update-code":
+    {
+        "git" :
+        {
+            "submodules":
+            [
+                { "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", "branch": "master", "commit_id": "HEAD" }
+            ]
+        },
+        "svn":
+        {
+            "tests": { "path": "lib/tests", "branch": "trunk", "commit_id": "HEAD" },
+            "libraries":
+            {
+                "darwin-x86_64": { "path": "lib/darwin", "branch": "trunk", "commit_id": "HEAD" },
+                "darwin-arm64": { "path": "lib/darwin_arm64", "branch": "trunk", "commit_id": "HEAD" },
+                "linux-x86_64": { "path": "lib/linux_centos7_x86_64", "branch": "trunk", "commit_id": "HEAD" },
+                "windows-amd64": { "path": "lib/win64_vc15", "branch": "trunk", "commit_id": "HEAD" }
+            }
+        }
+    },
+    "buildbot":
+    {
+        "gcc":
+        {
+            "version": "9.0"
+        },
+        "sdks":
+        {
+            "optix":
+            {
+                "version": "7.1.0"
+            },
+            "cuda10":
+            {
+                "version": "10.1"
+            },
+            "cuda11":
+            {
+                "version": "11.3"
+            }
+        },
+        "cmake":
+        {
+            "default":
+            {
+                "version": "any",
+                "overrides":
+                {
+
+                }
+            },
+            "darwin-x86_64":
+            {
+                "overrides":
+                {
+
+                }
+            },
+            "darwin-arm64":
+            {
+                "overrides":
+                {
+
+                }
+            },
+            "linux-x86_64":
+            {
+                "overrides":
+                {
+
+                }
+            },
+            "windows-amd64":
+            {
+                "overrides":
+                {
+
+                }
+            }
+        }
+    }
+}

build_files/config/pipeline_config.yaml

@@ -1,70 +0,0 @@
-#
-# 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_centos7_x86_64
-            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
-
-#
-# Buildbot only configs
-#
-buildbot:
-    gcc:
-        version: '9.0.0'
-    cuda10:
-        version: '10.1.243'
-    cuda11:
-        version: '11.4.1'
-    optix:
-        version: '7.1.0'
-    cmake:
-        default:
-            version: any
-            overrides: {}
-        darwin-arm64:
-            overrides: {}
-        darwin-x86_64:
-            overrides: {}
-        linux-x86_64:
-            overrides: {}
-        windows-amd64:
-            overrides: {}

build_files/utils/make_update.py

@@ -31,7 +31,6 @@ def parse_arguments():
     parser.add_argument("--no-submodules", action="store_true")
     parser.add_argument("--use-tests", action="store_true")
     parser.add_argument("--svn-command", default="svn")
-    parser.add_argument("--svn-branch", default=None)
     parser.add_argument("--git-command", default="git")
     parser.add_argument("--use-centos-libraries", action="store_true")
     return parser.parse_args()
@@ -47,7 +46,7 @@ def svn_update(args, release_version):
     svn_non_interactive = [args.svn_command, '--non-interactive']
 
     lib_dirpath = os.path.join(get_blender_git_root(), '..', 'lib')
-    svn_url = make_utils.svn_libraries_base_url(release_version, args.svn_branch)
+    svn_url = make_utils.svn_libraries_base_url(release_version)
 
     # Checkout precompiled libraries
     if sys.platform == 'darwin':
@@ -171,28 +170,26 @@ def submodules_update(args, release_version, branch):
         sys.stderr.write("git not found, can't update code\n")
         sys.exit(1)
 
-    # Update submodules to appropriate given branch,
-    # falling back to master if none is given and/or found in a sub-repository.
-    branch_fallback = "master"
-    if not branch:
-        branch = branch_fallback
+    # Update submodules to latest master or appropriate release branch.
+    if not release_version:
+        branch = "master"
 
     submodules = [
-        ("release/scripts/addons", branch, branch_fallback),
-        ("release/scripts/addons_contrib", branch, branch_fallback),
-        ("release/datafiles/locale", branch, branch_fallback),
-        ("source/tools", branch, branch_fallback),
+        ("release/scripts/addons", branch),
+        ("release/scripts/addons_contrib", branch),
+        ("release/datafiles/locale", branch),
+        ("source/tools", branch),
     ]
 
     # Initialize submodules only if needed.
-    for submodule_path, submodule_branch, submodule_branch_fallback in submodules:
+    for submodule_path, submodule_branch in submodules:
         if not os.path.exists(os.path.join(submodule_path, ".git")):
             call([args.git_command, "submodule", "update", "--init", "--recursive"])
             break
 
     # Checkout appropriate branch and pull changes.
     skip_msg = ""
-    for submodule_path, submodule_branch, submodule_branch_fallback in submodules:
+    for submodule_path, submodule_branch in submodules:
         cwd = os.getcwd()
         try:
             os.chdir(submodule_path)
@@ -204,11 +201,6 @@ def submodules_update(args, release_version, branch):
                     call([args.git_command, "fetch", "origin"])
                     call([args.git_command, "checkout", submodule_branch])
                 call([args.git_command, "pull", "--rebase", "origin", submodule_branch])
-                # If we cannot find the specified branch for this submodule, fallback to default one (aka master).
-                if make_utils.git_branch(args.git_command) != submodule_branch:
-                    call([args.git_command, "fetch", "origin"])
-                    call([args.git_command, "checkout", submodule_branch_fallback])
-                    call([args.git_command, "pull", "--rebase", "origin", submodule_branch_fallback])
         finally:
             os.chdir(cwd)
 

build_files/utils/make_utils.py

@@ -70,11 +70,9 @@ def git_branch_release_version(branch, tag):
     return release_version
 
 
-def svn_libraries_base_url(release_version, branch):
+def svn_libraries_base_url(release_version):
     if release_version:
         svn_branch = "tags/blender-" + release_version + "-release"
-    elif branch:
-        svn_branch = "branches/" + branch
     else:
         svn_branch = "trunk"
     return "https://svn.blender.org/svnroot/bf-blender/" + svn_branch + "/lib/"

build_files/windows/autodetect_msvc.cmd

@@ -1,9 +1,9 @@
 echo No explicit msvc version requested, autodetecting version.
 
-call "%~dp0\detect_msvc2019.cmd"
+call "%~dp0\detect_msvc2017.cmd"
 if %ERRORLEVEL% EQU 0 goto DetectionComplete
 
-call "%~dp0\detect_msvc2017.cmd"
+call "%~dp0\detect_msvc2019.cmd"
 if %ERRORLEVEL% EQU 0 goto DetectionComplete
 
 call "%~dp0\detect_msvc2022.cmd"

build_files/windows/doc_py.cmd

@@ -1,34 +0,0 @@
-set SOURCEDIR=%BLENDER_DIR%/doc/python_api/sphinx-in
-set BUILDDIR=%BLENDER_DIR%/doc/python_api/sphinx-out
-if "%BF_LANG%" == "" set BF_LANG=en
-set SPHINXOPTS=-j auto -D language=%BF_LANG%
-
-call "%~dp0\find_sphinx.cmd"
-
-if EXIST "%SPHINX_BIN%" (
-    goto detect_sphinx_done
-)
-
-echo unable to locate sphinx-build, run "set sphinx_BIN=full_path_to_sphinx-build.exe"
-exit /b 1
-
-:detect_sphinx_done
-
-call "%~dp0\find_blender.cmd"
-
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-echo unable to locate blender, run "set BLENDER_BIN=full_path_to_blender.exe"
-exit /b 1
-
-:detect_blender_done
-
-%BLENDER_BIN% ^
-	--background -noaudio --factory-startup ^
-	--python %BLENDER_DIR%/doc/python_api/sphinx_doc_gen.py
-
-"%SPHINX_BIN%" -b html %SPHINXOPTS% %O% %SOURCEDIR% %BUILDDIR%
-
-:EOF

build_files/windows/find_blender.cmd

@@ -1,28 +0,0 @@
-REM First see if there is an environment variable set
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-REM Check the build folder next, if ninja was used there will be no
-REM debug/release folder
-set BLENDER_BIN=%BUILD_DIR%\bin\blender.exe
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-REM Check the release folder next
-set BLENDER_BIN=%BUILD_DIR%\bin\release\blender.exe
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-REM Check the debug folder next
-set BLENDER_BIN=%BUILD_DIR%\bin\debug\blender.exe
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-REM at this point, we don't know where blender is, clear the variable
-set BLENDER_BIN=
-
-:detect_blender_done

build_files/windows/find_inkscape.cmd

@@ -1,21 +0,0 @@
-REM First see if there is an environment variable set
-if EXIST "%INKSCAPE_BIN%" (
-    goto detect_inkscape_done
-)
-
-REM Then see if inkscape is available in the path
-for %%X in (inkscape.exe) do (set INKSCAPE_BIN=%%~$PATH:X)
-if EXIST "%INKSCAPE_BIN%" (
-    goto detect_inkscape_done
-)
-
-REM Finally see if it is perhaps installed at the default location
-set INKSCAPE_BIN=%ProgramFiles%\Inkscape\bin\inkscape.exe
-if EXIST "%INKSCAPE_BIN%" (
-    goto detect_inkscape_done
-)
-
-REM If still not found clear the variable
-set INKSCAPE_BIN=
-
-:detect_inkscape_done

build_files/windows/find_sphinx.cmd

@@ -1,23 +0,0 @@
-REM First see if there is an environment variable set
-if EXIST "%SPHINX_BIN%" (
-    goto detect_sphinx_done
-)
-
-REM Then see if inkscape is available in the path
-for %%X in (sphinx-build.exe) do (set SPHINX_BIN=%%~$PATH:X)
-if EXIST "%SPHINX_BIN%" (
-    goto detect_sphinx_done
-)
-
-echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
-echo.installed, then set the SPHINX_BIN environment variable to point
-echo.to the full path of the 'sphinx-build' executable. Alternatively you
-echo.may add the Sphinx directory to PATH.
-echo.
-echo.If you don't have Sphinx installed, grab it from
-echo.http://sphinx-doc.org/
-
-REM If still not found clear the variable
-set SPHINX_BIN=
-
-:detect_sphinx_done

build_files/windows/icons.cmd

@@ -1,42 +0,0 @@
-if EXIST "%PYTHON%" (
-    goto detect_python_done
-)
-
-set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\39\bin\python.exe
-if EXIST %PYTHON% (
-    goto detect_python_done
-)
-
-echo python not found at %PYTHON%
-exit /b 1
-
-:detect_python_done
-echo found python (%PYTHON%)
-
-call "%~dp0\find_inkscape.cmd"
-
-if EXIST "%INKSCAPE_BIN%" (
-    goto detect_inkscape_done
-)
-
-echo unable to locate inkscape, run "set inkscape_BIN=full_path_to_inkscape.exe"
-exit /b 1
-
-:detect_inkscape_done
-
-call "%~dp0\find_blender.cmd"
-
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-echo unable to locate blender, run "set BLENDER_BIN=full_path_to_blender.exe"
-exit /b 1
-
-:detect_blender_done
-
-%PYTHON% -B %BLENDER_DIR%\release\datafiles\blender_icons_update.py
-%PYTHON% -B %BLENDER_DIR%\release\datafiles\prvicons_update.py
-%PYTHON% -B %BLENDER_DIR%\release\datafiles\alert_icons_update.py
-
-:EOF

build_files/windows/icons_geom.cmd

@@ -1,29 +0,0 @@
-if EXIST %PYTHON% (
-    goto detect_python_done
-)
-
-set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\39\bin\python.exe
-if EXIST %PYTHON% (
-    goto detect_python_done
-)
-
-echo python not found at %PYTHON%
-exit /b 1
-
-:detect_python_done
-echo found python (%PYTHON%)
-
-call "%~dp0\find_blender.cmd"
-
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-echo unable to locate blender, run "set BLENDER_BIN=full_path_to_blender.exe"
-exit /b 1
-
-:detect_blender_done
-
-%PYTHON% -B %BLENDER_DIR%\release\datafiles\blender_icons_geom_update.py 
-
-:EOF

build_files/windows/parse_arguments.cmd

@@ -107,15 +107,6 @@ if NOT "%1" == "" (
 		set FORMAT=1
 		set FORMAT_ARGS=%2 %3 %4 %5 %6 %7 %8 %9
 		goto EOF
-	) else if "%1" == "icons" (
-		set ICONS=1
-		goto EOF
-	) else if "%1" == "icons_geom" (
-		set ICONS_GEOM=1
-		goto EOF
-	) else if "%1" == "doc_py" (
-		set DOC_PY=1
-		goto EOF
 	) else (
 		echo Command "%1" unknown, aborting!
 		goto ERR

build_files/windows/reset_variables.cmd

@@ -31,6 +31,3 @@ set PYDEBUG_CMAKE_ARGS=
 set FORMAT=
 set TEST=
 set BUILD_WITH_SCCACHE=
-set ICONS=
-set ICONS_GEOM=
-set DOC_PY=

build_files/windows/show_help.cmd

@@ -31,10 +31,6 @@ echo - 2019 ^(build with visual studio 2019^)
 echo - 2019pre ^(build with visual studio 2019 pre-release^)
 echo - 2019b ^(build with visual studio 2019 Build Tools^)
 
-echo.
-echo Documentation Targets ^(Not associated with building^)
-echo - doc_py ^(Generate sphinx python api docs^)
-
 echo.
 echo Experimental options
 echo - with_opengl_tests ^(enable both the render and draw opengl test suites^)

doc/blender_file_format/BlendFileReader.py

@@ -123,7 +123,7 @@ def Align(handle):
 class BlendFile:
     '''
     Reads a blendfile and store the header, all the fileblocks, and catalogue
-    structs found in the DNA fileblock
+    structs foound in the DNA fileblock
 
     - BlendFile.Header  (BlendFileHeader instance)
     - BlendFile.Blocks  (list of BlendFileBlock instances)

doc/manpage/blender.1.py

@@ -122,7 +122,7 @@ 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.
 
 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 visualizatons, and scientific visualizations.
 
 https://www.blender.org''')
 

doc/python_api/examples/bpy.app.handlers.2.py

@@ -12,7 +12,6 @@ such cases, lock the interface (Render → Lock Interface or
 Below is an example of a mesh that is altered from a handler:
 """
 
-
 def frame_change_pre(scene):
     # A triangle that shifts in the z direction
     zshift = scene.frame_current * 0.1

doc/python_api/examples/bpy.app.timers.5.py

@@ -16,12 +16,10 @@ execution_queue = queue.Queue()
 def run_in_main_thread(function):
     execution_queue.put(function)
 
-
 def execute_queued_functions():
     while not execution_queue.empty():
         function = execution_queue.get()
         function()
     return 1.0
 
-
 bpy.app.timers.register(execute_queued_functions)

doc/python_api/examples/bpy.msgbus.1.py

@@ -31,13 +31,11 @@ owner = object()
 
 subscribe_to = bpy.context.object.location
 
-
 def msgbus_callback(*args):
     # This will print:
     # Something changed! (1, 2, 3)
     print("Something changed!", args)
 
-
 bpy.msgbus.subscribe_rna(
     key=subscribe_to,
     owner=owner,

doc/python_api/examples/bpy.types.Depsgraph.7.py

@@ -44,7 +44,7 @@ class OBJECT_OT_object_to_curve(bpy.types.Operator):
         # Remove temporary curve.
         obj.to_curve_clear()
         # Invoke to_curve() with applying modifiers.
-        curve_with_modifiers = obj.to_curve(depsgraph, apply_modifiers=True)
+        curve_with_modifiers = obj.to_curve(depsgraph, apply_modifiers = True)
         self.report({'INFO'}, f"{len(curve_with_modifiers.splines)} splines in new curve with modifiers.")
         # Remove temporary curve.
         obj.to_curve_clear()

doc/python_api/examples/gpu.6.py

@@ -21,7 +21,6 @@ batch = batch_for_shader(
     },
 )
 
-
 def draw():
     shader.bind()
     shader.uniform_sampler("image", texture)

doc/python_api/examples/gpu.9.py

@@ -31,8 +31,7 @@ def draw():
         context.space_data,
         context.region,
         view_matrix,
-        projection_matrix,
-        True)
+        projection_matrix)
 
     gpu.state.depth_mask_set(False)
     draw_texture_2d(offscreen.texture_color, (10, 10), WIDTH, HEIGHT)

doc/python_api/requirements.txt

@@ -1,13 +1,13 @@
-sphinx==4.1.1
+sphinx==3.5.4
 
 # Sphinx dependencies that are important
-Jinja2==3.0.1
-Pygments==2.10.0
-docutils==0.17.1
+Jinja2==2.11.3
+Pygments==2.9.0
+docutils==0.16
 snowballstemmer==2.1.0
 babel==2.9.1
-requests==2.26.0
+requests==2.25.1
 
 # Only needed to match the theme used for the official documentation.
 # Without this theme, the default theme will be used.
-sphinx_rtd_theme==1.0.0rc1
+sphinx_rtd_theme==0.5.2

doc/python_api/sphinx_doc_gen.py

@@ -254,8 +254,6 @@ else:
         "gpu.shader",
         "gpu.state",
         "gpu.texture",
-        "gpu.platform",
-        "gpu.capabilities",
         "gpu_extras",
         "idprop.types",
         "mathutils",
@@ -1039,21 +1037,16 @@ context_type_map = {
     # context_member: (RNA type, is_collection)
     "active_annotation_layer": ("GPencilLayer", False),
     "active_bone": ("EditBone", False),
-    "active_file": ("FileSelectEntry", False),
     "active_gpencil_frame": ("GreasePencilLayer", True),
     "active_gpencil_layer": ("GPencilLayer", True),
     "active_node": ("Node", False),
     "active_object": ("Object", False),
     "active_operator": ("Operator", False),
     "active_pose_bone": ("PoseBone", False),
-    "active_sequence_strip": ("Sequence", False),
     "active_editable_fcurve": ("FCurve", False),
-    "active_nla_strip": ("NlaStrip", False),
-    "active_nla_track": ("NlaTrack", False),
     "annotation_data": ("GreasePencil", False),
     "annotation_data_owner": ("ID", False),
     "armature": ("Armature", False),
-    "asset_library_ref": ("AssetLibraryReference", False),
     "bone": ("Bone", False),
     "brush": ("Brush", False),
     "camera": ("Camera", False),
@@ -1078,7 +1071,6 @@ context_type_map = {
     "gpencil_data": ("GreasePencil", False),
     "gpencil_data_owner": ("ID", False),
     "hair": ("Hair", False),
-    "id": ("ID", False),
     "image_paint_object": ("Object", False),
     "lattice": ("Lattice", False),
     "light": ("Light", False),
@@ -1107,7 +1099,6 @@ context_type_map = {
     "selected_editable_keyframes": ("Keyframe", True),
     "selected_editable_objects": ("Object", True),
     "selected_editable_sequences": ("Sequence", True),
-    "selected_files": ("FileSelectEntry", True),
     "selected_nla_strips": ("NlaStrip", True),
     "selected_nodes": ("Node", True),
     "selected_objects": ("Object", True),
@@ -1122,7 +1113,6 @@ context_type_map = {
     "texture_slot": ("MaterialTextureSlot", False),
     "texture_user": ("ID", False),
     "texture_user_property": ("Property", False),
-    "ui_list": ("UIList", False),
     "vertex_paint_object": ("Object", False),
     "view_layer": ("ViewLayer", False),
     "visible_bones": ("EditBone", True),
@@ -1204,7 +1194,6 @@ def pycontext2sphinx(basepath):
         "text_context_dir",
         "clip_context_dir",
         "sequencer_context_dir",
-        "file_context_dir",
     )
 
     unique = set()
@@ -2002,15 +1991,13 @@ def write_rst_importable_modules(basepath):
         "blf": "Font Drawing",
         "imbuf": "Image Buffer",
         "imbuf.types": "Image Buffer Types",
-        "gpu": "GPU Module",
+        "gpu": "GPU Shader Module",
         "gpu.types": "GPU Types",
         "gpu.matrix": "GPU Matrix Utilities",
         "gpu.select": "GPU Select Utilities",
         "gpu.shader": "GPU Shader Utilities",
         "gpu.state": "GPU State Utilities",
         "gpu.texture": "GPU Texture Utilities",
-        "gpu.platform": "GPU Platform Utilities",
-        "gpu.capabilities": "GPU Capabilities Utilities",
         "bmesh": "BMesh Module",
         "bmesh.ops": "BMesh Operators",
         "bmesh.types": "BMesh Types",

extern/CMakeLists.txt

@@ -111,5 +111,5 @@ if(WITH_MOD_FLUID)
 endif()
 
 if (WITH_COMPOSITOR)
-  add_subdirectory(smaa_areatex)
+	add_subdirectory(smaa_areatex)
 endif()

extern/audaspace/bindings/C/AUD_Special.cpp

@@ -86,7 +86,6 @@ AUD_API AUD_SoundInfo AUD_getInfo(AUD_Sound* sound)
 	info.specs.channels = AUD_CHANNELS_INVALID;
 	info.specs.rate = AUD_RATE_INVALID;
 	info.length = 0.0f;
-	info.start_offset = 0.0f;
 
 	try
 	{
@@ -96,7 +95,6 @@ AUD_API AUD_SoundInfo AUD_getInfo(AUD_Sound* sound)
 		{
 			info.specs = convSpecToC(reader->getSpecs());
 			info.length = reader->getLength() / (float) info.specs.rate;
-			info.start_offset = reader->getStartOffset();
 		}
 	}
 	catch(Exception&)
@@ -247,7 +245,7 @@ AUD_API int AUD_readSound(AUD_Sound* sound, float* buffer, int length, int sampl
 
 		buffer[i * 3] = min;
 		buffer[i * 3 + 1] = max;
-		buffer[i * 3 + 2] = sqrt(power / len); // RMS
+		buffer[i * 3 + 2] = sqrt(power) / len;
 
 		if(overallmax < max)
 			overallmax = max;

extern/audaspace/bindings/C/AUD_Types.h

@@ -176,5 +176,4 @@ typedef struct
 {
 	AUD_Specs specs;
 	float length;
-	double start_offset;
 } AUD_SoundInfo;

extern/audaspace/bindings/python/setup.py.in

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 
 import sys
 import os

extern/audaspace/include/IReader.h

@@ -70,12 +70,6 @@ public:
 	 */
 	virtual int getPosition() const=0;
 
-	/**
-	 * Returns the start offset the sound should have to line up with related sources.
-	 * \return The required start offset in seconds.
-	 */
-	virtual double getStartOffset() const { return 0.0;}
-
 	/**
 	 * Returns the specification of the reader.
 	 * \return The Specs structure.

extern/audaspace/include/fx/VolumeReader.h

@@ -67,4 +67,4 @@ public:
 	virtual void read(int& length, bool& eos, sample_t* buffer);
 };
 
-AUD_NAMESPACE_END
+AUD_NAMESPACE_END

extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp

@@ -68,7 +68,7 @@ int FFMPEGReader::decode(AVPacket& packet, Buffer& buffer)
 					for(int i = 0; i < m_frame->nb_samples; i++)
 					{
 						std::memcpy(((data_t*)buffer.getBuffer()) + buf_pos + ((m_codecCtx->channels * i) + channel) * single_size,
-								 m_frame->data[channel] + i * single_size, single_size);
+							   m_frame->data[channel] + i * single_size, single_size);
 					}
 				}
 			}
@@ -109,7 +109,7 @@ int FFMPEGReader::decode(AVPacket& packet, Buffer& buffer)
 				for(int i = 0; i < m_frame->nb_samples; i++)
 				{
 					std::memcpy(((data_t*)buffer.getBuffer()) + buf_pos + ((m_codecCtx->channels * i) + channel) * single_size,
-							 m_frame->data[channel] + i * single_size, single_size);
+						   m_frame->data[channel] + i * single_size, single_size);
 				}
 			}
 		}
@@ -126,10 +126,7 @@ int FFMPEGReader::decode(AVPacket& packet, Buffer& buffer)
 void FFMPEGReader::init()
 {
 	m_position = 0;
-	m_start_offset = 0.0f;
 	m_pkgbuf_left = 0;
-	m_st_time = 0;
-	m_duration = 0;
 
 	if(avformat_find_stream_info(m_formatCtx, nullptr) < 0)
 		AUD_THROW(FileException, "File couldn't be read, ffmpeg couldn't find the stream info.");
@@ -137,41 +134,15 @@ void FFMPEGReader::init()
 	// find audio stream and codec
 	m_stream = -1;
 
-	double dur_sec = 0;
-
 	for(unsigned int i = 0; i < m_formatCtx->nb_streams; i++)
 	{
 #ifdef FFMPEG_OLD_CODE
-		if(m_formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+		if((m_formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
 #else
-		if(m_formatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
+		if((m_formatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
 #endif
+			&& (m_stream < 0))
 		{
-			AVStream *audio_stream = m_formatCtx->streams[i];
-			double audio_timebase = av_q2d(audio_stream->time_base);
-
-			if (audio_stream->start_time != AV_NOPTS_VALUE)
-			{
-				m_st_time = audio_stream->start_time;
-			}
-
-			int64_t ctx_start_time = 0;
-			if (m_formatCtx->start_time != AV_NOPTS_VALUE) {
-				ctx_start_time = m_formatCtx->start_time;
-			}
-
-			m_start_offset = m_st_time * audio_timebase - (double)ctx_start_time / AV_TIME_BASE;
-
-			if(audio_stream->duration != AV_NOPTS_VALUE)
-			{
-				dur_sec = audio_stream->duration * audio_timebase;
-			}
-			else
-			{
-				/* If the audio starts after the stream start time, subract this from the total duration. */
-				dur_sec = (double)m_formatCtx->duration / AV_TIME_BASE - m_start_offset;
-			}
-
 			m_stream=i;
 			break;
 		}
@@ -242,7 +213,6 @@ void FFMPEGReader::init()
 	}
 
 	m_specs.rate = (SampleRate) m_codecCtx->sample_rate;
-	m_duration = lround(dur_sec * m_codecCtx->sample_rate);
 }
 
 FFMPEGReader::FFMPEGReader(std::string filename) :
@@ -368,17 +338,21 @@ void FFMPEGReader::seek(int position)
 {
 	if(position >= 0)
 	{
-		double pts_time_base =
-			av_q2d(m_formatCtx->streams[m_stream]->time_base);
+		uint64_t st_time = m_formatCtx->start_time;
+		uint64_t seek_pos = ((uint64_t)position) * ((uint64_t)AV_TIME_BASE) / ((uint64_t)m_specs.rate);
 
-		uint64_t seek_pts = (((uint64_t)position) / ((uint64_t)m_specs.rate)) / pts_time_base;
-
-		if(m_st_time != AV_NOPTS_VALUE) {
-			seek_pts += m_st_time;
+		if(st_time != AV_NOPTS_VALUE) {
+			seek_pos += st_time;
 		}
 
+		double pts_time_base = 
+			av_q2d(m_formatCtx->streams[m_stream]->time_base);
+		uint64_t pts_st_time =
+			((st_time != AV_NOPTS_VALUE) ? st_time : 0)
+			/ pts_time_base / (uint64_t) AV_TIME_BASE;
+
 		// a value < 0 tells us that seeking failed
-		if(av_seek_frame(m_formatCtx, m_stream, seek_pts,
+		if(av_seek_frame(m_formatCtx, -1, seek_pos,
 				 AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_ANY) >= 0)
 		{
 			avcodec_flush_buffers(m_codecCtx);
@@ -400,7 +374,7 @@ void FFMPEGReader::seek(int position)
 					if(packet.pts != AV_NOPTS_VALUE)
 					{
 						// calculate real position, and read to frame!
-						m_position = (packet.pts - m_st_time) * pts_time_base * m_specs.rate;
+						m_position = (packet.pts - pts_st_time) * pts_time_base * m_specs.rate;
 
 						if(m_position < position)
 						{
@@ -431,7 +405,8 @@ void FFMPEGReader::seek(int position)
 int FFMPEGReader::getLength() const
 {
 	// return approximated remaning size
-	return m_duration - m_position;
+	return (int)((m_formatCtx->duration * m_codecCtx->sample_rate)
+				 / AV_TIME_BASE)-m_position;
 }
 
 int FFMPEGReader::getPosition() const
@@ -439,11 +414,6 @@ int FFMPEGReader::getPosition() const
 	return m_position;
 }
 
-double FFMPEGReader::getStartOffset() const
-{
-	return m_start_offset;
-}
-
 Specs FFMPEGReader::getSpecs() const
 {
 	return m_specs.specs;
@@ -480,13 +450,11 @@ void FFMPEGReader::read(int& length, bool& eos, sample_t* buffer)
 			// decode the package
 			pkgbuf_pos = decode(packet, m_pkgbuf);
 
-			if (packet.pts >= m_st_time) {
-				// copy to output buffer
-				data_size = std::min(pkgbuf_pos, left * sample_size);
-				m_convert((data_t*) buf, (data_t*) m_pkgbuf.getBuffer(), data_size / AUD_FORMAT_SIZE(m_specs.format));
-				buf += data_size / AUD_FORMAT_SIZE(m_specs.format);
-				left -= data_size / sample_size;
-			}
+			// copy to output buffer
+			data_size = std::min(pkgbuf_pos, left * sample_size);
+			m_convert((data_t*) buf, (data_t*) m_pkgbuf.getBuffer(), data_size / AUD_FORMAT_SIZE(m_specs.format));
+			buf += data_size / AUD_FORMAT_SIZE(m_specs.format);
+			left -= data_size / sample_size;
 		}
 		av_packet_unref(&packet);
 	}

extern/audaspace/plugins/ffmpeg/FFMPEGReader.h

@@ -54,22 +54,6 @@ private:
 	 */
 	int m_position;
 
-	/**
-	 * The start offset in seconds relative to the media container start time.
-	 * IE how much the sound should be delayed to be kept in sync with the rest of the containter streams.
-	 */
-	double m_start_offset;
-
-	/**
-	 * The start time pts of the stream. All packets before this timestamp shouldn't be played back (only decoded).
-	 */
-	int64_t m_st_time;
-
-	/**
-	 * The duration of the audio stream in samples.
-	 */
-	int64_t m_duration;
-
 	/**
 	 * The specification of the audio data.
 	 */
@@ -198,7 +182,6 @@ public:
 	virtual void seek(int position);
 	virtual int getLength() const;
 	virtual int getPosition() const;
-	virtual double getStartOffset() const;
 	virtual Specs getSpecs() const;
 	virtual void read(int& length, bool& eos, sample_t* buffer);
 };

extern/audaspace/plugins/pulseaudio/PulseAudioDevice.cpp

@@ -32,24 +32,17 @@ void PulseAudioDevice::PulseAudio_state_callback(pa_context *context, void *data
 	device->m_state = AUD_pa_context_get_state(context);
 }
 
-void PulseAudioDevice::PulseAudio_request(pa_stream *stream, size_t total_bytes, void *data)
+void PulseAudioDevice::PulseAudio_request(pa_stream *stream, size_t num_bytes, void *data)
 {
 	PulseAudioDevice* device = (PulseAudioDevice*)data;
 
 	void* buffer;
 
-	while(total_bytes > 0)
-	{
-		size_t num_bytes = total_bytes;
+	AUD_pa_stream_begin_write(stream, &buffer, &num_bytes);
 
-		AUD_pa_stream_begin_write(stream, &buffer, &num_bytes);
+	device->mix((data_t*)buffer, num_bytes / AUD_DEVICE_SAMPLE_SIZE(device->m_specs));
 
-		device->mix((data_t*)buffer, num_bytes / AUD_DEVICE_SAMPLE_SIZE(device->m_specs));
-
-		AUD_pa_stream_write(stream, buffer, num_bytes, nullptr, 0, PA_SEEK_RELATIVE);
-
-		total_bytes -= num_bytes;
-	}
+	AUD_pa_stream_write(stream, buffer, num_bytes, nullptr, 0, PA_SEEK_RELATIVE);
 }
 
 void PulseAudioDevice::PulseAudio_underflow(pa_stream *stream, void *data)
@@ -103,6 +96,7 @@ void PulseAudioDevice::runMixingThread()
 
 PulseAudioDevice::PulseAudioDevice(std::string name, DeviceSpecs specs, int buffersize) :
 	m_state(PA_CONTEXT_UNCONNECTED),
+	m_buffersize(buffersize),
 	m_underflows(0)
 {
 	m_mainloop = AUD_pa_mainloop_new();
@@ -193,9 +187,6 @@ PulseAudioDevice::PulseAudioDevice(std::string name, DeviceSpecs specs, int buff
 	AUD_pa_stream_set_write_callback(m_stream, PulseAudio_request, this);
 	AUD_pa_stream_set_underflow_callback(m_stream, PulseAudio_underflow, this);
 
-	buffersize *= AUD_DEVICE_SAMPLE_SIZE(m_specs);
-	m_buffersize = buffersize;
-
 	pa_buffer_attr buffer_attr;
 
 	buffer_attr.fragsize = -1U;

extern/audaspace/plugins/pulseaudio/PulseAudioDevice.h

@@ -59,7 +59,7 @@ private:
 	 * \param num_bytes The length in bytes to be supplied.
 	 * \param data The PulseAudio device.
 	 */
-	AUD_LOCAL static void PulseAudio_request(pa_stream* stream, size_t total_bytes, void* data);
+	AUD_LOCAL static void PulseAudio_request(pa_stream* stream, size_t num_bytes, void* data);
 
 	/**
 	 * Reports an underflow from the PulseAudio server.

extern/audaspace/src/fx/VolumeReader.cpp

@@ -57,4 +57,4 @@ void VolumeReader::read(int& length, bool& eos, sample_t* buffer)
 		buffer[i] = buffer[i] * m_volumeStorage->getVolume();
 }
 
-AUD_NAMESPACE_END
+AUD_NAMESPACE_END

extern/glog/README.blender

@@ -7,4 +7,3 @@ Local modifications:
   checks for functions and so are needed.
 * Added special definitions of HAVE_SNPRINTF and HAVE_LIB_GFLAGS
   in Windows' specific config.h.
-* Silenced syscall deprecation warnings on macOS >= 10.12.

extern/glog/src/raw_logging.cc

@@ -59,7 +59,7 @@
 # include <unistd.h>
 #endif
 
-#if (defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)) && (!(defined OS_MACOSX))
+#if defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)
 # define safe_write(fd, s, len)  syscall(SYS_write, fd, s, len)
 #else
   // Not so safe, but what can you do?

extern/glog/src/utilities.cc

@@ -259,13 +259,7 @@ pid_t GetTID() {
 #endif
   static bool lacks_gettid = false;
   if (!lacks_gettid) {
-#ifdef OS_MACOSX
-    uint64_t tid64;
-    const int error = pthread_threadid_np(NULL, &tid64);
-    pid_t tid = error ? -1 : (pid_t)tid64;
-#else
     pid_t tid = syscall(__NR_gettid);
-#endif
     if (tid != -1) {
       return tid;
     }

extern/mantaflow/UPDATE.sh

@@ -8,7 +8,7 @@
 
 # YOUR INSTALLATION PATHS GO HERE:
 MANTA_INSTALLATION=/Users/sebbas/Developer/Mantaflow/mantaflowDevelop
-BLENDER_INSTALLATION=/Users/sebbas/Developer/Blender
+BLENDER_INSTALLATION=/Users/sebbas/Developer/Blender/fluid-mantaflow
 
 # Try to check out Mantaflow repository before building?
 CLEAN_REPOSITORY=0

extern/mantaflow/helper/pwrapper/pconvert.cpp

@@ -28,13 +28,11 @@ extern PyTypeObject PbVec3Type;
 extern PyTypeObject PbVec4Type;
 
 struct PbVec3 {
-  PyObject_HEAD
-  float data[3];
+  PyObject_HEAD float data[3];
 };
 
 struct PbVec4 {
-  PyObject_HEAD
-  float data[4];
+  PyObject_HEAD float data[4];
 };
 
 PyObject *getPyNone()

extern/mantaflow/helper/pwrapper/pvec3.cpp

@@ -25,8 +25,7 @@ namespace Manta {
 extern PyTypeObject PbVec3Type;
 
 struct PbVec3 {
-  PyObject_HEAD
-  float data[3];
+  PyObject_HEAD float data[3];
 };
 
 static void PbVec3Dealloc(PbVec3 *self)
@@ -294,8 +293,7 @@ inline PyObject *castPy(PyTypeObject *p)
 extern PyTypeObject PbVec4Type;
 
 struct PbVec4 {
-  PyObject_HEAD
-  float data[4];
+  PyObject_HEAD float data[4];
 };
 
 static PyMethodDef PbVec4Methods[] = {

extern/mantaflow/helper/pwrapper/registry.cpp

@@ -76,8 +76,7 @@ struct ClassData {
 };
 
 struct PbObject {
-  PyObject_HEAD
-  Manta::PbClass *instance;
+  PyObject_HEAD Manta::PbClass *instance;
   ClassData *classdef;
 };
 

extern/mantaflow/preprocessed/fastmarch.cpp

@@ -874,136 +874,6 @@ static const Vec3i nb[6] = {Vec3i(1, 0, 0),
                             Vec3i(0, 0, 1),
                             Vec3i(0, 0, -1)};
 
-struct knMarkSkipCells : public KernelBase {
-  knMarkSkipCells(Grid<Real> &phi, Grid<int> &tmp, bool inside)
-      : KernelBase(&phi, 1), phi(phi), tmp(tmp), inside(inside)
-  {
-    runMessage();
-    run();
-  }
-  inline void op(int i, int j, int k, Grid<Real> &phi, Grid<int> &tmp, bool inside) const
-  {
-    if (!inside && phi(i, j, k) < 0.) {
-      tmp(i, j, k) = 1;
-    }
-    if (inside && phi(i, j, k) > 0.) {
-      tmp(i, j, k) = 1;
-    }
-  }
-  inline Grid<Real> &getArg0()
-  {
-    return phi;
-  }
-  typedef Grid<Real> type0;
-  inline Grid<int> &getArg1()
-  {
-    return tmp;
-  }
-  typedef Grid<int> type1;
-  inline bool &getArg2()
-  {
-    return inside;
-  }
-  typedef bool type2;
-  void runMessage()
-  {
-    debMsg("Executing kernel knMarkSkipCells ", 3);
-    debMsg("Kernel range"
-               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
-           4);
-  };
-  void operator()(const tbb::blocked_range<IndexInt> &__r) const
-  {
-    const int _maxX = maxX;
-    const int _maxY = maxY;
-    if (maxZ > 1) {
-      for (int k = __r.begin(); k != (int)__r.end(); k++)
-        for (int j = 1; j < _maxY; j++)
-          for (int i = 1; i < _maxX; i++)
-            op(i, j, k, phi, tmp, inside);
-    }
-    else {
-      const int k = 0;
-      for (int j = __r.begin(); j != (int)__r.end(); j++)
-        for (int i = 1; i < _maxX; i++)
-          op(i, j, k, phi, tmp, inside);
-    }
-  }
-  void run()
-  {
-    if (maxZ > 1)
-      tbb::parallel_for(tbb::blocked_range<IndexInt>(minZ, maxZ), *this);
-    else
-      tbb::parallel_for(tbb::blocked_range<IndexInt>(1, maxY), *this);
-  }
-  Grid<Real> &phi;
-  Grid<int> &tmp;
-  bool inside;
-};
-
-struct knSetFirstLayer : public KernelBase {
-  knSetFirstLayer(Grid<int> &tmp, int dim) : KernelBase(&tmp, 1), tmp(tmp), dim(dim)
-  {
-    runMessage();
-    run();
-  }
-  inline void op(int i, int j, int k, Grid<int> &tmp, int dim) const
-  {
-    Vec3i p(i, j, k);
-    if (tmp(p))
-      return;
-    for (int n = 0; n < 2 * dim; ++n) {
-      if (tmp(p + nb[n]) == 1) {
-        tmp(i, j, k) = 2;
-        break;
-      }
-    }
-  }
-  inline Grid<int> &getArg0()
-  {
-    return tmp;
-  }
-  typedef Grid<int> type0;
-  inline int &getArg1()
-  {
-    return dim;
-  }
-  typedef int type1;
-  void runMessage()
-  {
-    debMsg("Executing kernel knSetFirstLayer ", 3);
-    debMsg("Kernel range"
-               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
-           4);
-  };
-  void operator()(const tbb::blocked_range<IndexInt> &__r) const
-  {
-    const int _maxX = maxX;
-    const int _maxY = maxY;
-    if (maxZ > 1) {
-      for (int k = __r.begin(); k != (int)__r.end(); k++)
-        for (int j = 1; j < _maxY; j++)
-          for (int i = 1; i < _maxX; i++)
-            op(i, j, k, tmp, dim);
-    }
-    else {
-      const int k = 0;
-      for (int j = __r.begin(); j != (int)__r.end(); j++)
-        for (int i = 1; i < _maxX; i++)
-          op(i, j, k, tmp, dim);
-    }
-  }
-  void run()
-  {
-    if (maxZ > 1)
-      tbb::parallel_for(tbb::blocked_range<IndexInt>(minZ, maxZ), *this);
-    else
-      tbb::parallel_for(tbb::blocked_range<IndexInt>(1, maxY), *this);
-  }
-  Grid<int> &tmp;
-  int dim;
-};
-
 template<class S> struct knExtrapolateLsSimple : public KernelBase {
   knExtrapolateLsSimple(Grid<S> &val, int distance, Grid<int> &tmp, const int d, S direction)
       : KernelBase(&val, 1), val(val), distance(distance), tmp(tmp), d(d), direction(direction)
@@ -1173,12 +1043,39 @@ void extrapolateLsSimple(Grid<Real> &phi, int distance = 4, bool inside = false)
   tmp.clear();
   const int dim = (phi.is3D() ? 3 : 2);
 
-  // by default, march outside (ie mark all inside to be skipped)
-  Real direction = (inside) ? -1. : 1.;
-  knMarkSkipCells(phi, tmp, inside);
-
+  // by default, march outside
+  Real direction = 1.;
+  if (!inside) {
+    // mark all inside
+    FOR_IJK_BND(phi, 1)
+    {
+      if (phi(i, j, k) < 0.) {
+        tmp(i, j, k) = 1;
+      }
+    }
+  }
+  else {
+    direction = -1.;
+    FOR_IJK_BND(phi, 1)
+    {
+      if (phi(i, j, k) > 0.) {
+        tmp(i, j, k) = 1;
+      }
+    }
+  }
   // + first layer around
-  knSetFirstLayer(tmp, dim);
+  FOR_IJK_BND(phi, 1)
+  {
+    Vec3i p(i, j, k);
+    if (tmp(p))
+      continue;
+    for (int n = 0; n < 2 * dim; ++n) {
+      if (tmp(p + nb[n]) == 1) {
+        tmp(i, j, k) = 2;
+        n = 2 * dim;
+      }
+    }
+  }
 
   // extrapolate for distance
   for (int d = 2; d < 1 + distance; ++d) {
@@ -1229,12 +1126,37 @@ void extrapolateVec3Simple(Grid<Vec3> &vel, Grid<Real> &phi, int distance = 4, b
   tmp.clear();
   const int dim = (vel.is3D() ? 3 : 2);
 
-  // mark initial cells, by default, march outside (ie mark all inside to be skipped)
-  Real direction = (inside) ? -1. : 1.;
-  knMarkSkipCells(phi, tmp, inside);
-
+  // mark initial cells, by default, march outside
+  if (!inside) {
+    // mark all inside
+    FOR_IJK_BND(phi, 1)
+    {
+      if (phi(i, j, k) < 0.) {
+        tmp(i, j, k) = 1;
+      }
+    }
+  }
+  else {
+    FOR_IJK_BND(phi, 1)
+    {
+      if (phi(i, j, k) > 0.) {
+        tmp(i, j, k) = 1;
+      }
+    }
+  }
   // + first layer next to initial cells
-  knSetFirstLayer(tmp, dim);
+  FOR_IJK_BND(vel, 1)
+  {
+    Vec3i p(i, j, k);
+    if (tmp(p))
+      continue;
+    for (int n = 0; n < 2 * dim; ++n) {
+      if (tmp(p + nb[n]) == 1) {
+        tmp(i, j, k) = 2;
+        n = 2 * dim;
+      }
+    }
+  }
 
   for (int d = 2; d < 1 + distance; ++d) {
     knExtrapolateLsSimple<Vec3>(vel, distance, tmp, d, Vec3(0.));

extern/mantaflow/preprocessed/gitinfo.h

@@ -1,3 +1,3 @@
 
 
-#define MANTA_GIT_VERSION "commit d5d9a6c28daa8f21426d7a285f48639c0d8fd13f"
+#define MANTA_GIT_VERSION "commit 8fbebe02459b7f72575872c20961f7cb757db408"

extern/nanosvg/README.blender

@@ -1,7 +0,0 @@
-Project: NanoSVG
-URL: https://github.com/memononen/nanosvg
-License: zlib
-Upstream version: 
-Local modifications: Added some functionality to manage grease pencil layers
-
-Added a fix to SVG import arc and float errors (https://developer.blender.org/rB11dc674c78b49fc4e0b7c134c375b6c8b8eacbcc)

extern/nanosvg/patches/NanoSVG.diff

@@ -1,86 +0,0 @@
-diff --git a/c:/tmp/nanosvg_original.h b/c:/tmp/nanosvg_modif.h
-index 24a01a86d3d..eca0d07e79d 100644
---- a/c:/tmp/nanosvg_original.h
-+++ b/c:/tmp/nanosvg_modif.h
-@@ -24,7 +24,8 @@
-  *
-  * Bounding box calculation based on http://blog.hackers-cafe.net/2009/06/how-to-calculate-bezier-curves-bounding.html
-  *
-- */
-+ * This is a modified version for Blender used by importers.
-+ **/
- 
- #ifndef NANOSVG_H
- #define NANOSVG_H
-@@ -148,6 +149,8 @@ extern "C" {
- 	typedef struct NSVGshape
- 	{
- 		char id[64];				// Optional 'id' attr of the shape or its group
-+		/* Blender: Parent ID used for layer creation. */
-+  		char id_parent[64];		
- 		NSVGpaint fill;				// Fill paint
- 		NSVGpaint stroke;			// Stroke paint
- 		float opacity;				// Opacity of the shape.
-@@ -370,6 +373,7 @@ int nsvg__parseXML(char* input,
- /* Simple SVG parser. */
- 
- #define NSVG_MAX_ATTR 128
-+#define NSVG_MAX_BREADCRUMB 5
- 
- enum NSVGgradientUnits
- {
-@@ -471,6 +475,10 @@ typedef struct NSVGparser
- 	float dpi;
- 	char pathFlag;
- 	char defsFlag;
-+	/** Blender breadcrumb for layers. */
-+  	char breadcrumb[NSVG_MAX_BREADCRUMB][64];
-+  	/** Blender number of elements in breadcrumb. */
-+  	int breadcrumb_len;
- } NSVGparser;
- 
- static void nsvg__xformIdentity(float* t)
-@@ -980,6 +988,14 @@ static void nsvg__addShape(NSVGparser* p)
- 	memset(shape, 0, sizeof(NSVGshape));
- 
- 	memcpy(shape->id, attr->id, sizeof shape->id);
-+	/* Copy parent id from breadcrumb. */
-+	if (p->breadcrumb_len > 0) {
-+		memcpy(shape->id_parent, p->breadcrumb[0], sizeof shape->id_parent);
-+	}
-+	else {
-+		memcpy(shape->id_parent, attr->id, sizeof shape->id_parent);
-+	}
-+
- 	scale = nsvg__getAverageScale(attr->xform);
- 	shape->strokeWidth = attr->strokeWidth * scale;
- 	shape->strokeDashOffset = attr->strokeDashOffset * scale;
-@@ -2814,6 +2830,14 @@ static void nsvg__startElement(void* ud, const char* el, const char** attr)
- 	if (strcmp(el, "g") == 0) {
- 		nsvg__pushAttr(p);
- 		nsvg__parseAttribs(p, attr);
-+
-+		/* Save the breadcrumb of groups. */
-+		if (p->breadcrumb_len < NSVG_MAX_BREADCRUMB) {
-+		NSVGattrib *attr_id = nsvg__getAttr(p);
-+		memcpy(
-+			p->breadcrumb[p->breadcrumb_len], attr_id->id, sizeof(p->breadcrumb[p->breadcrumb_len]));
-+		p->breadcrumb_len++;
-+		}
- 	}
- 	else if (strcmp(el, "path") == 0) {
- 		if (p->pathFlag)	// Do not allow nested paths.
-@@ -2874,7 +2898,12 @@ static void nsvg__endElement(void* ud, const char* el)
- 	NSVGparser* p = (NSVGparser*)ud;
- 
- 	if (strcmp(el, "g") == 0) {
--		nsvg__popAttr(p);
-+  		/* Remove the breadcrumb level. */
-+    	if (p->breadcrumb_len > 0) {
-+      		p->breadcrumb[p->breadcrumb_len - 1][0] = '\0';
-+      		p->breadcrumb_len--;
-+		}
-+	  nsvg__popAttr(p);
- 	}
- 	else if (strcmp(el, "path") == 0) {
- 		p->pathFlag = 0;

extern/rangetree/intern/generic_alloc_impl.h

@@ -32,7 +32,7 @@
  * - #TPOOL_STRUCT: Name for pool struct name.
  * - #TPOOL_CHUNK_SIZE: Chunk size (optional), use 64kb when not defined.
  *
- * \note #TPOOL_ALLOC_TYPE must be at least `sizeof(void *)`.
+ * \note #TPOOL_ALLOC_TYPE must be at least ``sizeof(void *)``.
  *
  * Defines the API, uses #TPOOL_IMPL_PREFIX to prefix each function.
  *

intern/atomic/intern/atomic_ops_unix.h

@@ -49,9 +49,9 @@
 
 #include "atomic_ops_utils.h"
 
-#if defined(__arm__) || defined(__riscv)
-/* Attempt to fix compilation error on Debian armel and RISC-V kernels.
- * Both architectures do have both 32 and 64bit atomics, however
+#if defined(__arm__)
+/* Attempt to fix compilation error on Debian armel kernel.
+ * arm7 architecture does have both 32 and 64bit atomics, however
  * its gcc doesn't have __GCC_HAVE_SYNC_COMPARE_AND_SWAP_n defined.
  */
 #  define JE_FORCE_SYNC_COMPARE_AND_SWAP_1
@@ -60,108 +60,9 @@
 #  define JE_FORCE_SYNC_COMPARE_AND_SWAP_8
 #endif
 
-/* Define the `ATOMIC_FORCE_USE_FALLBACK` to force lock-based fallback implementation to be used
- * (even on platforms where there is native implementation available via compiler.
- * Useful for development purposes. */
-#undef ATOMIC_FORCE_USE_FALLBACK
-
-/* -------------------------------------------------------------------- */
-/** \name Spin-lock implementation
- *
- * Used to implement atomics on unsupported platforms.
- * The spin implementation is shared for all platforms to make sure it compiles and tested.
- * \{ */
-
-typedef struct AtomicSpinLock {
-  volatile int lock;
-
-  /* Pad the structure size to a cache-line, to avoid unwanted sharing with other data. */
-  int pad[32 - sizeof(int)];
-} __attribute__((aligned(32))) AtomicSpinLock;
-
-ATOMIC_INLINE void atomic_spin_lock(volatile AtomicSpinLock *lock)
-{
-  while (__sync_lock_test_and_set(&lock->lock, 1)) {
-    while (lock->lock) {
-    }
-  }
-}
-
-ATOMIC_INLINE void atomic_spin_unlock(volatile AtomicSpinLock *lock)
-{
-  __sync_lock_release(&lock->lock);
-}
-
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Common part of locking fallback implementation
- * \{ */
-
-/* Global lock, shared by all atomic operations implementations.
- *
- * Could be split into per-size locks, although added complexity and being more error-proone does
- * not seem to worth it for a fall-back implementation. */
-static _ATOMIC_MAYBE_UNUSED AtomicSpinLock _atomic_global_lock = {0};
-
-#define ATOMIC_LOCKING_OP_AND_FETCH_DEFINE(_type, _op_name, _op) \
-  ATOMIC_INLINE _type##_t atomic_##_op_name##_and_fetch_##_type(_type##_t *p, _type##_t x) \
-  { \
-    atomic_spin_lock(&_atomic_global_lock); \
-    const _type##_t original_value = *(p); \
-    const _type##_t new_value = original_value _op(x); \
-    *(p) = new_value; \
-    atomic_spin_unlock(&_atomic_global_lock); \
-    return new_value; \
-  }
-
-#define ATOMIC_LOCKING_FETCH_AND_OP_DEFINE(_type, _op_name, _op) \
-  ATOMIC_INLINE _type##_t atomic_fetch_and_##_op_name##_##_type(_type##_t *p, _type##_t x) \
-  { \
-    atomic_spin_lock(&_atomic_global_lock); \
-    const _type##_t original_value = *(p); \
-    *(p) = original_value _op(x); \
-    atomic_spin_unlock(&_atomic_global_lock); \
-    return original_value; \
-  }
-
-#define ATOMIC_LOCKING_ADD_AND_FETCH_DEFINE(_type) \
-  ATOMIC_LOCKING_OP_AND_FETCH_DEFINE(_type, add, +)
-
-#define ATOMIC_LOCKING_SUB_AND_FETCH_DEFINE(_type) \
-  ATOMIC_LOCKING_OP_AND_FETCH_DEFINE(_type, sub, -)
-
-#define ATOMIC_LOCKING_FETCH_AND_ADD_DEFINE(_type) \
-  ATOMIC_LOCKING_FETCH_AND_OP_DEFINE(_type, add, +)
-
-#define ATOMIC_LOCKING_FETCH_AND_SUB_DEFINE(_type) \
-  ATOMIC_LOCKING_FETCH_AND_OP_DEFINE(_type, sub, -)
-
-#define ATOMIC_LOCKING_FETCH_AND_OR_DEFINE(_type) ATOMIC_LOCKING_FETCH_AND_OP_DEFINE(_type, or, |)
-
-#define ATOMIC_LOCKING_FETCH_AND_AND_DEFINE(_type) \
-  ATOMIC_LOCKING_FETCH_AND_OP_DEFINE(_type, and, &)
-
-#define ATOMIC_LOCKING_CAS_DEFINE(_type) \
-  ATOMIC_INLINE _type##_t atomic_cas_##_type(_type##_t *v, _type##_t old, _type##_t _new) \
-  { \
-    atomic_spin_lock(&_atomic_global_lock); \
-    const _type##_t original_value = *v; \
-    if (*v == old) { \
-      *v = _new; \
-    } \
-    atomic_spin_unlock(&_atomic_global_lock); \
-    return original_value; \
-  }
-
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name 64-bit operations
- * \{ */
-
-#if !defined(ATOMIC_FORCE_USE_FALLBACK) && \
-    (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) || defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_8))
+/******************************************************************************/
+/* 64-bit operations. */
+#if (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) || defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_8))
 /* Unsigned */
 ATOMIC_INLINE uint64_t atomic_add_and_fetch_uint64(uint64_t *p, uint64_t x)
 {
@@ -214,7 +115,7 @@ ATOMIC_INLINE int64_t atomic_cas_int64(int64_t *v, int64_t old, int64_t _new)
   return __sync_val_compare_and_swap(v, old, _new);
 }
 
-#elif !defined(ATOMIC_FORCE_USE_FALLBACK) && (defined(__amd64__) || defined(__x86_64__))
+#elif (defined(__amd64__) || defined(__x86_64__))
 /* Unsigned */
 ATOMIC_INLINE uint64_t atomic_fetch_and_add_uint64(uint64_t *p, uint64_t x)
 {
@@ -289,36 +190,12 @@ ATOMIC_INLINE int64_t atomic_cas_int64(int64_t *v, int64_t old, int64_t _new)
   return ret;
 }
 #else
-
-/* Unsigned */
-
-ATOMIC_LOCKING_ADD_AND_FETCH_DEFINE(uint64)
-ATOMIC_LOCKING_SUB_AND_FETCH_DEFINE(uint64)
-
-ATOMIC_LOCKING_FETCH_AND_ADD_DEFINE(uint64)
-ATOMIC_LOCKING_FETCH_AND_SUB_DEFINE(uint64)
-
-ATOMIC_LOCKING_CAS_DEFINE(uint64)
-
-/* Signed */
-ATOMIC_LOCKING_ADD_AND_FETCH_DEFINE(int64)
-ATOMIC_LOCKING_SUB_AND_FETCH_DEFINE(int64)
-
-ATOMIC_LOCKING_FETCH_AND_ADD_DEFINE(int64)
-ATOMIC_LOCKING_FETCH_AND_SUB_DEFINE(int64)
-
-ATOMIC_LOCKING_CAS_DEFINE(int64)
-
+#  error "Missing implementation for 64-bit atomic operations"
 #endif
 
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name 32-bit operations
- * \{ */
-
-#if !defined(ATOMIC_FORCE_USE_FALLBACK) && \
-    (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) || defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_4))
+/******************************************************************************/
+/* 32-bit operations. */
+#if (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) || defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_4))
 /* Unsigned */
 ATOMIC_INLINE uint32_t atomic_add_and_fetch_uint32(uint32_t *p, uint32_t x)
 {
@@ -351,8 +228,7 @@ ATOMIC_INLINE int32_t atomic_cas_int32(int32_t *v, int32_t old, int32_t _new)
   return __sync_val_compare_and_swap(v, old, _new);
 }
 
-#elif !defined(ATOMIC_FORCE_USE_FALLBACK) && \
-    (defined(__i386__) || defined(__amd64__) || defined(__x86_64__))
+#elif (defined(__i386__) || defined(__amd64__) || defined(__x86_64__))
 /* Unsigned */
 ATOMIC_INLINE uint32_t atomic_add_and_fetch_uint32(uint32_t *p, uint32_t x)
 {
@@ -410,25 +286,10 @@ ATOMIC_INLINE int32_t atomic_cas_int32(int32_t *v, int32_t old, int32_t _new)
 }
 
 #else
-
-/* Unsigned */
-
-ATOMIC_LOCKING_ADD_AND_FETCH_DEFINE(uint32)
-ATOMIC_LOCKING_SUB_AND_FETCH_DEFINE(uint32)
-
-ATOMIC_LOCKING_CAS_DEFINE(uint32)
-
-/* Signed */
-
-ATOMIC_LOCKING_ADD_AND_FETCH_DEFINE(int32)
-ATOMIC_LOCKING_SUB_AND_FETCH_DEFINE(int32)
-
-ATOMIC_LOCKING_CAS_DEFINE(int32)
-
+#  error "Missing implementation for 32-bit atomic operations"
 #endif
 
-#if !defined(ATOMIC_FORCE_USE_FALLBACK) && \
-    (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) || defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_4))
+#if (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) || defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_4))
 /* Unsigned */
 ATOMIC_INLINE uint32_t atomic_fetch_and_add_uint32(uint32_t *p, uint32_t x)
 {
@@ -462,27 +323,12 @@ ATOMIC_INLINE int32_t atomic_fetch_and_and_int32(int32_t *p, int32_t x)
 }
 
 #else
-
-/* Unsigned */
-ATOMIC_LOCKING_FETCH_AND_ADD_DEFINE(uint32)
-ATOMIC_LOCKING_FETCH_AND_OR_DEFINE(uint32)
-ATOMIC_LOCKING_FETCH_AND_AND_DEFINE(uint32)
-
-/* Signed */
-ATOMIC_LOCKING_FETCH_AND_ADD_DEFINE(int32)
-ATOMIC_LOCKING_FETCH_AND_OR_DEFINE(int32)
-ATOMIC_LOCKING_FETCH_AND_AND_DEFINE(int32)
-
+#  error "Missing implementation for 32-bit atomic operations"
 #endif
 
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name 16-bit operations
- * \{ */
-
-#if !defined(ATOMIC_FORCE_USE_FALLBACK) && \
-    (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2) || defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_2))
+/******************************************************************************/
+/* 16-bit operations. */
+#if (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2) || defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_2))
 
 /* Signed */
 ATOMIC_INLINE int16_t atomic_fetch_and_and_int16(int16_t *p, int16_t b)
@@ -495,21 +341,12 @@ ATOMIC_INLINE int16_t atomic_fetch_and_or_int16(int16_t *p, int16_t b)
 }
 
 #else
-
-ATOMIC_LOCKING_FETCH_AND_AND_DEFINE(int16)
-ATOMIC_LOCKING_FETCH_AND_OR_DEFINE(int16)
-
+#  error "Missing implementation for 16-bit atomic operations"
 #endif
 
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name 8-bit operations
- * \{ */
-
-#if !defined(ATOMIC_FORCE_USE_FALLBACK) && \
-    (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1) || defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_1))
-
+/******************************************************************************/
+/* 8-bit operations. */
+#if (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1) || defined(JE_FORCE_SYNC_COMPARE_AND_SWAP_1))
 /* Unsigned */
 ATOMIC_INLINE uint8_t atomic_fetch_and_and_uint8(uint8_t *p, uint8_t b)
 {
@@ -531,27 +368,7 @@ ATOMIC_INLINE int8_t atomic_fetch_and_or_int8(int8_t *p, int8_t b)
 }
 
 #else
-
-/* Unsigned */
-ATOMIC_LOCKING_FETCH_AND_AND_DEFINE(uint8)
-ATOMIC_LOCKING_FETCH_AND_OR_DEFINE(uint8)
-
-/* Signed */
-ATOMIC_LOCKING_FETCH_AND_AND_DEFINE(int8)
-ATOMIC_LOCKING_FETCH_AND_OR_DEFINE(int8)
-
+#  error "Missing implementation for 8-bit atomic operations"
 #endif
 
-/** \} */
-
-#undef ATOMIC_LOCKING_OP_AND_FETCH_DEFINE
-#undef ATOMIC_LOCKING_FETCH_AND_OP_DEFINE
-#undef ATOMIC_LOCKING_ADD_AND_FETCH_DEFINE
-#undef ATOMIC_LOCKING_SUB_AND_FETCH_DEFINE
-#undef ATOMIC_LOCKING_FETCH_AND_ADD_DEFINE
-#undef ATOMIC_LOCKING_FETCH_AND_SUB_DEFINE
-#undef ATOMIC_LOCKING_FETCH_AND_OR_DEFINE
-#undef ATOMIC_LOCKING_FETCH_AND_AND_DEFINE
-#undef ATOMIC_LOCKING_CAS_DEFINE
-
 #endif /* __ATOMIC_OPS_UNIX_H__ */

intern/atomic/intern/atomic_ops_utils.h

@@ -64,11 +64,9 @@
 #ifdef __GNUC__
 #  define _ATOMIC_LIKELY(x) __builtin_expect(!!(x), 1)
 #  define _ATOMIC_UNLIKELY(x) __builtin_expect(!!(x), 0)
-#  define _ATOMIC_MAYBE_UNUSED __attribute__((unused))
 #else
 #  define _ATOMIC_LIKELY(x) (x)
 #  define _ATOMIC_UNLIKELY(x) (x)
-#  define _ATOMIC_MAYBE_UNUSED
 #endif
 
 #if defined(__SIZEOF_POINTER__)

intern/cycles/CMakeLists.txt

@@ -307,9 +307,9 @@ if(WITH_CYCLES_LOGGING)
   )
 endif()
 
-# NaN debugging
-if(WITH_CYCLES_DEBUG_NAN)
-  add_definitions(-DWITH_CYCLES_DEBUG_NAN)
+# Debugging capabilities (debug passes etc).
+if(WITH_CYCLES_DEBUG)
+  add_definitions(-DWITH_CYCLES_DEBUG)
 endif()
 
 if(NOT OPENIMAGEIO_PUGIXML_FOUND)

intern/cycles/blender/CMakeLists.txt

@@ -115,16 +115,6 @@ if(WITH_OPENVDB)
   )
 endif()
 
-if(WITH_ALEMBIC)
-  add_definitions(-DWITH_ALEMBIC)
-  list(APPEND INC_SYS
-    ${ALEMBIC_INCLUDE_DIRS}
-  )
-  list(APPEND LIB
-    ${ALEMBIC_LIBRARIES}
-  )
-endif()
-
 if(WITH_OPENIMAGEDENOISE)
   add_definitions(-DWITH_OPENIMAGEDENOISE)
   list(APPEND INC_SYS

intern/cycles/blender/addon/__init__.py

@@ -61,7 +61,6 @@ class CyclesRender(bpy.types.RenderEngine):
     bl_use_save_buffers = True
     bl_use_spherical_stereo = True
     bl_use_custom_freestyle = True
-    bl_use_alembic_procedural = True
 
     def __init__(self):
         self.session = None

intern/cycles/blender/addon/engine.py

@@ -235,12 +235,9 @@ def system_info():
 
 
 def list_render_passes(scene, srl):
-    crl = srl.cycles
-
-    # Combined pass.
+    # Builtin Blender passes.
     yield ("Combined", "RGBA", 'COLOR')
 
-    # Data passes.
     if srl.use_pass_z:                     yield ("Depth",         "Z",    'VALUE')
     if srl.use_pass_mist:                  yield ("Mist",          "Z",    'VALUE')
     if srl.use_pass_normal:                yield ("Normal",        "XYZ",  'VECTOR')
@@ -248,8 +245,8 @@ def list_render_passes(scene, srl):
     if srl.use_pass_uv:                    yield ("UV",            "UVA",  'VECTOR')
     if srl.use_pass_object_index:          yield ("IndexOB",       "X",    'VALUE')
     if srl.use_pass_material_index:        yield ("IndexMA",       "X",    'VALUE')
-
-    # Light passes.
+    if srl.use_pass_shadow:                yield ("Shadow",        "RGB",  'COLOR')
+    if srl.use_pass_ambient_occlusion:     yield ("AO",            "RGB",  'COLOR')
     if srl.use_pass_diffuse_direct:        yield ("DiffDir",       "RGB",  'COLOR')
     if srl.use_pass_diffuse_indirect:      yield ("DiffInd",       "RGB",  'COLOR')
     if srl.use_pass_diffuse_color:         yield ("DiffCol",       "RGB",  'COLOR')
@@ -259,16 +256,19 @@ def list_render_passes(scene, srl):
     if srl.use_pass_transmission_direct:   yield ("TransDir",      "RGB",  'COLOR')
     if srl.use_pass_transmission_indirect: yield ("TransInd",      "RGB",  'COLOR')
     if srl.use_pass_transmission_color:    yield ("TransCol",      "RGB",  'COLOR')
-    if crl.use_pass_volume_direct:         yield ("VolumeDir",     "RGB",  'COLOR')
-    if crl.use_pass_volume_indirect:       yield ("VolumeInd",     "RGB",  'COLOR')
     if srl.use_pass_emit:                  yield ("Emit",          "RGB",  'COLOR')
     if srl.use_pass_environment:           yield ("Env",           "RGB",  'COLOR')
-    if srl.use_pass_shadow:                yield ("Shadow",        "RGB",  'COLOR')
-    if srl.use_pass_ambient_occlusion:     yield ("AO",            "RGB",  'COLOR')
 
-    # Debug passes.
+    # Cycles specific passes.
+    crl = srl.cycles
     if crl.pass_debug_render_time:             yield ("Debug Render Time",             "X",   'VALUE')
+    if crl.pass_debug_bvh_traversed_nodes:     yield ("Debug BVH Traversed Nodes",     "X",   'VALUE')
+    if crl.pass_debug_bvh_traversed_instances: yield ("Debug BVH Traversed Instances", "X",   'VALUE')
+    if crl.pass_debug_bvh_intersections:       yield ("Debug BVH Intersections",       "X",   'VALUE')
+    if crl.pass_debug_ray_bounces:             yield ("Debug Ray Bounces",             "X",   'VALUE')
     if crl.pass_debug_sample_count:            yield ("Debug Sample Count",            "X",   'VALUE')
+    if crl.use_pass_volume_direct:             yield ("VolumeDir",                     "RGB", 'COLOR')
+    if crl.use_pass_volume_indirect:           yield ("VolumeInd",                     "RGB", 'COLOR')
 
     # Cryptomatte passes.
     crypto_depth = (srl.pass_cryptomatte_depth + 1) // 2

intern/cycles/blender/addon/properties.py

@@ -227,11 +227,6 @@ def update_render_passes(self, context):
     view_layer.update_render_passes()
 
 
-def update_render_engine(self, context):
-    scene = context.scene
-    scene.update_render_engine()
-
-
 class CyclesRenderSettings(bpy.types.PropertyGroup):
 
     device: EnumProperty(
@@ -245,7 +240,6 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
         description="Feature set to use for rendering",
         items=enum_feature_set,
         default='SUPPORTED',
-        update=update_render_engine,
     )
     shading_system: BoolProperty(
         name="Open Shading Language",
@@ -269,7 +263,6 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
         name="Use Denoising",
         description="Denoise the rendered image",
         default=False,
-        update=update_render_passes,
     )
     use_preview_denoising: BoolProperty(
         name="Use Viewport Denoising",
@@ -408,7 +401,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
 
     adaptive_threshold: FloatProperty(
         name="Adaptive Sampling Threshold",
-        description="Noise level step to stop sampling at, lower values reduce noise at the cost of render time. Zero for automatic setting based on number of AA samples",
+        description="Noise level step to stop sampling at, lower values reduce noise the cost of render time. Zero for automatic setting based on number of AA samples",
         min=0.0, max=1.0,
         default=0.0,
         precision=4,
@@ -489,7 +482,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
 
     transparent_max_bounces: IntProperty(
         name="Transparent Max Bounces",
-        description="Maximum number of transparent bounces. This is independent of maximum number of other bounces ",
+        description="Maximum number of transparent bounces",
         min=0, max=1024,
         default=8,
     )
@@ -1170,6 +1163,12 @@ class CyclesVisibilitySettings(bpy.types.PropertyGroup):
 
     @classmethod
     def register(cls):
+        bpy.types.Object.cycles_visibility = PointerProperty(
+            name="Cycles Visibility Settings",
+            description="Cycles visibility settings",
+            type=cls,
+        )
+
         bpy.types.World.cycles_visibility = PointerProperty(
             name="Cycles Visibility Settings",
             description="Cycles visibility settings",
@@ -1178,6 +1177,7 @@ class CyclesVisibilitySettings(bpy.types.PropertyGroup):
 
     @classmethod
     def unregister(cls):
+        del bpy.types.Object.cycles_visibility
         del bpy.types.World.cycles_visibility
 
 
@@ -1267,12 +1267,18 @@ class CyclesObjectSettings(bpy.types.PropertyGroup):
         default=0.1,
     )
 
-    ao_distance: FloatProperty(
-        name="AO Distance",
-        description="AO distance used for approximate global illumination (0 means use world setting)",
-        min=0.0,
-        default=0.0,
-        subtype='DISTANCE',
+    is_shadow_catcher: BoolProperty(
+        name="Shadow Catcher",
+        description="Only render shadows on this object, for compositing renders into real footage",
+        default=False,
+    )
+
+    is_holdout: BoolProperty(
+        name="Holdout",
+        description="Render objects as a holdout or matte, creating a "
+        "hole in the image with zero alpha, to fill out in "
+        "compositing with real footage or another render",
+        default=False,
     )
 
     @classmethod
@@ -1318,6 +1324,30 @@ class CyclesCurveRenderSettings(bpy.types.PropertyGroup):
 
 class CyclesRenderLayerSettings(bpy.types.PropertyGroup):
 
+    pass_debug_bvh_traversed_nodes: BoolProperty(
+        name="Debug BVH Traversed Nodes",
+        description="Store Debug BVH Traversed Nodes pass",
+        default=False,
+        update=update_render_passes,
+    )
+    pass_debug_bvh_traversed_instances: BoolProperty(
+        name="Debug BVH Traversed Instances",
+        description="Store Debug BVH Traversed Instances pass",
+        default=False,
+        update=update_render_passes,
+    )
+    pass_debug_bvh_intersections: BoolProperty(
+        name="Debug BVH Intersections",
+        description="Store Debug BVH Intersections",
+        default=False,
+        update=update_render_passes,
+    )
+    pass_debug_ray_bounces: BoolProperty(
+        name="Debug Ray Bounces",
+        description="Store Debug Ray Bounces pass",
+        default=False,
+        update=update_render_passes,
+    )
     pass_debug_render_time: BoolProperty(
         name="Debug Render Time",
         description="Render time in milliseconds per sample and pixel",

intern/cycles/blender/addon/ui.py

@@ -485,12 +485,10 @@ class CYCLES_RENDER_PT_light_paths_max_bounces(CyclesButtonsPanel, Panel):
         col = layout.column(align=True)
         col.prop(cscene, "diffuse_bounces", text="Diffuse")
         col.prop(cscene, "glossy_bounces", text="Glossy")
+        col.prop(cscene, "transparent_max_bounces", text="Transparency")
         col.prop(cscene, "transmission_bounces", text="Transmission")
         col.prop(cscene, "volume_bounces", text="Volume")
 
-        col = layout.column(align=True)
-        col.prop(cscene, "transparent_max_bounces", text="Transparent")
-
 
 class CYCLES_RENDER_PT_light_paths_clamping(CyclesButtonsPanel, Panel):
     bl_label = "Clamping"
@@ -936,6 +934,29 @@ class CYCLES_RENDER_PT_passes_crypto(CyclesButtonsPanel, ViewLayerCryptomattePan
     bl_parent_id = "CYCLES_RENDER_PT_passes"
 
 
+class CYCLES_RENDER_PT_passes_debug(CyclesButtonsPanel, Panel):
+    bl_label = "Debug"
+    bl_context = "view_layer"
+    bl_parent_id = "CYCLES_RENDER_PT_passes"
+
+    @classmethod
+    def poll(cls, context):
+        import _cycles
+        return _cycles.with_cycles_debug
+
+    def draw(self, context):
+        layout = self.layout
+        layout.use_property_split = True
+        layout.use_property_decorate = False
+
+        cycles_view_layer = context.view_layer.cycles
+
+        layout.prop(cycles_view_layer, "pass_debug_bvh_traversed_nodes")
+        layout.prop(cycles_view_layer, "pass_debug_bvh_traversed_instances")
+        layout.prop(cycles_view_layer, "pass_debug_bvh_intersections")
+        layout.prop(cycles_view_layer, "pass_debug_ray_bounces")
+
+
 class CYCLES_RENDER_PT_passes_aov(CyclesButtonsPanel, ViewLayerAOVPanel):
     bl_label = "Shader AOV"
     bl_context = "view_layer"
@@ -1102,7 +1123,7 @@ class CYCLES_PT_context_material(CyclesButtonsPanel, Panel):
 
         if ob:
             is_sortable = len(ob.material_slots) > 1
-            rows = 3
+            rows = 1
             if (is_sortable):
                 rows = 4
 
@@ -1113,7 +1134,7 @@ class CYCLES_PT_context_material(CyclesButtonsPanel, Panel):
             col = row.column(align=True)
             col.operator("object.material_slot_add", icon='ADD', text="")
             col.operator("object.material_slot_remove", icon='REMOVE', text="")
-            col.separator()
+
             col.menu("MATERIAL_MT_context_menu", icon='DOWNARROW_HLT', text="")
 
             if is_sortable:
@@ -1128,15 +1149,16 @@ class CYCLES_PT_context_material(CyclesButtonsPanel, Panel):
                 row.operator("object.material_slot_select", text="Select")
                 row.operator("object.material_slot_deselect", text="Deselect")
 
-        row = layout.row()
+        split = layout.split(factor=0.65)
 
         if ob:
-            row.template_ID(ob, "active_material", new="material.new")
+            split.template_ID(ob, "active_material", new="material.new")
+            row = split.row()
 
             if slot:
-                icon_link = 'MESH_DATA' if slot.link == 'DATA' else 'OBJECT_DATA'
-                row.prop(slot, "link", text="", icon=icon_link, icon_only=True)
-
+                row.prop(slot, "link", text="")
+            else:
+                row.label()
         elif mat:
             split.template_ID(space, "pin_id")
             split.separator()
@@ -1228,26 +1250,6 @@ class CYCLES_OBJECT_PT_shading_shadow_terminator(CyclesButtonsPanel, Panel):
         flow.prop(cob, "shadow_terminator_offset", text="Shading Offset")
 
 
-class CYCLES_OBJECT_PT_shading_gi_approximation(CyclesButtonsPanel, Panel):
-    bl_label = "Fast GI Approximation"
-    bl_parent_id = "CYCLES_OBJECT_PT_shading"
-    bl_context = "object"
-
-    def draw(self, context):
-        layout = self.layout
-        layout.use_property_split = True
-
-        scene = context.scene
-        ob = context.object
-
-        cob = ob.cycles
-        cscene = scene.cycles
-
-        col = layout.column()
-        col.active = cscene.use_fast_gi
-        col.prop(cob, "ao_distance")
-
-
 class CYCLES_OBJECT_PT_visibility(CyclesButtonsPanel, Panel):
     bl_label = "Visibility"
     bl_context = "object"
@@ -1270,9 +1272,10 @@ class CYCLES_OBJECT_PT_visibility(CyclesButtonsPanel, Panel):
         col.prop(ob, "hide_render", text="Renders", invert_checkbox=True, toggle=False)
 
         if has_geometry_visibility(ob):
+            cob = ob.cycles
             col = layout.column(heading="Mask")
-            col.prop(ob, "is_shadow_catcher")
-            col.prop(ob, "is_holdout")
+            col.prop(cob, "is_shadow_catcher")
+            col.prop(cob, "is_holdout")
 
 
 class CYCLES_OBJECT_PT_visibility_ray_visibility(CyclesButtonsPanel, Panel):
@@ -1292,17 +1295,19 @@ class CYCLES_OBJECT_PT_visibility_ray_visibility(CyclesButtonsPanel, Panel):
 
         scene = context.scene
         ob = context.object
+        cob = ob.cycles
+        visibility = ob.cycles_visibility
 
         col = layout.column()
-        col.prop(ob, "visible_camera", text="Camera")
-        col.prop(ob, "visible_diffuse", text="Diffuse")
-        col.prop(ob, "visible_glossy", text="Glossy")
-        col.prop(ob, "visible_transmission", text="Transmission")
-        col.prop(ob, "visible_volume_scatter", text="Volume Scatter")
+        col.prop(visibility, "camera")
+        col.prop(visibility, "diffuse")
+        col.prop(visibility, "glossy")
+        col.prop(visibility, "transmission")
+        col.prop(visibility, "scatter")
 
         if ob.type != 'LIGHT':
             sub = col.column()
-            sub.prop(ob, "visible_shadow", text="Shadow")
+            sub.prop(visibility, "shadow")
 
 
 class CYCLES_OBJECT_PT_visibility_culling(CyclesButtonsPanel, Panel):
@@ -2311,6 +2316,7 @@ classes = (
     CYCLES_RENDER_PT_passes_data,
     CYCLES_RENDER_PT_passes_light,
     CYCLES_RENDER_PT_passes_crypto,
+    CYCLES_RENDER_PT_passes_debug,
     CYCLES_RENDER_PT_passes_aov,
     CYCLES_RENDER_PT_filter,
     CYCLES_RENDER_PT_override,
@@ -2322,7 +2328,6 @@ classes = (
     CYCLES_OBJECT_PT_motion_blur,
     CYCLES_OBJECT_PT_shading,
     CYCLES_OBJECT_PT_shading_shadow_terminator,
-    CYCLES_OBJECT_PT_shading_gi_approximation,
     CYCLES_OBJECT_PT_visibility,
     CYCLES_OBJECT_PT_visibility_ray_visibility,
     CYCLES_OBJECT_PT_visibility_culling,

intern/cycles/blender/blender_curves.cpp

@@ -526,13 +526,8 @@ bool BlenderSync::object_has_particle_hair(BL::Object b_ob)
 
 /* Old particle hair. */
 void BlenderSync::sync_particle_hair(
-    Hair *hair, BL::Mesh &b_mesh, BObjectInfo &b_ob_info, bool motion, int motion_step)
+    Hair *hair, BL::Mesh &b_mesh, BL::Object &b_ob, bool motion, int motion_step)
 {
-  if (!b_ob_info.is_real_object_data()) {
-    return;
-  }
-  BL::Object b_ob = b_ob_info.real_object;
-
   /* obtain general settings */
   if (b_ob.mode() == b_ob.mode_PARTICLE_EDIT || b_ob.mode() == b_ob.mode_EDIT) {
     return;
@@ -793,10 +788,10 @@ static void export_hair_curves_motion(Hair *hair, BL::Hair b_hair, int motion_st
 }
 
 /* Hair object. */
-void BlenderSync::sync_hair(Hair *hair, BObjectInfo &b_ob_info, bool motion, int motion_step)
+void BlenderSync::sync_hair(Hair *hair, BL::Object &b_ob, bool motion, int motion_step)
 {
   /* Convert Blender hair to Cycles curves. */
-  BL::Hair b_hair(b_ob_info.object_data);
+  BL::Hair b_hair(b_ob.data());
   if (motion) {
     export_hair_curves_motion(hair, b_hair, motion_step);
   }
@@ -805,16 +800,16 @@ void BlenderSync::sync_hair(Hair *hair, BObjectInfo &b_ob_info, bool motion, int
   }
 }
 #else
-void BlenderSync::sync_hair(Hair *hair, BObjectInfo &b_ob_info, bool motion, int motion_step)
+void BlenderSync::sync_hair(Hair *hair, BL::Object &b_ob, bool motion, int motion_step)
 {
   (void)hair;
-  (void)b_ob_info;
+  (void)b_ob;
   (void)motion;
   (void)motion_step;
 }
 #endif
 
-void BlenderSync::sync_hair(BL::Depsgraph b_depsgraph, BObjectInfo &b_ob_info, Hair *hair)
+void BlenderSync::sync_hair(BL::Depsgraph b_depsgraph, BL::Object b_ob, Hair *hair)
 {
   /* make a copy of the shaders as the caller in the main thread still need them for syncing the
    * attributes */
@@ -824,19 +819,19 @@ void BlenderSync::sync_hair(BL::Depsgraph b_depsgraph, BObjectInfo &b_ob_info, H
   new_hair.set_used_shaders(used_shaders);
 
   if (view_layer.use_hair) {
-    if (b_ob_info.object_data.is_a(&RNA_Hair)) {
+    if (b_ob.type() == BL::Object::type_HAIR) {
       /* Hair object. */
-      sync_hair(&new_hair, b_ob_info, false);
+      sync_hair(&new_hair, b_ob, false);
     }
     else {
       /* Particle hair. */
       bool need_undeformed = new_hair.need_attribute(scene, ATTR_STD_GENERATED);
       BL::Mesh b_mesh = object_to_mesh(
-          b_data, b_ob_info, b_depsgraph, need_undeformed, Mesh::SUBDIVISION_NONE);
+          b_data, b_ob, b_depsgraph, need_undeformed, Mesh::SUBDIVISION_NONE);
 
       if (b_mesh) {
-        sync_particle_hair(&new_hair, b_mesh, b_ob_info, false);
-        free_object_to_mesh(b_data, b_ob_info, b_mesh);
+        sync_particle_hair(&new_hair, b_mesh, b_ob, false);
+        free_object_to_mesh(b_data, b_ob, b_mesh);
       }
     }
   }
@@ -864,7 +859,7 @@ void BlenderSync::sync_hair(BL::Depsgraph b_depsgraph, BObjectInfo &b_ob_info, H
 }
 
 void BlenderSync::sync_hair_motion(BL::Depsgraph b_depsgraph,
-                                   BObjectInfo &b_ob_info,
+                                   BL::Object b_ob,
                                    Hair *hair,
                                    int motion_step)
 {
@@ -874,19 +869,18 @@ void BlenderSync::sync_hair_motion(BL::Depsgraph b_depsgraph,
   }
 
   /* Export deformed coordinates. */
-  if (ccl::BKE_object_is_deform_modified(b_ob_info, b_scene, preview)) {
-    if (b_ob_info.object_data.is_a(&RNA_Hair)) {
+  if (ccl::BKE_object_is_deform_modified(b_ob, b_scene, preview)) {
+    if (b_ob.type() == BL::Object::type_HAIR) {
       /* Hair object. */
-      sync_hair(hair, b_ob_info, true, motion_step);
+      sync_hair(hair, b_ob, true, motion_step);
       return;
     }
     else {
       /* Particle hair. */
-      BL::Mesh b_mesh = object_to_mesh(
-          b_data, b_ob_info, b_depsgraph, false, Mesh::SUBDIVISION_NONE);
+      BL::Mesh b_mesh = object_to_mesh(b_data, b_ob, b_depsgraph, false, Mesh::SUBDIVISION_NONE);
       if (b_mesh) {
-        sync_particle_hair(hair, b_mesh, b_ob_info, true, motion_step);
-        free_object_to_mesh(b_data, b_ob_info, b_mesh);
+        sync_particle_hair(hair, b_mesh, b_ob, true, motion_step);
+        free_object_to_mesh(b_data, b_ob, b_mesh);
         return;
       }
     }

intern/cycles/blender/blender_geometry.cpp

@@ -29,15 +29,13 @@
 
 CCL_NAMESPACE_BEGIN
 
-static Geometry::Type determine_geom_type(BObjectInfo &b_ob_info, bool use_particle_hair)
+static Geometry::Type determine_geom_type(BL::Object &b_ob, bool use_particle_hair)
 {
-  if (b_ob_info.object_data.is_a(&RNA_Hair) || use_particle_hair) {
+  if (b_ob.type() == BL::Object::type_HAIR || use_particle_hair) {
     return Geometry::HAIR;
   }
 
-  if (b_ob_info.object_data.is_a(&RNA_Volume) ||
-      (b_ob_info.object_data == b_ob_info.real_object.data() &&
-       object_fluid_gas_domain_find(b_ob_info.real_object))) {
+  if (b_ob.type() == BL::Object::type_VOLUME || object_fluid_gas_domain_find(b_ob)) {
     return Geometry::VOLUME;
   }
 
@@ -73,17 +71,20 @@ array<Node *> BlenderSync::find_used_shaders(BL::Object &b_ob)
 }
 
 Geometry *BlenderSync::sync_geometry(BL::Depsgraph &b_depsgraph,
-                                     BObjectInfo &b_ob_info,
+                                     BL::Object &b_ob,
+                                     BL::Object &b_ob_instance,
                                      bool object_updated,
                                      bool use_particle_hair,
                                      TaskPool *task_pool)
 {
   /* Test if we can instance or if the object is modified. */
-  Geometry::Type geom_type = determine_geom_type(b_ob_info, use_particle_hair);
-  GeometryKey key(b_ob_info.object_data, geom_type);
+  BL::ID b_ob_data = b_ob.data();
+  BL::ID b_key_id = (BKE_object_is_modified(b_ob)) ? b_ob_instance : b_ob_data;
+  Geometry::Type geom_type = determine_geom_type(b_ob, use_particle_hair);
+  GeometryKey key(b_key_id.ptr.data, geom_type);
 
   /* Find shader indices. */
-  array<Node *> used_shaders = find_used_shaders(b_ob_info.iter_object);
+  array<Node *> used_shaders = find_used_shaders(b_ob);
 
   /* Ensure we only sync instanced geometry once. */
   Geometry *geom = geometry_map.find(key);
@@ -110,7 +111,7 @@ Geometry *BlenderSync::sync_geometry(BL::Depsgraph &b_depsgraph,
   }
   else {
     /* Test if we need to update existing geometry. */
-    sync = geometry_map.update(geom, b_ob_info.object_data);
+    sync = geometry_map.update(geom, b_key_id);
   }
 
   if (!sync) {
@@ -143,7 +144,7 @@ Geometry *BlenderSync::sync_geometry(BL::Depsgraph &b_depsgraph,
 
   geometry_synced.insert(geom);
 
-  geom->name = ustring(b_ob_info.object_data.name().c_str());
+  geom->name = ustring(b_ob_data.name().c_str());
 
   /* Store the shaders immediately for the object attribute code. */
   geom->set_used_shaders(used_shaders);
@@ -152,19 +153,19 @@ Geometry *BlenderSync::sync_geometry(BL::Depsgraph &b_depsgraph,
     if (progress.get_cancel())
       return;
 
-    progress.set_sync_status("Synchronizing object", b_ob_info.real_object.name());
+    progress.set_sync_status("Synchronizing object", b_ob.name());
 
     if (geom_type == Geometry::HAIR) {
       Hair *hair = static_cast<Hair *>(geom);
-      sync_hair(b_depsgraph, b_ob_info, hair);
+      sync_hair(b_depsgraph, b_ob, hair);
     }
     else if (geom_type == Geometry::VOLUME) {
       Volume *volume = static_cast<Volume *>(geom);
-      sync_volume(b_ob_info, volume);
+      sync_volume(b_ob, volume);
     }
     else {
       Mesh *mesh = static_cast<Mesh *>(geom);
-      sync_mesh(b_depsgraph, b_ob_info, mesh);
+      sync_mesh(b_depsgraph, b_ob, mesh);
     }
   };
 
@@ -180,7 +181,7 @@ Geometry *BlenderSync::sync_geometry(BL::Depsgraph &b_depsgraph,
 }
 
 void BlenderSync::sync_geometry_motion(BL::Depsgraph &b_depsgraph,
-                                       BObjectInfo &b_ob_info,
+                                       BL::Object &b_ob,
                                        Object *object,
                                        float motion_time,
                                        bool use_particle_hair,
@@ -189,10 +190,8 @@ void BlenderSync::sync_geometry_motion(BL::Depsgraph &b_depsgraph,
   /* Ensure we only sync instanced geometry once. */
   Geometry *geom = object->get_geometry();
 
-  if (geometry_motion_synced.find(geom) != geometry_motion_synced.end() ||
-      geometry_motion_attribute_synced.find(geom) != geometry_motion_attribute_synced.end()) {
+  if (geometry_motion_synced.find(geom) != geometry_motion_synced.end())
     return;
-  }
 
   geometry_motion_synced.insert(geom);
 
@@ -211,17 +210,16 @@ void BlenderSync::sync_geometry_motion(BL::Depsgraph &b_depsgraph,
     if (progress.get_cancel())
       return;
 
-    if (b_ob_info.object_data.is_a(&RNA_Hair) || use_particle_hair) {
+    if (b_ob.type() == BL::Object::type_HAIR || use_particle_hair) {
       Hair *hair = static_cast<Hair *>(geom);
-      sync_hair_motion(b_depsgraph, b_ob_info, hair, motion_step);
+      sync_hair_motion(b_depsgraph, b_ob, hair, motion_step);
     }
-    else if (b_ob_info.object_data.is_a(&RNA_Volume) ||
-             object_fluid_gas_domain_find(b_ob_info.real_object)) {
+    else if (b_ob.type() == BL::Object::type_VOLUME || object_fluid_gas_domain_find(b_ob)) {
       /* No volume motion blur support yet. */
     }
     else {
       Mesh *mesh = static_cast<Mesh *>(geom);
-      sync_mesh_motion(b_depsgraph, b_ob_info, mesh, motion_step);
+      sync_mesh_motion(b_depsgraph, b_ob, mesh, motion_step);
     }
   };
 

intern/cycles/blender/blender_image.cpp

@@ -137,9 +137,9 @@ bool BlenderImageLoader::load_pixels(const ImageMetaData &metadata,
       /* Premultiply, byte images are always straight for Blender. */
       unsigned char *cp = (unsigned char *)pixels;
       for (size_t i = 0; i < num_pixels; i++, cp += channels) {
-        cp[0] = (cp[0] * cp[3]) / 255;
-        cp[1] = (cp[1] * cp[3]) / 255;
-        cp[2] = (cp[2] * cp[3]) / 255;
+        cp[0] = (cp[0] * cp[3]) >> 8;
+        cp[1] = (cp[1] * cp[3]) >> 8;
+        cp[2] = (cp[2] * cp[3]) >> 8;
       }
     }
   }

intern/cycles/blender/blender_light.cpp

@@ -27,14 +27,15 @@ CCL_NAMESPACE_BEGIN
 
 void BlenderSync::sync_light(BL::Object &b_parent,
                              int persistent_id[OBJECT_PERSISTENT_ID_SIZE],
-                             BObjectInfo &b_ob_info,
+                             BL::Object &b_ob,
+                             BL::Object &b_ob_instance,
                              int random_id,
                              Transform &tfm,
                              bool *use_portal)
 {
   /* test if we need to sync */
-  ObjectKey key(b_parent, persistent_id, b_ob_info.real_object, false);
-  BL::Light b_light(b_ob_info.object_data);
+  ObjectKey key(b_parent, persistent_id, b_ob_instance, false);
+  BL::Light b_light(b_ob.data());
 
   Light *light = light_map.find(key);
 
@@ -43,7 +44,7 @@ void BlenderSync::sync_light(BL::Object &b_parent,
   const bool tfm_updated = (light && light->get_tfm() != tfm);
 
   /* Update if either object or light data changed. */
-  if (!light_map.add_or_update(&light, b_ob_info.real_object, b_parent, key) && !tfm_updated) {
+  if (!light_map.add_or_update(&light, b_ob, b_parent, key) && !tfm_updated) {
     Shader *shader;
     if (!shader_map.add_or_update(&shader, b_light)) {
       if (light->get_is_portal())
@@ -138,11 +139,11 @@ void BlenderSync::sync_light(BL::Object &b_parent,
 
   light->set_max_bounces(get_int(clight, "max_bounces"));
 
-  if (b_ob_info.real_object != b_ob_info.iter_object) {
+  if (b_ob != b_ob_instance) {
     light->set_random_id(random_id);
   }
   else {
-    light->set_random_id(hash_uint2(hash_string(b_ob_info.real_object.name().c_str()), 0));
+    light->set_random_id(hash_uint2(hash_string(b_ob.name().c_str()), 0));
   }
 
   if (light->get_light_type() == LIGHT_AREA)
@@ -154,7 +155,7 @@ void BlenderSync::sync_light(BL::Object &b_parent,
     *use_portal = true;
 
   /* visibility */
-  uint visibility = object_ray_visibility(b_ob_info.real_object);
+  uint visibility = object_ray_visibility(b_ob);
   light->set_use_diffuse((visibility & PATH_RAY_DIFFUSE) != 0);
   light->set_use_glossy((visibility & PATH_RAY_GLOSSY) != 0);
   light->set_use_transmission((visibility & PATH_RAY_TRANSMIT) != 0);

intern/cycles/blender/blender_mesh.cpp

@@ -347,57 +347,16 @@ static void fill_generic_attribute(BL::Mesh &b_mesh,
   }
 }
 
-static void attr_create_motion(Mesh *mesh, BL::Attribute &b_attribute, const float motion_scale)
-{
-  if (!(b_attribute.domain() == BL::Attribute::domain_POINT) &&
-      (b_attribute.data_type() == BL::Attribute::data_type_FLOAT_VECTOR)) {
-    return;
-  }
-
-  BL::FloatVectorAttribute b_vector_attribute(b_attribute);
-  const int numverts = mesh->get_verts().size();
-
-  /* Find or add attribute */
-  float3 *P = &mesh->get_verts()[0];
-  Attribute *attr_mP = mesh->attributes.find(ATTR_STD_MOTION_VERTEX_POSITION);
-
-  if (!attr_mP) {
-    attr_mP = mesh->attributes.add(ATTR_STD_MOTION_VERTEX_POSITION);
-  }
-
-  /* Only export previous and next frame, we don't have any in between data. */
-  float motion_times[2] = {-1.0f, 1.0f};
-  for (int step = 0; step < 2; step++) {
-    const float relative_time = motion_times[step] * 0.5f * motion_scale;
-    float3 *mP = attr_mP->data_float3() + step * numverts;
-
-    for (int i = 0; i < numverts; i++) {
-      mP[i] = P[i] + get_float3(b_vector_attribute.data[i].vector()) * relative_time;
-    }
-  }
-}
-
-static void attr_create_generic(Scene *scene,
-                                Mesh *mesh,
-                                BL::Mesh &b_mesh,
-                                const bool subdivision,
-                                const bool need_motion,
-                                const float motion_scale)
+static void attr_create_generic(Scene *scene, Mesh *mesh, BL::Mesh &b_mesh, bool subdivision)
 {
   if (subdivision) {
     /* TODO: Handle subdivision correctly. */
     return;
   }
   AttributeSet &attributes = mesh->attributes;
-  static const ustring u_velocity("velocity");
 
   for (BL::Attribute &b_attribute : b_mesh.attributes) {
     const ustring name{b_attribute.name().c_str()};
-
-    if (need_motion && name == u_velocity) {
-      attr_create_motion(mesh, b_attribute, motion_scale);
-    }
-
     if (!mesh->need_attribute(scene, name)) {
       continue;
     }
@@ -900,10 +859,8 @@ static void create_mesh(Scene *scene,
                         Mesh *mesh,
                         BL::Mesh &b_mesh,
                         const array<Node *> &used_shaders,
-                        const bool need_motion,
-                        const float motion_scale,
-                        const bool subdivision = false,
-                        const bool subdivide_uvs = true)
+                        bool subdivision = false,
+                        bool subdivide_uvs = true)
 {
   /* count vertices and faces */
   int numverts = b_mesh.vertices.length();
@@ -1017,7 +974,7 @@ static void create_mesh(Scene *scene,
   attr_create_vertex_color(scene, mesh, b_mesh, subdivision);
   attr_create_sculpt_vertex_color(scene, mesh, b_mesh, subdivision);
   attr_create_random_per_island(scene, mesh, b_mesh, subdivision);
-  attr_create_generic(scene, mesh, b_mesh, subdivision, need_motion, motion_scale);
+  attr_create_generic(scene, mesh, b_mesh, subdivision);
 
   if (subdivision) {
     attr_create_subd_uv_map(scene, mesh, b_mesh, subdivide_uvs);
@@ -1042,20 +999,16 @@ static void create_mesh(Scene *scene,
 
 static void create_subd_mesh(Scene *scene,
                              Mesh *mesh,
-                             BObjectInfo &b_ob_info,
+                             BL::Object &b_ob,
                              BL::Mesh &b_mesh,
                              const array<Node *> &used_shaders,
-                             const bool need_motion,
-                             const float motion_scale,
                              float dicing_rate,
                              int max_subdivisions)
 {
-  BL::Object b_ob = b_ob_info.real_object;
-
   BL::SubsurfModifier subsurf_mod(b_ob.modifiers[b_ob.modifiers.length() - 1]);
   bool subdivide_uvs = subsurf_mod.uv_smooth() != BL::SubsurfModifier::uv_smooth_NONE;
 
-  create_mesh(scene, mesh, b_mesh, used_shaders, need_motion, motion_scale, true, subdivide_uvs);
+  create_mesh(scene, mesh, b_mesh, used_shaders, true, subdivide_uvs);
 
   /* export creases */
   size_t num_creases = 0;
@@ -1085,41 +1038,107 @@ static void create_subd_mesh(Scene *scene,
 
 /* Sync */
 
-/* Check whether some of "built-in" motion-related attributes are needed to be exported (includes
- * things like velocity from cache modifier, fluid simulation).
- *
- * NOTE: This code is run prior to object motion blur initialization. so can not access properties
- * set by `sync_object_motion_init()`. */
-static bool mesh_need_motion_attribute(BObjectInfo &b_ob_info, Scene *scene)
+static BL::MeshSequenceCacheModifier object_mesh_cache_find(BL::Object &b_ob)
 {
-  const Scene::MotionType need_motion = scene->need_motion();
-  if (need_motion == Scene::MOTION_NONE) {
-    /* Simple case: neither motion pass nor motion blur is needed, no need in the motion related
-     * attributes. */
-    return false;
-  }
+  if (b_ob.modifiers.length() > 0) {
+    BL::Modifier b_mod = b_ob.modifiers[b_ob.modifiers.length() - 1];
 
-  if (need_motion == Scene::MOTION_BLUR) {
-    /* A bit tricky and implicit case:
-     * - Motion blur is enabled in the scene, which implies specific number of time steps for
-     *   objects.
-     * - If the object has motion blur disabled on it, it will have 0 time steps.
-     * - Motion attribute expects non-zero time steps.
-     *
-     * Avoid adding motion attributes if the motion blur will enforce 0 motion steps. */
-    PointerRNA cobject = RNA_pointer_get(&b_ob_info.real_object.ptr, "cycles");
-    const bool use_motion = get_boolean(cobject, "use_motion_blur");
-    if (!use_motion) {
-      return false;
+    if (b_mod.type() == BL::Modifier::type_MESH_SEQUENCE_CACHE) {
+      BL::MeshSequenceCacheModifier mesh_cache = BL::MeshSequenceCacheModifier(b_mod);
+
+      if (MeshSequenceCacheModifier_has_velocity_get(&mesh_cache.ptr)) {
+        return mesh_cache;
+      }
     }
   }
 
-  /* Motion pass which implies 3 motion steps, or motion blur which is not disabled on object
-   * level. */
-  return true;
+  return BL::MeshSequenceCacheModifier(PointerRNA_NULL);
 }
 
-void BlenderSync::sync_mesh(BL::Depsgraph b_depsgraph, BObjectInfo &b_ob_info, Mesh *mesh)
+static void sync_mesh_cached_velocities(BL::Object &b_ob, Scene *scene, Mesh *mesh)
+{
+  if (scene->need_motion() == Scene::MOTION_NONE)
+    return;
+
+  BL::MeshSequenceCacheModifier b_mesh_cache = object_mesh_cache_find(b_ob);
+
+  if (!b_mesh_cache) {
+    return;
+  }
+
+  if (!MeshSequenceCacheModifier_read_velocity_get(&b_mesh_cache.ptr)) {
+    return;
+  }
+
+  const size_t numverts = mesh->get_verts().size();
+
+  if (b_mesh_cache.vertex_velocities.length() != numverts) {
+    return;
+  }
+
+  /* Find or add attribute */
+  float3 *P = &mesh->get_verts()[0];
+  Attribute *attr_mP = mesh->attributes.find(ATTR_STD_MOTION_VERTEX_POSITION);
+
+  if (!attr_mP) {
+    attr_mP = mesh->attributes.add(ATTR_STD_MOTION_VERTEX_POSITION);
+  }
+
+  /* Only export previous and next frame, we don't have any in between data. */
+  float motion_times[2] = {-1.0f, 1.0f};
+  for (int step = 0; step < 2; step++) {
+    const float relative_time = motion_times[step] * scene->motion_shutter_time() * 0.5f;
+    float3 *mP = attr_mP->data_float3() + step * numverts;
+
+    BL::MeshSequenceCacheModifier::vertex_velocities_iterator vvi;
+    int i = 0;
+
+    for (b_mesh_cache.vertex_velocities.begin(vvi); vvi != b_mesh_cache.vertex_velocities.end();
+         ++vvi, ++i) {
+      mP[i] = P[i] + get_float3(vvi->velocity()) * relative_time;
+    }
+  }
+}
+
+static void sync_mesh_fluid_motion(BL::Object &b_ob, Scene *scene, Mesh *mesh)
+{
+  if (scene->need_motion() == Scene::MOTION_NONE)
+    return;
+
+  BL::FluidDomainSettings b_fluid_domain = object_fluid_liquid_domain_find(b_ob);
+
+  if (!b_fluid_domain)
+    return;
+
+  /* If the mesh has modifiers following the fluid domain we can't export motion. */
+  if (b_fluid_domain.mesh_vertices.length() != mesh->get_verts().size())
+    return;
+
+  /* Find or add attribute */
+  float3 *P = &mesh->get_verts()[0];
+  Attribute *attr_mP = mesh->attributes.find(ATTR_STD_MOTION_VERTEX_POSITION);
+
+  if (!attr_mP) {
+    attr_mP = mesh->attributes.add(ATTR_STD_MOTION_VERTEX_POSITION);
+  }
+
+  /* Only export previous and next frame, we don't have any in between data. */
+  float motion_times[2] = {-1.0f, 1.0f};
+  for (int step = 0; step < 2; step++) {
+    float relative_time = motion_times[step] * scene->motion_shutter_time() * 0.5f;
+    float3 *mP = attr_mP->data_float3() + step * mesh->get_verts().size();
+
+    BL::FluidDomainSettings::mesh_vertices_iterator svi;
+    int i = 0;
+
+    for (b_fluid_domain.mesh_vertices.begin(svi); svi != b_fluid_domain.mesh_vertices.end();
+         ++svi, ++i) {
+      mP[i] = P[i] + get_float3(svi->velocity()) * relative_time;
+    }
+  }
+}
+
+void BlenderSync::sync_mesh(BL::Depsgraph b_depsgraph, BL::Object b_ob, Mesh *mesh)
 {
   /* make a copy of the shaders as the caller in the main thread still need them for syncing the
    * attributes */
@@ -1132,47 +1151,37 @@ void BlenderSync::sync_mesh(BL::Depsgraph b_depsgraph, BObjectInfo &b_ob_info, M
     /* Adaptive subdivision setup. Not for baking since that requires
      * exact mapping to the Blender mesh. */
     if (!scene->bake_manager->get_baking()) {
-      new_mesh.set_subdivision_type(
-          object_subdivision_type(b_ob_info.real_object, preview, experimental));
+      new_mesh.set_subdivision_type(object_subdivision_type(b_ob, preview, experimental));
     }
 
     /* For some reason, meshes do not need this... */
     bool need_undeformed = new_mesh.need_attribute(scene, ATTR_STD_GENERATED);
     BL::Mesh b_mesh = object_to_mesh(
-        b_data, b_ob_info, b_depsgraph, need_undeformed, new_mesh.get_subdivision_type());
+        b_data, b_ob, b_depsgraph, need_undeformed, new_mesh.get_subdivision_type());
 
     if (b_mesh) {
-      /* Motion blur attribute is relative to seconds, we need it relative to frames. */
-      const bool need_motion = mesh_need_motion_attribute(b_ob_info, scene);
-      const float motion_scale = (need_motion) ?
-                                     scene->motion_shutter_time() /
-                                         (b_scene.render().fps() / b_scene.render().fps_base()) :
-                                     0.0f;
-
       /* Sync mesh itself. */
       if (new_mesh.get_subdivision_type() != Mesh::SUBDIVISION_NONE)
         create_subd_mesh(scene,
                          &new_mesh,
-                         b_ob_info,
+                         b_ob,
                          b_mesh,
                          new_mesh.get_used_shaders(),
-                         need_motion,
-                         motion_scale,
                          dicing_rate,
                          max_subdivisions);
       else
-        create_mesh(scene,
-                    &new_mesh,
-                    b_mesh,
-                    new_mesh.get_used_shaders(),
-                    need_motion,
-                    motion_scale,
-                    false);
+        create_mesh(scene, &new_mesh, b_mesh, new_mesh.get_used_shaders(), false);
 
-      free_object_to_mesh(b_data, b_ob_info, b_mesh);
+      free_object_to_mesh(b_data, b_ob, b_mesh);
     }
   }
 
+  /* cached velocities (e.g. from alembic archive) */
+  sync_mesh_cached_velocities(b_ob, scene, &new_mesh);
+
+  /* mesh fluid motion mantaflow */
+  sync_mesh_fluid_motion(b_ob, scene, &new_mesh);
+
   /* update original sockets */
 
   mesh->clear_non_sockets();
@@ -1202,10 +1211,22 @@ void BlenderSync::sync_mesh(BL::Depsgraph b_depsgraph, BObjectInfo &b_ob_info, M
 }
 
 void BlenderSync::sync_mesh_motion(BL::Depsgraph b_depsgraph,
-                                   BObjectInfo &b_ob_info,
+                                   BL::Object b_ob,
                                    Mesh *mesh,
                                    int motion_step)
 {
+  /* Fluid motion blur already exported. */
+  BL::FluidDomainSettings b_fluid_domain = object_fluid_liquid_domain_find(b_ob);
+  if (b_fluid_domain) {
+    return;
+  }
+
+  /* Cached motion blur already exported. */
+  BL::MeshSequenceCacheModifier mesh_cache = object_mesh_cache_find(b_ob);
+  if (mesh_cache) {
+    return;
+  }
+
   /* Skip if no vertices were exported. */
   size_t numverts = mesh->get_verts().size();
   if (numverts == 0) {
@@ -1215,13 +1236,11 @@ void BlenderSync::sync_mesh_motion(BL::Depsgraph b_depsgraph,
   /* Skip objects without deforming modifiers. this is not totally reliable,
    * would need a more extensive check to see which objects are animated. */
   BL::Mesh b_mesh(PointerRNA_NULL);
-  if (ccl::BKE_object_is_deform_modified(b_ob_info, b_scene, preview)) {
+  if (ccl::BKE_object_is_deform_modified(b_ob, b_scene, preview)) {
     /* get derived mesh */
-    b_mesh = object_to_mesh(b_data, b_ob_info, b_depsgraph, false, Mesh::SUBDIVISION_NONE);
+    b_mesh = object_to_mesh(b_data, b_ob, b_depsgraph, false, Mesh::SUBDIVISION_NONE);
   }
 
-  const std::string ob_name = b_ob_info.real_object.name();
-
   /* TODO(sergey): Perform preliminary check for number of vertices. */
   if (b_mesh) {
     /* Export deformed coordinates. */
@@ -1257,17 +1276,17 @@ void BlenderSync::sync_mesh_motion(BL::Depsgraph b_depsgraph,
           memcmp(mP, &mesh->get_verts()[0], sizeof(float3) * numverts) == 0) {
         /* no motion, remove attributes again */
         if (b_mesh.vertices.length() != numverts) {
-          VLOG(1) << "Topology differs, disabling motion blur for object " << ob_name;
+          VLOG(1) << "Topology differs, disabling motion blur for object " << b_ob.name();
         }
         else {
-          VLOG(1) << "No actual deformation motion for object " << ob_name;
+          VLOG(1) << "No actual deformation motion for object " << b_ob.name();
         }
         mesh->attributes.remove(ATTR_STD_MOTION_VERTEX_POSITION);
         if (attr_mN)
           mesh->attributes.remove(ATTR_STD_MOTION_VERTEX_NORMAL);
       }
       else if (motion_step > 0) {
-        VLOG(1) << "Filling deformation motion for object " << ob_name;
+        VLOG(1) << "Filling deformation motion for object " << b_ob.name();
         /* motion, fill up previous steps that we might have skipped because
          * they had no motion, but we need them anyway now */
         float3 *P = &mesh->get_verts()[0];
@@ -1281,8 +1300,8 @@ void BlenderSync::sync_mesh_motion(BL::Depsgraph b_depsgraph,
     }
     else {
       if (b_mesh.vertices.length() != numverts) {
-        VLOG(1) << "Topology differs, discarding motion blur for object " << ob_name << " at time "
-                << motion_step;
+        VLOG(1) << "Topology differs, discarding motion blur for object " << b_ob.name()
+                << " at time " << motion_step;
         memcpy(mP, &mesh->get_verts()[0], sizeof(float3) * numverts);
         if (mN != NULL) {
           memcpy(mN, attr_N->data_float3(), sizeof(float3) * numverts);
@@ -1290,7 +1309,7 @@ void BlenderSync::sync_mesh_motion(BL::Depsgraph b_depsgraph,
       }
     }
 
-    free_object_to_mesh(b_data, b_ob_info, b_mesh);
+    free_object_to_mesh(b_data, b_ob, b_mesh);
     return;
   }
 

intern/cycles/blender/blender_object.cpp

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include "render/alembic.h"
 #include "render/camera.h"
 #include "render/graph.h"
 #include "render/integrator.h"
@@ -110,23 +109,23 @@ void BlenderSync::sync_object_motion_init(BL::Object &b_parent, BL::Object &b_ob
   }
 
   Geometry *geom = object->get_geometry();
+  geom->set_use_motion_blur(false);
+  geom->set_motion_steps(0);
 
-  int motion_steps = 0;
-  bool use_motion_blur = false;
+  uint motion_steps;
 
   if (need_motion == Scene::MOTION_BLUR) {
     motion_steps = object_motion_steps(b_parent, b_ob, Object::MAX_MOTION_STEPS);
+    geom->set_motion_steps(motion_steps);
     if (motion_steps && object_use_deform_motion(b_parent, b_ob)) {
-      use_motion_blur = true;
+      geom->set_use_motion_blur(true);
     }
   }
   else {
     motion_steps = 3;
+    geom->set_motion_steps(motion_steps);
   }
 
-  geom->set_use_motion_blur(use_motion_blur);
-  geom->set_motion_steps(motion_steps);
-
   motion.resize(motion_steps, transform_empty());
 
   if (motion_steps) {
@@ -154,7 +153,7 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph,
   const bool is_instance = b_instance.is_instance();
   BL::Object b_ob = b_instance.object();
   BL::Object b_parent = is_instance ? b_instance.parent() : b_instance.object();
-  BObjectInfo b_ob_info{b_ob, is_instance ? b_instance.instance_object() : b_ob, b_ob.data()};
+  BL::Object b_ob_instance = is_instance ? b_instance.instance_object() : b_ob;
   const bool motion = motion_time != 0.0f;
   /*const*/ Transform tfm = get_transform(b_ob.matrix_world());
   int *persistent_id = NULL;
@@ -178,7 +177,8 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph,
     {
       sync_light(b_parent,
                  persistent_id,
-                 b_ob_info,
+                 b_ob,
+                 b_ob_instance,
                  is_instance ? b_instance.random_id() : 0,
                  tfm,
                  use_portal);
@@ -199,7 +199,8 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph,
 
   /* Visibility flags for both parent and child. */
   PointerRNA cobject = RNA_pointer_get(&b_ob.ptr, "cycles");
-  bool use_holdout = b_parent.holdout_get(PointerRNA_NULL, b_view_layer);
+  bool use_holdout = get_boolean(cobject, "is_holdout") ||
+                     b_parent.holdout_get(PointerRNA_NULL, b_view_layer);
   uint visibility = object_ray_visibility(b_ob) & PATH_RAY_ALL_VISIBILITY;
 
   if (b_parent.ptr.data != b_ob.ptr.data) {
@@ -230,7 +231,7 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph,
   TaskPool *object_geom_task_pool = (is_instance) ? NULL : geom_task_pool;
 
   /* key to lookup object */
-  ObjectKey key(b_parent, persistent_id, b_ob_info.real_object, use_particle_hair);
+  ObjectKey key(b_parent, persistent_id, b_ob_instance, use_particle_hair);
   Object *object;
 
   /* motion vector case */
@@ -248,8 +249,12 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph,
 
       /* mesh deformation */
       if (object->get_geometry())
-        sync_geometry_motion(
-            b_depsgraph, b_ob_info, object, motion_time, use_particle_hair, object_geom_task_pool);
+        sync_geometry_motion(b_depsgraph,
+                             b_ob_instance,
+                             object,
+                             motion_time,
+                             use_particle_hair,
+                             object_geom_task_pool);
     }
 
     return object;
@@ -260,8 +265,15 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph,
                         (tfm != object->get_tfm());
 
   /* mesh sync */
-  Geometry *geometry = sync_geometry(
-      b_depsgraph, b_ob_info, object_updated, use_particle_hair, object_geom_task_pool);
+  /* b_ob is owned by the iterator and will go out of scope at the end of the block.
+   * b_ob_instance is the original object and will remain valid for deferred geometry
+   * sync. */
+  Geometry *geometry = sync_geometry(b_depsgraph,
+                                     b_ob_instance,
+                                     b_ob_instance,
+                                     object_updated,
+                                     use_particle_hair,
+                                     object_geom_task_pool);
   object->set_geometry(geometry);
 
   /* special case not tracked by object update flags */
@@ -275,7 +287,8 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph,
 
   object->set_visibility(visibility);
 
-  object->set_is_shadow_catcher(b_ob.is_shadow_catcher());
+  bool is_shadow_catcher = get_boolean(cobject, "is_shadow_catcher");
+  object->set_is_shadow_catcher(is_shadow_catcher);
 
   float shadow_terminator_shading_offset = get_float(cobject, "shadow_terminator_offset");
   object->set_shadow_terminator_shading_offset(shadow_terminator_shading_offset);
@@ -284,13 +297,6 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph,
                                                       "shadow_terminator_geometry_offset");
   object->set_shadow_terminator_geometry_offset(shadow_terminator_geometry_offset);
 
-  float ao_distance = get_float(cobject, "ao_distance");
-  if (ao_distance == 0.0f && b_parent.ptr.data != b_ob.ptr.data) {
-    PointerRNA cparent = RNA_pointer_get(&b_parent.ptr, "cycles");
-    ao_distance = get_float(cparent, "ao_distance");
-  }
-  object->set_ao_distance(ao_distance);
-
   /* sync the asset name for Cryptomatte */
   BL::Object parent = b_ob.parent();
   ustring parent_name;
@@ -364,7 +370,7 @@ static bool lookup_property(BL::ID b_id, const string &name, float4 *r_value)
     if (type == PROP_FLOAT)
       value = RNA_property_float_get(&ptr, prop);
     else if (type == PROP_INT)
-      value = static_cast<float>(RNA_property_int_get(&ptr, prop));
+      value = RNA_property_int_get(&ptr, prop);
     else
       return false;
 
@@ -473,72 +479,6 @@ bool BlenderSync::sync_object_attributes(BL::DepsgraphObjectInstance &b_instance
 
 /* Object Loop */
 
-void BlenderSync::sync_procedural(BL::Object &b_ob,
-                                  BL::MeshSequenceCacheModifier &b_mesh_cache,
-                                  bool has_subdivision_modifier)
-{
-#ifdef WITH_ALEMBIC
-  BL::CacheFile cache_file = b_mesh_cache.cache_file();
-  void *cache_file_key = cache_file.ptr.data;
-
-  AlembicProcedural *procedural = static_cast<AlembicProcedural *>(
-      procedural_map.find(cache_file_key));
-
-  if (procedural == nullptr) {
-    procedural = scene->create_node<AlembicProcedural>();
-    procedural_map.add(cache_file_key, procedural);
-  }
-  else {
-    procedural_map.used(procedural);
-  }
-
-  float current_frame = static_cast<float>(b_scene.frame_current());
-  if (cache_file.override_frame()) {
-    current_frame = cache_file.frame();
-  }
-
-  if (!cache_file.override_frame()) {
-    procedural->set_start_frame(static_cast<float>(b_scene.frame_start()));
-    procedural->set_end_frame(static_cast<float>(b_scene.frame_end()));
-  }
-
-  procedural->set_frame(current_frame);
-  procedural->set_frame_rate(b_scene.render().fps() / b_scene.render().fps_base());
-  procedural->set_frame_offset(cache_file.frame_offset());
-
-  string absolute_path = blender_absolute_path(b_data, b_ob, b_mesh_cache.cache_file().filepath());
-  procedural->set_filepath(ustring(absolute_path));
-
-  procedural->set_scale(cache_file.scale());
-
-  procedural->set_use_prefetch(cache_file.use_prefetch());
-  procedural->set_prefetch_cache_size(cache_file.prefetch_cache_size());
-
-  /* create or update existing AlembicObjects */
-  ustring object_path = ustring(b_mesh_cache.object_path());
-
-  AlembicObject *abc_object = procedural->get_or_create_object(object_path);
-
-  array<Node *> used_shaders = find_used_shaders(b_ob);
-  abc_object->set_used_shaders(used_shaders);
-
-  PointerRNA cobj = RNA_pointer_get(&b_ob.ptr, "cycles");
-  const float subd_dicing_rate = max(0.1f, RNA_float_get(&cobj, "dicing_rate") * dicing_rate);
-  abc_object->set_subd_dicing_rate(subd_dicing_rate);
-  abc_object->set_subd_max_level(max_subdivisions);
-
-  abc_object->set_ignore_subdivision(!has_subdivision_modifier);
-
-  if (abc_object->is_modified() || procedural->is_modified()) {
-    procedural->tag_update(scene);
-  }
-#else
-  (void)b_ob;
-  (void)b_mesh_cache;
-  (void)has_subdivision_modifier;
-#endif
-}
-
 void BlenderSync::sync_objects(BL::Depsgraph &b_depsgraph,
                                BL::SpaceView3D &b_v3d,
                                float motion_time)
@@ -554,7 +494,6 @@ void BlenderSync::sync_objects(BL::Depsgraph &b_depsgraph,
     light_map.pre_sync();
     geometry_map.pre_sync();
     object_map.pre_sync();
-    procedural_map.pre_sync();
     particle_system_map.pre_sync();
     motion_times.clear();
   }
@@ -595,39 +534,15 @@ void BlenderSync::sync_objects(BL::Depsgraph &b_depsgraph,
 
     /* Object itself. */
     if (b_instance.show_self()) {
-#ifdef WITH_ALEMBIC
-      bool use_procedural = false;
-      bool has_subdivision_modifier = false;
-      BL::MeshSequenceCacheModifier b_mesh_cache(PointerRNA_NULL);
-
-      /* Experimental as Blender does not have good support for procedurals at the moment, also
-       * only available in preview renders since currently do not have a good cache policy, the
-       * data being loaded at once for all the frames. */
-      if (experimental && b_v3d) {
-        b_mesh_cache = object_mesh_cache_find(b_ob, &has_subdivision_modifier);
-        use_procedural = b_mesh_cache && b_mesh_cache.cache_file().use_render_procedural();
-      }
-
-      if (use_procedural) {
-        /* Skip in the motion case, as generating motion blur data will be handled in the
-         * procedural. */
-        if (!motion) {
-          sync_procedural(b_ob, b_mesh_cache, has_subdivision_modifier);
-        }
-      }
-      else
-#endif
-      {
-        sync_object(b_depsgraph,
-                    b_view_layer,
-                    b_instance,
-                    motion_time,
-                    false,
-                    show_lights,
-                    culling,
-                    &use_portal,
-                    sync_hair ? NULL : &geom_task_pool);
-      }
+      sync_object(b_depsgraph,
+                  b_view_layer,
+                  b_instance,
+                  motion_time,
+                  false,
+                  show_lights,
+                  culling,
+                  &use_portal,
+                  sync_hair ? NULL : &geom_task_pool);
     }
 
     /* Particle hair as separate object. */
@@ -660,7 +575,6 @@ void BlenderSync::sync_objects(BL::Depsgraph &b_depsgraph,
     object_map.post_sync();
     geometry_map.post_sync();
     particle_system_map.post_sync();
-    procedural_map.post_sync();
   }
 
   if (motion)
@@ -719,14 +633,6 @@ void BlenderSync::sync_motion(BL::RenderSettings &b_render,
     }
   }
 
-  /* Check which geometry already has motion blur so it can be skipped. */
-  geometry_motion_attribute_synced.clear();
-  for (Geometry *geom : scene->geometry) {
-    if (geom->attributes.find(ATTR_STD_MOTION_VERTEX_POSITION)) {
-      geometry_motion_attribute_synced.insert(geom);
-    }
-  }
-
   /* note iteration over motion_times set happens in sorted order */
   foreach (float relative_time, motion_times) {
     /* center time is already handled. */
@@ -757,8 +663,6 @@ void BlenderSync::sync_motion(BL::RenderSettings &b_render,
     sync_objects(b_depsgraph, b_v3d, relative_time);
   }
 
-  geometry_motion_attribute_synced.clear();
-
   /* we need to set the python thread state again because this
    * function assumes it is being executed from python and will
    * try to save the thread state */

intern/cycles/blender/blender_particles.cpp

@@ -71,7 +71,7 @@ bool BlenderSync::sync_dupli_particle(BL::Object &b_ob,
   Particle pa;
 
   pa.index = persistent_id[0];
-  pa.age = b_scene.frame_current_final() - b_pa.birth_time();
+  pa.age = b_scene.frame_current() - b_pa.birth_time();
   pa.lifetime = b_pa.lifetime();
   pa.location = get_float3(b_pa.location());
   pa.rotation = get_float4(b_pa.rotation());

intern/cycles/blender/blender_python.cpp

@@ -487,24 +487,6 @@ static PyObject *osl_update_node_func(PyObject * /*self*/, PyObject *args)
     if (param->varlenarray || param->isstruct || param->type.arraylen > 1)
       continue;
 
-    /* Read metadata. */
-    bool is_bool_param = false;
-    ustring param_label = param->name;
-
-    for (const OSL::OSLQuery::Parameter &metadata : param->metadata) {
-      if (metadata.type == TypeDesc::STRING) {
-        if (metadata.name == "widget") {
-          /* Boolean socket. */
-          if (metadata.sdefault[0] == "boolean" || metadata.sdefault[0] == "checkBox") {
-            is_bool_param = true;
-          }
-        }
-        else if (metadata.name == "label") {
-          /* Socket label. */
-          param_label = metadata.sdefault[0];
-        }
-      }
-    }
     /* determine socket type */
     string socket_type;
     BL::NodeSocket::type_enum data_type = BL::NodeSocket::type_VALUE;
@@ -512,7 +494,6 @@ static PyObject *osl_update_node_func(PyObject * /*self*/, PyObject *args)
     float default_float = 0.0f;
     int default_int = 0;
     string default_string = "";
-    bool default_boolean = false;
 
     if (param->isclosure) {
       socket_type = "NodeSocketShader";
@@ -542,19 +523,10 @@ static PyObject *osl_update_node_func(PyObject * /*self*/, PyObject *args)
     }
     else if (param->type.aggregate == TypeDesc::SCALAR) {
       if (param->type.basetype == TypeDesc::INT) {
-        if (is_bool_param) {
-          socket_type = "NodeSocketBool";
-          data_type = BL::NodeSocket::type_BOOLEAN;
-          if (param->validdefault) {
-            default_boolean = (bool)param->idefault[0];
-          }
-        }
-        else {
-          socket_type = "NodeSocketInt";
-          data_type = BL::NodeSocket::type_INT;
-          if (param->validdefault)
-            default_int = param->idefault[0];
-        }
+        socket_type = "NodeSocketInt";
+        data_type = BL::NodeSocket::type_INT;
+        if (param->validdefault)
+          default_int = param->idefault[0];
       }
       else if (param->type.basetype == TypeDesc::FLOAT) {
         socket_type = "NodeSocketFloat";
@@ -574,57 +546,33 @@ static PyObject *osl_update_node_func(PyObject * /*self*/, PyObject *args)
     else
       continue;
 
-    /* Update existing socket. */
-    bool found_existing = false;
+    /* find socket socket */
+    BL::NodeSocket b_sock(PointerRNA_NULL);
     if (param->isoutput) {
-      for (BL::NodeSocket &b_sock : b_node.outputs) {
-        if (b_sock.identifier() == param->name) {
-          if (b_sock.bl_idname() != socket_type) {
-            /* Remove if type no longer matches. */
-            b_node.outputs.remove(b_data, b_sock);
-          }
-          else {
-            /* Reuse and update label. */
-            if (b_sock.name() != param_label) {
-              b_sock.name(param_label.string());
-            }
-            used_sockets.insert(b_sock.ptr.data);
-            found_existing = true;
-          }
-          break;
-        }
+      b_sock = b_node.outputs[param->name.string()];
+      /* remove if type no longer matches */
+      if (b_sock && b_sock.bl_idname() != socket_type) {
+        b_node.outputs.remove(b_data, b_sock);
+        b_sock = BL::NodeSocket(PointerRNA_NULL);
       }
     }
     else {
-      for (BL::NodeSocket &b_sock : b_node.inputs) {
-        if (b_sock.identifier() == param->name) {
-          if (b_sock.bl_idname() != socket_type) {
-            /* Remove if type no longer matches. */
-            b_node.inputs.remove(b_data, b_sock);
-          }
-          else {
-            /* Reuse and update label. */
-            if (b_sock.name() != param_label) {
-              b_sock.name(param_label.string());
-            }
-            used_sockets.insert(b_sock.ptr.data);
-            found_existing = true;
-          }
-          break;
-        }
+      b_sock = b_node.inputs[param->name.string()];
+      /* remove if type no longer matches */
+      if (b_sock && b_sock.bl_idname() != socket_type) {
+        b_node.inputs.remove(b_data, b_sock);
+        b_sock = BL::NodeSocket(PointerRNA_NULL);
       }
     }
 
-    if (!found_existing) {
-      /* Create new socket. */
-      BL::NodeSocket b_sock = (param->isoutput) ? b_node.outputs.create(b_data,
-                                                                        socket_type.c_str(),
-                                                                        param_label.c_str(),
-                                                                        param->name.c_str()) :
-                                                  b_node.inputs.create(b_data,
-                                                                       socket_type.c_str(),
-                                                                       param_label.c_str(),
-                                                                       param->name.c_str());
+    if (!b_sock) {
+      /* create new socket */
+      if (param->isoutput)
+        b_sock = b_node.outputs.create(
+            b_data, socket_type.c_str(), param->name.c_str(), param->name.c_str());
+      else
+        b_sock = b_node.inputs.create(
+            b_data, socket_type.c_str(), param->name.c_str(), param->name.c_str());
 
       /* set default value */
       if (data_type == BL::NodeSocket::type_VALUE) {
@@ -642,12 +590,9 @@ static PyObject *osl_update_node_func(PyObject * /*self*/, PyObject *args)
       else if (data_type == BL::NodeSocket::type_STRING) {
         set_string(b_sock.ptr, "default_value", default_string);
       }
-      else if (data_type == BL::NodeSocket::type_BOOLEAN) {
-        set_boolean(b_sock.ptr, "default_value", default_boolean);
-      }
-
-      used_sockets.insert(b_sock.ptr.data);
     }
+
+    used_sockets.insert(b_sock.ptr.data);
   }
 
   /* remove unused parameters */
@@ -1153,6 +1098,14 @@ void *CCL_python_module_init()
   PyModule_AddStringConstant(mod, "osl_version_string", "unknown");
 #endif
 
+#ifdef WITH_CYCLES_DEBUG
+  PyModule_AddObject(mod, "with_cycles_debug", Py_True);
+  Py_INCREF(Py_True);
+#else
+  PyModule_AddObject(mod, "with_cycles_debug", Py_False);
+  Py_INCREF(Py_False);
+#endif
+
 #ifdef WITH_NETWORK
   PyModule_AddObject(mod, "with_network", Py_True);
   Py_INCREF(Py_True);

intern/cycles/blender/blender_shader.cpp

@@ -149,7 +149,7 @@ BlenderAttributeType blender_attribute_name_split_type(ustring name, string *r_r
 static BL::NodeSocket get_node_output(BL::Node &b_node, const string &name)
 {
   for (BL::NodeSocket &b_out : b_node.outputs) {
-    if (b_out.identifier() == name) {
+    if (b_out.name() == name) {
       return b_out;
     }
   }
@@ -215,12 +215,7 @@ static void set_default_value(ShaderInput *input,
       break;
     }
     case SocketType::INT: {
-      if (b_sock.type() == BL::NodeSocket::type_BOOLEAN) {
-        node->set(socket, get_boolean(b_sock.ptr, "default_value"));
-      }
-      else {
-        node->set(socket, get_int(b_sock.ptr, "default_value"));
-      }
+      node->set(socket, get_int(b_sock.ptr, "default_value"));
       break;
     }
     case SocketType::COLOR: {
@@ -1007,59 +1002,71 @@ static bool node_use_modified_socket_name(ShaderNode *node)
   return true;
 }
 
-static ShaderInput *node_find_input_by_name(ShaderNode *node, BL::NodeSocket &b_socket)
+static ShaderInput *node_find_input_by_name(ShaderNode *node,
+                                            BL::Node &b_node,
+                                            BL::NodeSocket &b_socket)
 {
-  string name = b_socket.identifier();
-  ShaderInput *input = node->input(name.c_str());
+  string name = b_socket.name();
 
-  if (!input && node_use_modified_socket_name(node)) {
-    /* Different internal name for shader. */
-    if (string_startswith(name, "Shader")) {
-      string_replace(name, "Shader", "Closure");
+  if (node_use_modified_socket_name(node)) {
+    bool found = false;
+    int counter = 0, total = 0;
+
+    for (BL::NodeSocket &b_input : b_node.inputs) {
+      if (b_input.name() == name) {
+        if (!found) {
+          counter++;
+        }
+        total++;
+      }
+
+      if (b_input.ptr.data == b_socket.ptr.data)
+        found = true;
     }
-    input = node->input(name.c_str());
 
-    if (!input) {
-      /* Different internal numbering of two sockets with same name.
-       * Note that the Blender convention for unique socket names changed
-       * from . to _ at some point, so we check both to handle old files. */
-      if (string_endswith(name, "_001")) {
-        string_replace(name, "_001", "2");
-      }
-      else if (string_endswith(name, ".001")) {
-        string_replace(name, ".001", "2");
-      }
-      else if (string_endswith(name, "_002")) {
-        string_replace(name, "_002", "3");
-      }
-      else if (string_endswith(name, ".002")) {
-        string_replace(name, ".002", "3");
-      }
-      else {
-        name += "1";
-      }
+    /* rename if needed */
+    if (name == "Shader")
+      name = "Closure";
 
-      input = node->input(name.c_str());
-    }
+    if (total > 1)
+      name = string_printf("%s%d", name.c_str(), counter);
   }
 
-  return input;
+  return node->input(name.c_str());
 }
 
-static ShaderOutput *node_find_output_by_name(ShaderNode *node, BL::NodeSocket &b_socket)
+static ShaderOutput *node_find_output_by_name(ShaderNode *node,
+                                              BL::Node &b_node,
+                                              BL::NodeSocket &b_socket)
 {
-  string name = b_socket.identifier();
-  ShaderOutput *output = node->output(name.c_str());
+  string name = b_socket.name();
 
-  if (!output && node_use_modified_socket_name(node)) {
-    /* Different internal name for shader. */
-    if (name == "Shader") {
-      name = "Closure";
-      output = node->output(name.c_str());
+  if (node_use_modified_socket_name(node)) {
+    bool found = false;
+    int counter = 0, total = 0;
+
+    for (BL::NodeSocket &b_output : b_node.outputs) {
+      if (b_output.name() == name) {
+        if (!found) {
+          counter++;
+        }
+        total++;
+      }
+
+      if (b_output.ptr.data == b_socket.ptr.data) {
+        found = true;
+      }
     }
+
+    /* rename if needed */
+    if (name == "Shader")
+      name = "Closure";
+
+    if (total > 1)
+      name = string_printf("%s%d", name.c_str(), counter);
   }
 
-  return output;
+  return node->output(name.c_str());
 }
 
 static void add_nodes(Scene *scene,
@@ -1202,7 +1209,7 @@ static void add_nodes(Scene *scene,
       if (node) {
         /* map node sockets for linking */
         for (BL::NodeSocket &b_input : b_node.inputs) {
-          ShaderInput *input = node_find_input_by_name(node, b_input);
+          ShaderInput *input = node_find_input_by_name(node, b_node, b_input);
           if (!input) {
             /* XXX should not happen, report error? */
             continue;
@@ -1212,7 +1219,7 @@ static void add_nodes(Scene *scene,
           set_default_value(input, b_input, b_data, b_ntree);
         }
         for (BL::NodeSocket &b_output : b_node.outputs) {
-          ShaderOutput *output = node_find_output_by_name(node, b_output);
+          ShaderOutput *output = node_find_output_by_name(node, b_node, b_output);
           if (!output) {
             /* XXX should not happen, report error? */
             continue;

intern/cycles/blender/blender_sync.cpp

@@ -59,7 +59,6 @@ BlenderSync::BlenderSync(BL::RenderEngine &b_engine,
       b_scene(b_scene),
       shader_map(scene),
       object_map(scene),
-      procedural_map(scene),
       geometry_map(scene),
       light_map(scene),
       particle_system_map(scene),
@@ -405,6 +404,8 @@ void BlenderSync::sync_film(BL::SpaceView3D &b_v3d)
 
   Film *film = scene->film;
 
+  vector<Pass> prevpasses = scene->passes;
+
   if (b_v3d) {
     film->set_display_pass(update_viewport_display_passes(b_v3d, scene->passes));
   }
@@ -434,6 +435,11 @@ void BlenderSync::sync_film(BL::SpaceView3D &b_v3d)
         break;
     }
   }
+
+  if (!Pass::equals(prevpasses, scene->passes)) {
+    film->tag_passes_update(scene, prevpasses, false);
+    film->tag_modified();
+  }
 }
 
 /* Render Layer */
@@ -539,6 +545,12 @@ PassType BlenderSync::get_pass_type(BL::RenderPass &b_pass)
   MAP_PASS("BakePrimitive", PASS_BAKE_PRIMITIVE);
   MAP_PASS("BakeDifferential", PASS_BAKE_DIFFERENTIAL);
 
+#ifdef __KERNEL_DEBUG__
+  MAP_PASS("Debug BVH Traversed Nodes", PASS_BVH_TRAVERSED_NODES);
+  MAP_PASS("Debug BVH Traversed Instances", PASS_BVH_TRAVERSED_INSTANCES);
+  MAP_PASS("Debug BVH Intersections", PASS_BVH_INTERSECTIONS);
+  MAP_PASS("Debug Ray Bounces", PASS_RAY_BOUNCES);
+#endif
   MAP_PASS("Debug Render Time", PASS_RENDER_TIME);
   MAP_PASS("AdaptiveAuxBuffer", PASS_ADAPTIVE_AUX_BUFFER);
   MAP_PASS("Debug Sample Count", PASS_SAMPLE_COUNT);
@@ -636,6 +648,24 @@ vector<Pass> BlenderSync::sync_render_passes(BL::Scene &b_scene,
     }
   }
 
+#ifdef __KERNEL_DEBUG__
+  if (get_boolean(crl, "pass_debug_bvh_traversed_nodes")) {
+    b_engine.add_pass("Debug BVH Traversed Nodes", 1, "X", b_view_layer.name().c_str());
+    Pass::add(PASS_BVH_TRAVERSED_NODES, passes, "Debug BVH Traversed Nodes");
+  }
+  if (get_boolean(crl, "pass_debug_bvh_traversed_instances")) {
+    b_engine.add_pass("Debug BVH Traversed Instances", 1, "X", b_view_layer.name().c_str());
+    Pass::add(PASS_BVH_TRAVERSED_INSTANCES, passes, "Debug BVH Traversed Instances");
+  }
+  if (get_boolean(crl, "pass_debug_bvh_intersections")) {
+    b_engine.add_pass("Debug BVH Intersections", 1, "X", b_view_layer.name().c_str());
+    Pass::add(PASS_BVH_INTERSECTIONS, passes, "Debug BVH Intersections");
+  }
+  if (get_boolean(crl, "pass_debug_ray_bounces")) {
+    b_engine.add_pass("Debug Ray Bounces", 1, "X", b_view_layer.name().c_str());
+    Pass::add(PASS_RAY_BOUNCES, passes, "Debug Ray Bounces");
+  }
+#endif
   if (get_boolean(crl, "pass_debug_render_time")) {
     b_engine.add_pass("Debug Render Time", 1, "X", b_view_layer.name().c_str());
     Pass::add(PASS_RENDER_TIME, passes, "Debug Render Time");
@@ -719,13 +749,10 @@ vector<Pass> BlenderSync::sync_render_passes(BL::Scene &b_scene,
                                         DENOISING_CLEAN_ALL_PASSES);
   scene->film->set_denoising_prefiltered_pass(denoising.store_passes &&
                                               denoising.type == DENOISER_NLM);
-  scene->film->set_pass_alpha_threshold(b_view_layer.pass_alpha_threshold());
 
-  if (!Pass::equals(passes, scene->passes)) {
-    scene->film->tag_passes_update(scene, passes);
-    scene->film->tag_modified();
-    scene->integrator->tag_update(scene, Integrator::UPDATE_ALL);
-  }
+  scene->film->set_pass_alpha_threshold(b_view_layer.pass_alpha_threshold());
+  scene->film->tag_passes_update(scene, passes);
+  scene->integrator->tag_update(scene, Integrator::UPDATE_ALL);
 
   return passes;
 }

intern/cycles/blender/blender_sync.h

@@ -23,7 +23,6 @@
 #include "RNA_types.h"
 
 #include "blender/blender_id_map.h"
-#include "blender/blender_util.h"
 #include "blender/blender_viewport.h"
 
 #include "render/scene.h"
@@ -152,31 +151,21 @@ class BlenderSync {
                       TaskPool *geom_task_pool);
   void sync_object_motion_init(BL::Object &b_parent, BL::Object &b_ob, Object *object);
 
-  void sync_procedural(BL::Object &b_ob,
-                       BL::MeshSequenceCacheModifier &b_mesh_cache,
-                       bool has_subdivision);
-
   bool sync_object_attributes(BL::DepsgraphObjectInstance &b_instance, Object *object);
 
   /* Volume */
-  void sync_volume(BObjectInfo &b_ob_info, Volume *volume);
+  void sync_volume(BL::Object &b_ob, Volume *volume);
 
   /* Mesh */
-  void sync_mesh(BL::Depsgraph b_depsgraph, BObjectInfo &b_ob_info, Mesh *mesh);
-  void sync_mesh_motion(BL::Depsgraph b_depsgraph,
-                        BObjectInfo &b_ob_info,
-                        Mesh *mesh,
-                        int motion_step);
+  void sync_mesh(BL::Depsgraph b_depsgraph, BL::Object b_ob, Mesh *mesh);
+  void sync_mesh_motion(BL::Depsgraph b_depsgraph, BL::Object b_ob, Mesh *mesh, int motion_step);
 
   /* Hair */
-  void sync_hair(BL::Depsgraph b_depsgraph, BObjectInfo &b_ob_info, Hair *hair);
-  void sync_hair_motion(BL::Depsgraph b_depsgraph,
-                        BObjectInfo &b_ob_info,
-                        Hair *hair,
-                        int motion_step);
-  void sync_hair(Hair *hair, BObjectInfo &b_ob_info, bool motion, int motion_step = 0);
+  void sync_hair(BL::Depsgraph b_depsgraph, BL::Object b_ob, Hair *hair);
+  void sync_hair_motion(BL::Depsgraph b_depsgraph, BL::Object b_ob, Hair *hair, int motion_step);
+  void sync_hair(Hair *hair, BL::Object &b_ob, bool motion, int motion_step = 0);
   void sync_particle_hair(
-      Hair *hair, BL::Mesh &b_mesh, BObjectInfo &b_ob_info, bool motion, int motion_step = 0);
+      Hair *hair, BL::Mesh &b_mesh, BL::Object &b_ob, bool motion, int motion_step = 0);
   bool object_has_particle_hair(BL::Object b_ob);
 
   /* Camera */
@@ -185,13 +174,14 @@ class BlenderSync {
 
   /* Geometry */
   Geometry *sync_geometry(BL::Depsgraph &b_depsgrpah,
-                          BObjectInfo &b_ob_info,
+                          BL::Object &b_ob,
+                          BL::Object &b_ob_instance,
                           bool object_updated,
                           bool use_particle_hair,
                           TaskPool *task_pool);
 
   void sync_geometry_motion(BL::Depsgraph &b_depsgraph,
-                            BObjectInfo &b_ob_info,
+                            BL::Object &b_ob,
                             Object *object,
                             float motion_time,
                             bool use_particle_hair,
@@ -200,7 +190,8 @@ class BlenderSync {
   /* Light */
   void sync_light(BL::Object &b_parent,
                   int persistent_id[OBJECT_PERSISTENT_ID_SIZE],
-                  BObjectInfo &b_ob_info,
+                  BL::Object &b_ob,
+                  BL::Object &b_ob_instance,
                   int random_id,
                   Transform &tfm,
                   bool *use_portal);
@@ -230,13 +221,11 @@ class BlenderSync {
 
   id_map<void *, Shader> shader_map;
   id_map<ObjectKey, Object> object_map;
-  id_map<void *, Procedural> procedural_map;
   id_map<GeometryKey, Geometry> geometry_map;
   id_map<ObjectKey, Light> light_map;
   id_map<ParticleSystemKey, ParticleSystem> particle_system_map;
   set<Geometry *> geometry_synced;
   set<Geometry *> geometry_motion_synced;
-  set<Geometry *> geometry_motion_attribute_synced;
   set<float> motion_times;
   void *world_map;
   bool world_recalc;

intern/cycles/blender/blender_util.h

@@ -40,28 +40,6 @@ float *BKE_image_get_float_pixels_for_frame(void *image, int frame, int tile);
 
 CCL_NAMESPACE_BEGIN
 
-struct BObjectInfo {
-  /* Object directly provided by the depsgraph iterator. This object is only valid during one
-   * iteration and must not be accessed afterwards. Transforms and visibility should be checked on
-   * this object. */
-  BL::Object iter_object;
-
-  /* This object remains alive even after the object iterator is done. It corresponds to one
-   * original object. It is the object that owns the object data below. */
-  BL::Object real_object;
-
-  /* The object-data referenced by the iter object. This is still valid after the depsgraph
-   * iterator is done. It might have a different type compared to real_object.data(). */
-  BL::ID object_data;
-
-  /* True when the current geometry is the data of the referenced object. False when it is a
-   * geometry instance that does not have a 1-to-1 relationship with an object. */
-  bool is_real_object_data() const
-  {
-    return const_cast<BL::Object &>(real_object).data() == object_data;
-  }
-};
-
 typedef BL::ShaderNodeAttribute::attribute_type_enum BlenderAttributeType;
 BlenderAttributeType blender_attribute_name_split_type(ustring name, string *r_real_name);
 
@@ -69,7 +47,7 @@ void python_thread_state_save(void **python_thread_state);
 void python_thread_state_restore(void **python_thread_state);
 
 static inline BL::Mesh object_to_mesh(BL::BlendData & /*data*/,
-                                      BObjectInfo &b_ob_info,
+                                      BL::Object &object,
                                       BL::Depsgraph & /*depsgraph*/,
                                       bool /*calc_undeformed*/,
                                       Mesh::SubdivisionType subdivision_type)
@@ -91,9 +69,9 @@ static inline BL::Mesh object_to_mesh(BL::BlendData & /*data*/,
 #endif
 
   BL::Mesh mesh(PointerRNA_NULL);
-  if (b_ob_info.object_data.is_a(&RNA_Mesh)) {
+  if (object.type() == BL::Object::type_MESH) {
     /* TODO: calc_undeformed is not used. */
-    mesh = BL::Mesh(b_ob_info.object_data);
+    mesh = BL::Mesh(object.data());
 
     /* Make a copy to split faces if we use autosmooth, otherwise not needed.
      * Also in edit mode do we need to make a copy, to ensure data layers like
@@ -101,15 +79,12 @@ static inline BL::Mesh object_to_mesh(BL::BlendData & /*data*/,
     if (mesh.is_editmode() ||
         (mesh.use_auto_smooth() && subdivision_type == Mesh::SUBDIVISION_NONE)) {
       BL::Depsgraph depsgraph(PointerRNA_NULL);
-      assert(b_ob_info.is_real_object_data());
-      mesh = b_ob_info.real_object.to_mesh(false, depsgraph);
+      mesh = object.to_mesh(false, depsgraph);
     }
   }
   else {
     BL::Depsgraph depsgraph(PointerRNA_NULL);
-    if (b_ob_info.is_real_object_data()) {
-      mesh = b_ob_info.real_object.to_mesh(false, depsgraph);
-    }
+    mesh = object.to_mesh(false, depsgraph);
   }
 
 #if 0
@@ -133,14 +108,10 @@ static inline BL::Mesh object_to_mesh(BL::BlendData & /*data*/,
 }
 
 static inline void free_object_to_mesh(BL::BlendData & /*data*/,
-                                       BObjectInfo &b_ob_info,
+                                       BL::Object &object,
                                        BL::Mesh &mesh)
 {
-  if (!b_ob_info.is_real_object_data()) {
-    return;
-  }
   /* Free mesh if we didn't just use the existing one. */
-  BL::Object object = b_ob_info.real_object;
   if (object.data().ptr.data != mesh.ptr.data) {
     object.to_mesh_clear();
   }
@@ -174,7 +145,7 @@ static inline void curvemapping_minmax(/*const*/ BL::CurveMapping &cumap,
                                        float *min_x,
                                        float *max_x)
 {
-  // const int num_curves = cumap.curves.length(); /* Gives linking error so far. */
+  /* const int num_curves = cumap.curves.length(); */ /* Gives linking error so far. */
   const int num_curves = rgb_curve ? 4 : 3;
   *min_x = FLT_MAX;
   *max_x = -FLT_MAX;
@@ -248,13 +219,9 @@ static inline bool BKE_object_is_modified(BL::Object &self, BL::Scene &scene, bo
   return self.is_modified(scene, (preview) ? (1 << 0) : (1 << 1)) ? true : false;
 }
 
-static inline bool BKE_object_is_deform_modified(BObjectInfo &self, BL::Scene &scene, bool preview)
+static inline bool BKE_object_is_deform_modified(BL::Object &self, BL::Scene &scene, bool preview)
 {
-  if (!self.is_real_object_data()) {
-    return false;
-  }
-  return self.real_object.is_deform_modified(scene, (preview) ? (1 << 0) : (1 << 1)) ? true :
-                                                                                       false;
+  return self.is_deform_modified(scene, (preview) ? (1 << 0) : (1 << 1)) ? true : false;
 }
 
 static inline int render_resolution_x(BL::RenderSettings &b_render)
@@ -279,11 +246,7 @@ static inline string image_user_file_path(BL::ImageUser &iuser,
 
   string filepath_str = string(filepath);
   if (load_tiled && ima.source() == BL::Image::source_TILED) {
-    string udim;
-    if (ima.tiles.length() > 0) {
-      udim = to_string(ima.tiles[0].number());
-    }
-    string_replace(filepath_str, udim, "<UDIM>");
+    string_replace(filepath_str, "1001", "<UDIM>");
   }
   return filepath_str;
 }
@@ -457,7 +420,7 @@ static inline void set_enum(PointerRNA &ptr, const char *name, const string &ide
 static inline string get_string(PointerRNA &ptr, const char *name)
 {
   char cstrbuf[1024];
-  char *cstr = RNA_string_get_alloc(&ptr, name, cstrbuf, sizeof(cstrbuf), NULL);
+  char *cstr = RNA_string_get_alloc(&ptr, name, cstrbuf, sizeof(cstrbuf));
   string str(cstr);
   if (cstr != cstrbuf)
     MEM_freeN(cstr);
@@ -573,6 +536,22 @@ static inline bool object_use_deform_motion(BL::Object &b_parent, BL::Object &b_
   return use_deform_motion;
 }
 
+static inline BL::FluidDomainSettings object_fluid_liquid_domain_find(BL::Object &b_ob)
+{
+  for (BL::Modifier &b_mod : b_ob.modifiers) {
+    if (b_mod.is_a(&RNA_FluidModifier)) {
+      BL::FluidModifier b_mmd(b_mod);
+
+      if (b_mmd.fluid_type() == BL::FluidModifier::fluid_type_DOMAIN &&
+          b_mmd.domain_settings().domain_type() == BL::FluidDomainSettings::domain_type_LIQUID) {
+        return b_mmd.domain_settings();
+      }
+    }
+  }
+
+  return BL::FluidDomainSettings(PointerRNA_NULL);
+}
+
 static inline BL::FluidDomainSettings object_fluid_gas_domain_find(BL::Object &b_ob)
 {
   for (BL::Modifier &b_mod : b_ob.modifiers) {
@@ -589,35 +568,6 @@ static inline BL::FluidDomainSettings object_fluid_gas_domain_find(BL::Object &b
   return BL::FluidDomainSettings(PointerRNA_NULL);
 }
 
-static inline BL::MeshSequenceCacheModifier object_mesh_cache_find(BL::Object &b_ob,
-                                                                   bool *has_subdivision_modifier)
-{
-  for (int i = b_ob.modifiers.length() - 1; i >= 0; --i) {
-    BL::Modifier b_mod = b_ob.modifiers[i];
-
-    if (b_mod.type() == BL::Modifier::type_MESH_SEQUENCE_CACHE) {
-      BL::MeshSequenceCacheModifier mesh_cache = BL::MeshSequenceCacheModifier(b_mod);
-      return mesh_cache;
-    }
-
-    /* Skip possible particles system modifiers as they do not modify the geometry. */
-    if (b_mod.type() == BL::Modifier::type_PARTICLE_SYSTEM) {
-      continue;
-    }
-
-    if (b_mod.type() == BL::Modifier::type_SUBSURF) {
-      if (has_subdivision_modifier) {
-        *has_subdivision_modifier = true;
-      }
-      continue;
-    }
-
-    break;
-  }
-
-  return BL::MeshSequenceCacheModifier(PointerRNA_NULL);
-}
-
 static inline Mesh::SubdivisionType object_subdivision_type(BL::Object &b_ob,
                                                             bool preview,
                                                             bool experimental)
@@ -646,14 +596,15 @@ static inline Mesh::SubdivisionType object_subdivision_type(BL::Object &b_ob,
 
 static inline uint object_ray_visibility(BL::Object &b_ob)
 {
+  PointerRNA cvisibility = RNA_pointer_get(&b_ob.ptr, "cycles_visibility");
   uint flag = 0;
 
-  flag |= b_ob.visible_camera() ? PATH_RAY_CAMERA : 0;
-  flag |= b_ob.visible_diffuse() ? PATH_RAY_DIFFUSE : 0;
-  flag |= b_ob.visible_glossy() ? PATH_RAY_GLOSSY : 0;
-  flag |= b_ob.visible_transmission() ? PATH_RAY_TRANSMIT : 0;
-  flag |= b_ob.visible_shadow() ? PATH_RAY_SHADOW : 0;
-  flag |= b_ob.visible_volume_scatter() ? PATH_RAY_VOLUME_SCATTER : 0;
+  flag |= get_boolean(cvisibility, "camera") ? PATH_RAY_CAMERA : 0;
+  flag |= get_boolean(cvisibility, "diffuse") ? PATH_RAY_DIFFUSE : 0;
+  flag |= get_boolean(cvisibility, "glossy") ? PATH_RAY_GLOSSY : 0;
+  flag |= get_boolean(cvisibility, "transmission") ? PATH_RAY_TRANSMIT : 0;
+  flag |= get_boolean(cvisibility, "shadow") ? PATH_RAY_SHADOW : 0;
+  flag |= get_boolean(cvisibility, "scatter") ? PATH_RAY_VOLUME_SCATTER : 0;
 
   return flag;
 }

intern/cycles/blender/blender_viewport.cpp

@@ -40,8 +40,8 @@ BlenderViewportParameters::BlenderViewportParameters(BL::SpaceView3D &b_v3d)
   BL::View3DShading shading = b_v3d.shading();
   PointerRNA cshading = RNA_pointer_get(&shading.ptr, "cycles");
 
-  /* We only copy the shading parameters if we are in look-dev mode.
-   * Otherwise defaults are being used. These defaults mimic normal render settings. */
+  /* We only copy the shading parameters if we are in look dev mode. otherwise
+   * defaults are being used. These defaults mimic normal render settings */
   if (shading.type() == BL::View3DShading::type_RENDERED) {
     use_scene_world = shading.use_scene_world_render();
     use_scene_lights = shading.use_scene_lights_render();