git: 2be8b8cac947 - main - graphics/blender: update to 3.0.0 release (+)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 01 Feb 2022 17:04:41 UTC
The branch main has been updated by fluffy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2be8b8cac94734d338532625547c5d4bf230d630
commit 2be8b8cac94734d338532625547c5d4bf230d630
Author: Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2022-02-01 16:57:51 +0000
Commit: Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2022-02-01 17:04:15 +0000
graphics/blender: update to 3.0.0 release (+)
While blender does support building with python 3.10,
numpy doesn't support 3.10 yet so keep python version at 3.9 for now.
Thumbnailer is now a compiled app instead of py script.
Add options for new features and some that didn't get added earlier .
PR: 260308
Sponsored by: Netzkommune GmbH.
---
graphics/blender/Makefile | 70 +-
graphics/blender/Makefile.options | 20 +-
graphics/blender/Makefile.versions | 4 +-
graphics/blender/distinfo | 6 +-
graphics/blender/files/blender.in | 5 +
graphics/blender/files/patch-CMakeLists.txt | 8 +-
...ld_files_cmake_Modules_FindPythonLibsUnix.cmake | 11 -
.../patch-intern_cycles_device_device__cpu.cpp | 38 -
.../files/patch-intern_cycles_util_util__task.cpp | 11 -
.../files/patch-intern_cycles_util_util__task.h | 11 -
.../files/patch-intern_cycles_util_util__tbb.h | 17 -
...com_gltf2__io__draco__compression__extension.py | 11 +
...exp_gltf2__io__draco__compression__extension.py | 19 -
...tch-source_blender_blenlib_BLI__index__range.hh | 26 -
.../files/patch-source_blender_blenlib_BLI__task.h | 15 -
...tch-source_blender_blenlib_intern_task__pool.cc | 41 -
graphics/blender/pkg-plist | 985 +++++++++------------
17 files changed, 485 insertions(+), 813 deletions(-)
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index bda41e9627a5..d0431575e617 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,8 +1,5 @@
-# Created by: Jimmy Olgeni <olgeni@uli.it>
-
PORTNAME= blender
-DISTVERSION= 2.91.0
-PORTREVISION= 16
+DISTVERSION= 3.0.0
CATEGORIES= graphics multimedia
MASTER_SITES= http://download.blender.org/source/ \
http://mirror.cs.umn.edu/blender.org/source/ \
@@ -20,23 +17,24 @@ NOT_FOR_ARCHS_REASON= uses 64bit atomic functions
BUILD_DEPENDS= ${PYNUMPY}
LIB_DEPENDS= libpng.so:graphics/png \
libfreetype.so:print/freetype2 \
- libboost_regex.so:devel/boost-libs
+ libboost_regex.so:devel/boost-libs \
+ libzstd.so:archivers/zstd
RUN_DEPENDS= ${PYNUMPY}
# libboost_regex.so just acts as a placeholder; several boost
# libraries are used, if either of the most common options in blender
# are set. We will pull boost in just to be on the safe side.
-USES= cmake compiler:c++14-lang cpe gl gnome jpeg python:3.8 shebangfix \
+USES= cmake compiler:c++14-lang cpe gl jpeg python:3.9 shebangfix \
tar:xz xorg
USE_XORG= x11 xext xfixes xmu xrender
USE_GL= gl glu glew
+INSTALLS_ICONS= yes
CMAKE_OFF= WITH_IMAGE_OPENJPEG WITH_PYTHON_INSTALL \
WITH_PYTHON_INSTALL_NUMPY WITH_INSTALL_PORTABLE \
- WITH_CYCLES_LOGGING
+ WITH_CYCLES_LOGGING WITH_USD
-SHEBANG_FILES= release/bin/blender-thumbnailer.py \
- release/scripts/modules/bl_i18n_utils/merge_po.py \
+SHEBANG_FILES= release/scripts/modules/bl_i18n_utils/merge_po.py \
release/scripts/modules/bl_i18n_utils/utils_rtl.py \
release/scripts/modules/blend_render_info.py
CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}}
@@ -46,19 +44,22 @@ CXXFLAGS_i386= -march=i586
PLIST_SUB+= VER=${DISTVERSION:R}
OPTIONS_SUB= yes
+SUB_FILES= blender
.include "${.CURDIR}/Makefile.options"
ALEMBIC_CMAKE_BOOL= WITH_ALEMBIC
ALEMBIC_LIB_DEPENDS= libAlembic.so:graphics/alembic
# note that this needs to be set to match alembics hdf5 option
-ALEMBIC_HDF5_IMPLIES= ALEMBIC
+ALEMBIC_HDF5_REQUIRES= ALEMBIC
ALEMBIC_HDF5_CMAKE_BOOL= WITH_ALEMBIC_HDF5
ALEMBIC_HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5
AVI_CMAKE_BOOL= WITH_CODEC_AVI
BULLET_CMAKE_BOOL= WITH_BULLET
CAMERATRACK_CMAKE_BOOL= WITH_LIBMV
CAMERATRACK_LIB_DEPENDS= libunwind.so:devel/libunwind
+CAMERATRACK_ONLY_FOR_ARCHS= i386 amd64 aarch64 powerpc64 powerpc64le
+CAMERATRACK_ONLY_FOR_ARCHS_REASON= libunwind only supports x86/amd64/aarch64/powerpc64/powerpc64le
CINEON_CMAKE_BOOL= WITH_IMAGE_CINEON
COLLADA_CMAKE_BOOL= WITH_OPENCOLLADA
COLLADA_LIB_DEPENDS= libOpenCOLLADABaseUtils.so:graphics/opencollada \
@@ -68,15 +69,16 @@ COLLADA_USES= gnome
COMPOSITOR_CMAKE_BOOL= WITH_COMPOSITOR
CYCLES_IMPLIES= OPENIMAGEIO TBB
CYCLES_CMAKE_BOOL= WITH_CYCLES
-CYCLES_LIB_DEPENDS= libpugixml.so:textproc/pugixml
CYCLESEMBR_IMPLIES= CYCLES
CYCLESEMBR_CMAKE_BOOL= WITH_CYCLES_EMBREE
CYCLESEMBR_LIB_DEPENDS= libembree3.so:graphics/embree
+CYCLESEMBR_ONLY_FOR_ARCHS= amd64
+CYCLESEMBR_ONLY_FOR_ARCHS_REASON= embree only supports amd64
CYCLESOSL_IMPLIES= CYCLES
CYCLESOSL_CMAKE_BOOL= WITH_CYCLES_OSL WITH_LLVM
CYCLESOSL_CMAKE_ON= -DLLVM_STATIC:BOOL=OFF \
-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" \
- -DOSL_ROOT_DIR:STRING="${LOCALBASE}/share/openshadinglanguage/"
+ -DOSL_SHADER_DIR:STRING="${LOCALBASE}/share/openshadinglanguage/shaders"
CYCLESOSL_BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
CYCLESOSL_LIB_DEPENDS= liboslcomp.so:graphics/openshadinglanguage
CYCLESOSL_RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
@@ -86,17 +88,21 @@ DRACO_USE= LDCONFIG=${PYTHON_SITELIBDIR}
EBOOL_CMAKE_BOOL= WITH_GMP
EBOOL_LIB_DEPENDS= libgmp.so:math/gmp
FFMPEG_CMAKE_BOOL= WITH_CODEC_FFMPEG
-FFMPEG_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg \
+ libflite.so:audio/flite
+FFMPEG_LDFLAGS= -L${LOCALBASE}/lib -lflite -lflite_cmu_us_kal -lflite_cmulex -lflite_usenglish
FFTW3_CMAKE_BOOL= WITH_FFTW3
FFTW3_LIB_DEPENDS= libfftw3.so:math/fftw3
FRAMESERVER_CMAKE_BOOL= WITH_IMAGE_FRAMESERVER
FREESTYLE_CMAKE_BOOL= WITH_FREESTYLE
+HARU_CMAKE_BOOL= WITH_HARU
+HARU_LIB_DEPENDS= libhpdf.so:print/libharu
HDR_CMAKE_BOOL= WITH_IMAGE_HDR
HEADLESS_PREVENTS= MENU XINPUT XF86VMODE
HEADLESS_PREVENTS_MSG= X11 options can't be used in headless mode
HEADLESS_CMAKE_BOOL= WITH_HEADLESS
INPUT_NDOF_CMAKE_BOOL= WITH_INPUT_NDOF
-JACK_CMAKE_BOOL= WITH_JACK
+JACK_CMAKE_BOOL= WITH_JACK WITH_JACK_DYNLOAD
JACK_LIB_DEPENDS= libjack.so:audio/jack
LZO_CMAKE_BOOL= WITH_LZO
LZMA_CMAKE_BOOL= WITH_LZMA
@@ -117,18 +123,23 @@ OPENAL_CMAKE_BOOL= WITH_OPENAL
OPENAL_USES= openal:al,alut
OPENCOLORIO_CMAKE_BOOL= WITH_OPENCOLORIO
OPENCOLORIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio \
- libyaml-cpp03.so:devel/yaml-cpp03 \
- libtinyxml.so:textproc/tinyxml
+ libyaml-cpp.so:devel/yaml-cpp \
+ libtinyxml.so:textproc/tinyxml \
+ libexpat.so:textproc/expat2 \
+ libpystring.so:devel/pystring
OPENEXR_CMAKE_BOOL= WITH_IMAGE_OPENEXR
OPENEXR_CFLAGS= -I${LOCALBASE}/include/Imath
-OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr \
- libImath.so:math/Imath
-OPENIMAGEIO_IMPLIES= OPENEXR TIFF
+OPENEXR_LIB_DEPENDS= libImath.so:math/Imath \
+ libOpenEXR.so:graphics/openexr
+OPENIMAGEIO_IMPLIES= OPENEXR TIFF PUGIXML
OPENIMAGEIO_CMAKE_BOOL= WITH_OPENIMAGEIO
OPENIMAGEIO_LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio
+OPENIMAGEIO_LDFLAGS= -lOpenImageIO_Util
OPENIMAGEDN_IMPLIES= TBB
OPENIMAGEDN_CMAKE_BOOL= WITH_OPENIMAGEDENOISE
OPENIMAGEDN_LIB_DEPENDS= libOpenImageDenoise.so:graphics/oidn
+OPENIMAGEDN_ONLY_FOR_ARCHS= amd64
+OPENIMAGEDN_ONLY_FOR_ARCHS_REASON= oidn only supports amd64
# openmp usually works on amd64
OPENMP_CMAKE_BOOL= WITH_OPENMP
OPENSUBDIV_CMAKE_BOOL= WITH_OPENSUBDIV
@@ -137,14 +148,20 @@ OPENVDB_IMPLIES= TBB
OPENVDB_CMAKE_BOOL= WITH_OPENVDB WITH_OPENVDB_BLOSC
OPENVDB_LIB_DEPENDS= libblosc.so:archivers/c-blosc \
libopenvdb.so:misc/openvdb
+PUGIXML_CMAKE_BOOL= WITH_PUGIXML
+PUGIXML_LIB_DEPENDS= libpugixml.so:textproc/pugixml
+PULSEAUDIO_CMAKE_BOOL= WITH_PULSEAUDIO WITH_PULSEAUDIO_DYNLOAD
+PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
+QUADRIFLOW_CMAKE_BOOL= WITH_QUADRIFLOW
RAYOPTIMIZATION_CMAKE_BOOL= WITH_RAYOPTIMIZATION
-SDL_CMAKE_BOOL= WITH_SDL
+SDL_CMAKE_BOOL= WITH_SDL WITH_SDL_DYNLOAD
SDL_USE= SDL=sdl2
SDL_USES= sdl
SNDFILE_CMAKE_BOOL= WITH_CODEC_SNDFILE
SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile
TBB_CMAKE_BOOL= WITH_TBB
TBB_LIB_DEPENDS= libtbb.so:devel/onetbb
+THUMBNAILER_CMAKE_BOOL= WITH_BLENDER_THUMBNAILER
TIFF_CMAKE_BOOL= WITH_IMAGE_TIFF
TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
TRACE_CMAKE_BOOL= WITH_POTRACE
@@ -170,26 +187,25 @@ LLVM_VER= 90
LLVM_VER= ${LLVM_DEFAULT}
.endif
-post-patch-OPENCOLORIO-on:
- @${REINPLACE_CMD} -e 's|yaml-cpp|&03|' \
- ${PATCH_WRKSRC}/build_files/cmake/Modules/FindOpenColorIO.cmake
-
post-build:
@(cd ${WRKSRC}/doc/manpage && \
${PYTHON_CMD} blender.1.py \
- ${INSTALL_WRKSRC}/bin/blender \
- ${INSTALL_WRKSRC}/bin/${PORTNAME}.1)
+ --blender ${INSTALL_WRKSRC}/bin/blender \
+ --output ${INSTALL_WRKSRC}/bin/${PORTNAME}.1)
post-install:
${INSTALL_MAN} ${INSTALL_WRKSRC}/bin/${PORTNAME}.1 \
${STAGEDIR}${MAN1PREFIX}/man/man1
+ ${MV} ${STAGEDIR}/${PREFIX}/bin/blender ${STAGEDIR}/${PREFIX}/bin/blender-bin
+ ${REINPLACE_CMD} -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|g' ${WRKDIR}/blender
+ ${INSTALL_SCRIPT} ${WRKDIR}/blender ${STAGEDIR}/${PREFIX}/bin/blender
post-install-DRACO-on:
# move draco pylib into site-packages
${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR}/
${INSTALL_LIB} ${INSTALL_WRKSRC}/lib/libextern_draco.so ${STAGEDIR}/${PYTHON_SITELIBDIR}/
${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/libextern_draco.so
- @${RM} -R ${STAGEDIR}/${PREFIX}/share/blender/${DISTVERSION:R}/python
+ @${RM} -R ${STAGEDIR}/${DATADIR}/${DISTVERSION:R}/python
post-install-MENU-on:
@-update-desktop-database -q
diff --git a/graphics/blender/Makefile.options b/graphics/blender/Makefile.options
index 6ae2f0a48d52..c14128bcbb25 100644
--- a/graphics/blender/Makefile.options
+++ b/graphics/blender/Makefile.options
@@ -20,6 +20,7 @@ OPTIONS_DEFINE= \
HDR \
HEADLESS \
INPUT_NDOF \
+ HARU \
JACK \
LZO \
LZMA \
@@ -38,11 +39,15 @@ OPTIONS_DEFINE= \
OPENMP \
OPENSUBDIV \
OPENVDB \
+ PUGIXML \
+ PULSEAUDIO \
+ QUADRIFLOW \
RAYOPTIMIZATION \
SDL \
SNDFILE \
TBB \
TIFF \
+ THUMBNAILER \
TRACE \
XINPUT \
XF86VMODE
@@ -65,6 +70,7 @@ OPTIONS_DEFAULT= \
FREESTYLE \
HDR \
INPUT_NDOF \
+ HARU \
LZO \
LZMA \
MENU \
@@ -78,18 +84,20 @@ OPTIONS_DEFAULT= \
OPENEXR \
OPENIMAGEIO \
OPENSUBDIV \
+ OPENVDB \
+ PUGIXML \
+ PULSEAUDIO \
+ QUADRIFLOW \
RAYOPTIMIZATION \
SDL \
TBB \
TIFF \
+ THUMBNAILER \
TRACE \
XINPUT \
XF86VMODE
-# off during onetbb transition
-# OPENVDB
-# OPENIMAGEDN
-OPTIONS_DEFAULT_amd64= CAMERATRACK CYCLESEMBR
+OPTIONS_DEFAULT_amd64= CAMERATRACK CYCLESEMBR OPENIMAGEDN
ALEMBIC_DESC= Enable Alembic file support
ALEMBIC_HDF5_DESC= Enable Alembic hdf5 file support
@@ -109,6 +117,7 @@ EBOOL_DESC= Enable exact boolean support
FFTW3_DESC= Use fftw for smoke and audio effects
FRAMESERVER_DESC= Image FrameServer support for rendering
FREESTYLE_DESC= Enable advanced edges rendering
+HARU_DESC= Enable libharu support
HDR_DESC= Generic high dynamic-range (HDR) support
HEADLESS_DESC= Disable user interface (for render-farms)
INPUT_NDOF_DESC= Enable NDOF input device support
@@ -125,9 +134,12 @@ OPENIMAGEIO_DESC= OpenImageIO image processing support
OPENIMAGEDN_DESC= OpenImageDenoise support
OPENSUBDIV_DESC= Use the OpenSubDiv library for surface subdivision
OPENVDB_DESC= Use openVDB library for volumetric data
+PUGIXML_DESC= Enable pugixml support
+QUADRIFLOW_DESC= Enable quadriflow remesher
RAYOPTIMIZATION_DESC= Enable SSE optimizatons for raytracing
SDL_DESC= Audio and Joystick support using SDL
TBB_DESC= Enable use of Intel's tbb
+THUMBNAILER_DESC= Build blender thumbnailer
TRACE_DESC= Enable tracing image to GP stroke
XINPUT_DESC= X11 Xinput (tablet) support
XF86VMODE_DESC= X11 video mode switching support
diff --git a/graphics/blender/Makefile.versions b/graphics/blender/Makefile.versions
index e272f31db23f..5085badecb04 100644
--- a/graphics/blender/Makefile.versions
+++ b/graphics/blender/Makefile.versions
@@ -1,4 +1,4 @@
# Versions of Blender and its python dependency for use by depending ports, like add-ons
-BLENDER_BL_VERSION= 2.91.0
-BLENDER_PY_VERSION= 3.8
+BLENDER_BL_VERSION= 3.0.0
+BLENDER_PY_VERSION= 3.9
diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo
index a5929af893e4..0c6f09d93c6b 100644
--- a/graphics/blender/distinfo
+++ b/graphics/blender/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607230073
-SHA256 (blender-2.91.0.tar.xz) = 557a4afd09fe086ebcb0256b904896f577fe913683655f4248b881591f356974
-SIZE (blender-2.91.0.tar.xz) = 41528920
+TIMESTAMP = 1638967776
+SHA256 (blender-3.0.0.tar.xz) = 50f0f32bcdf8825a12ba5c8d853b6e6c6b2da65ef01e858ea5900a06cccbf1cb
+SIZE (blender-3.0.0.tar.xz) = 40169212
diff --git a/graphics/blender/files/blender.in b/graphics/blender/files/blender.in
new file mode 100644
index 000000000000..f8b889dae03d
--- /dev/null
+++ b/graphics/blender/files/blender.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export BLENDER_EXTERN_DRACO_LIBRARY_PATH=%%PYTHON_SITELIBDIR%%
+
+exec %%PREFIX%%/bin/blender-bin "$@"
diff --git a/graphics/blender/files/patch-CMakeLists.txt b/graphics/blender/files/patch-CMakeLists.txt
index ee48fd245d84..d15340b7747b 100644
--- a/graphics/blender/files/patch-CMakeLists.txt
+++ b/graphics/blender/files/patch-CMakeLists.txt
@@ -1,8 +1,8 @@
--- CMakeLists.txt.orig 2019-07-31 13:12:04 UTC
+++ CMakeLists.txt
-@@ -647,11 +647,6 @@ if(NOT WITH_PYTHON)
- set(WITH_DRACO OFF)
- endif()
+@@ -705,11 +705,6 @@ endif()
+ set_and_warn_dependency(WITH_PYTHON WITH_CYCLES OFF)
+ set_and_warn_dependency(WITH_PYTHON WITH_DRACO OFF)
-if(WITH_DRACO AND NOT WITH_PYTHON_INSTALL)
- message(STATUS "WITH_DRACO requires WITH_PYTHON_INSTALL to be ON, disabling WITH_DRACO for now")
@@ -11,4 +11,4 @@
-
# enable boost for cycles, audaspace or i18n
# otherwise if the user disabled
- if(NOT WITH_BOOST)
+
diff --git a/graphics/blender/files/patch-build_files_cmake_Modules_FindPythonLibsUnix.cmake b/graphics/blender/files/patch-build_files_cmake_Modules_FindPythonLibsUnix.cmake
deleted file mode 100644
index 78677986d315..000000000000
--- a/graphics/blender/files/patch-build_files_cmake_Modules_FindPythonLibsUnix.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- build_files/cmake/Modules/FindPythonLibsUnix.cmake.orig 2020-09-07 10:17:41 UTC
-+++ build_files/cmake/Modules/FindPythonLibsUnix.cmake
-@@ -34,7 +34,7 @@ IF(NOT PYTHON_ROOT_DIR AND NOT $ENV{PYTHON_ROOT_DIR} S
- SET(PYTHON_ROOT_DIR $ENV{PYTHON_ROOT_DIR})
- ENDIF()
-
--SET(PYTHON_VERSION 3.7 CACHE STRING "Python Version (major and minor only)")
-+SET(PYTHON_VERSION 3.8 CACHE STRING "Python Version (major and minor only)")
- MARK_AS_ADVANCED(PYTHON_VERSION)
-
-
diff --git a/graphics/blender/files/patch-intern_cycles_device_device__cpu.cpp b/graphics/blender/files/patch-intern_cycles_device_device__cpu.cpp
deleted file mode 100644
index 398b3e682382..000000000000
--- a/graphics/blender/files/patch-intern_cycles_device_device__cpu.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
---- intern/cycles/device/device_cpu.cpp.orig 2021-01-21 07:59:12 UTC
-+++ intern/cycles/device/device_cpu.cpp
-@@ -927,7 +927,7 @@ class CPUDevice : public Device {
- SIMD_SET_FLUSH_TO_ZERO;
-
- for (int sample = start_sample; sample < end_sample; sample++) {
-- if (task.get_cancel() || task_pool.canceled()) {
-+ if (task.get_cancel() || TaskPool::canceled()) {
- if (task.need_finish_queue == false)
- break;
- }
-@@ -1220,7 +1220,7 @@ class CPUDevice : public Device {
-
- void thread_render(DeviceTask &task)
- {
-- if (task_pool.canceled()) {
-+ if (TaskPool::canceled()) {
- if (task.need_finish_queue == false)
- return;
- }
-@@ -1290,7 +1290,7 @@ class CPUDevice : public Device {
-
- task.release_tile(tile);
-
-- if (task_pool.canceled()) {
-+ if (TaskPool::canceled()) {
- if (task.need_finish_queue == false)
- break;
- }
-@@ -1387,7 +1387,7 @@ class CPUDevice : public Device {
- task.offset,
- sample);
-
-- if (task.get_cancel() || task_pool.canceled())
-+ if (task.get_cancel() || TaskPool::canceled())
- break;
-
- task.update_progress(NULL);
diff --git a/graphics/blender/files/patch-intern_cycles_util_util__task.cpp b/graphics/blender/files/patch-intern_cycles_util_util__task.cpp
deleted file mode 100644
index a31068b686a4..000000000000
--- a/graphics/blender/files/patch-intern_cycles_util_util__task.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- intern/cycles/util/util_task.cpp.orig 2021-01-21 08:00:29 UTC
-+++ intern/cycles/util/util_task.cpp
-@@ -62,7 +62,7 @@ void TaskPool::cancel()
-
- bool TaskPool::canceled()
- {
-- return tbb_group.is_canceling();
-+ return tbb::is_current_task_group_canceling();
- }
-
- /* Task Scheduler */
diff --git a/graphics/blender/files/patch-intern_cycles_util_util__task.h b/graphics/blender/files/patch-intern_cycles_util_util__task.h
deleted file mode 100644
index 41ea4413d332..000000000000
--- a/graphics/blender/files/patch-intern_cycles_util_util__task.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- intern/cycles/util/util_task.h.orig 2021-01-21 08:01:04 UTC
-+++ intern/cycles/util/util_task.h
-@@ -61,7 +61,7 @@ class TaskPool {
- void wait_work(Summary *stats = NULL); /* work and wait until all tasks are done */
- void cancel(); /* cancel all tasks and wait until they are no longer executing */
-
-- bool canceled(); /* for worker threads, test if canceled */
-+ static bool canceled(); /* For worker threads, test if current task pool canceled. */
-
- protected:
- tbb::task_group tbb_group;
diff --git a/graphics/blender/files/patch-intern_cycles_util_util__tbb.h b/graphics/blender/files/patch-intern_cycles_util_util__tbb.h
deleted file mode 100644
index b9b33486db66..000000000000
--- a/graphics/blender/files/patch-intern_cycles_util_util__tbb.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- intern/cycles/util/util_tbb.h.orig 2021-01-23 14:10:16 UTC
-+++ intern/cycles/util/util_tbb.h
-@@ -36,7 +36,14 @@ using tbb::parallel_for;
-
- static inline void parallel_for_cancel()
- {
-+#if TBB_INTERFACE_VERSION_MAJOR >= 12
-+ tbb::task_group_context *ctx = tbb::task::current_context();
-+ if (ctx) {
-+ ctx->cancel_group_execution();
-+ }
-+#else
- tbb::task::self().cancel_group_execution();
-+#endif
- }
-
- CCL_NAMESPACE_END
diff --git a/graphics/blender/files/patch-release_scripts_addons_io__scene__gltf2_io_com_gltf2__io__draco__compression__extension.py b/graphics/blender/files/patch-release_scripts_addons_io__scene__gltf2_io_com_gltf2__io__draco__compression__extension.py
new file mode 100644
index 000000000000..afa9d714f23b
--- /dev/null
+++ b/graphics/blender/files/patch-release_scripts_addons_io__scene__gltf2_io_com_gltf2__io__draco__compression__extension.py
@@ -0,0 +1,11 @@
+--- release/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py.orig 2021-03-24 15:01:52 UTC
++++ release/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
+@@ -44,7 +44,7 @@ def dll_path() -> Path:
+ 'win32': '{}.dll'.format(lib_name),
+ 'linux': 'lib{}.so'.format(lib_name),
+ 'darwin': 'lib{}.dylib'.format(lib_name)
+- }.get(sys.platform)
++ }.get(sys.platform, 'lib{}.so'.format(lib_name))
+
+ if path is None or library_name is None:
+ print_console('WARNING', 'Unsupported platform {}, Draco mesh compression is unavailable'.format(sys.platform))
diff --git a/graphics/blender/files/patch-release_scripts_addons_io__scene__gltf2_io_exp_gltf2__io__draco__compression__extension.py b/graphics/blender/files/patch-release_scripts_addons_io__scene__gltf2_io_exp_gltf2__io__draco__compression__extension.py
deleted file mode 100644
index c481ef4a91bf..000000000000
--- a/graphics/blender/files/patch-release_scripts_addons_io__scene__gltf2_io_exp_gltf2__io__draco__compression__extension.py
+++ /dev/null
@@ -1,19 +0,0 @@
---- release/scripts/addons/io_scene_gltf2/io/exp/gltf2_io_draco_compression_extension.py.orig 2019-07-31 06:38:16 UTC
-+++ release/scripts/addons/io_scene_gltf2/io/exp/gltf2_io_draco_compression_extension.py
-@@ -13,6 +13,7 @@
- # limitations under the License.
-
- import bpy
-+import site
- import sys
- from ctypes import *
- from pathlib import Path
-@@ -35,7 +36,7 @@ def dll_path() -> Path:
- 'darwin': blender_root.parent/'Resources'/python_lib/'python3.7'/'site-packages'/'lib{}.dylib'.format(lib_name)
- }
-
-- path = paths.get(sys.platform)
-+ path = Path('{}/lib{}.so'.format(site.getsitepackages()[0], lib_name))
- return path if path is not None else ''
-
-
diff --git a/graphics/blender/files/patch-source_blender_blenlib_BLI__index__range.hh b/graphics/blender/files/patch-source_blender_blenlib_BLI__index__range.hh
deleted file mode 100644
index b9e978dcea1c..000000000000
--- a/graphics/blender/files/patch-source_blender_blenlib_BLI__index__range.hh
+++ /dev/null
@@ -1,26 +0,0 @@
---- source/blender/blenlib/BLI_index_range.hh.orig 2021-01-23 14:11:28 UTC
-+++ source/blender/blenlib/BLI_index_range.hh
-@@ -58,11 +58,6 @@
-
- #include "BLI_utildefines.h"
-
--/* Forward declare tbb::blocked_range for conversion operations. */
--namespace tbb {
--template<typename Value> class blocked_range;
--}
--
- namespace blender {
-
- template<typename T> class Span;
-@@ -84,11 +79,6 @@ class IndexRange {
- {
- BLI_assert(start >= 0);
- BLI_assert(size >= 0);
-- }
--
-- template<typename T>
-- IndexRange(const tbb::blocked_range<T> &range) : start_(range.begin()), size_(range.size())
-- {
- }
-
- class Iterator {
diff --git a/graphics/blender/files/patch-source_blender_blenlib_BLI__task.h b/graphics/blender/files/patch-source_blender_blenlib_BLI__task.h
deleted file mode 100644
index 10381ae933a7..000000000000
--- a/graphics/blender/files/patch-source_blender_blenlib_BLI__task.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- source/blender/blenlib/BLI_task.h.orig 2021-01-21 08:02:26 UTC
-+++ source/blender/blenlib/BLI_task.h
-@@ -104,8 +104,10 @@ void BLI_task_pool_work_and_wait(TaskPool *pool);
- /* cancel all tasks, keep worker threads running */
- void BLI_task_pool_cancel(TaskPool *pool);
-
--/* for worker threads, test if canceled */
--bool BLI_task_pool_canceled(TaskPool *pool);
-+/* for worker threads, test if current task pool canceled. this function may
-+ * only be called from worker threads and pool must be the task pool that the
-+ * thread is currently executing a task from. */
-+bool BLI_task_pool_current_canceled(TaskPool *pool);
-
- /* optional userdata pointer to pass along to run function */
- void *BLI_task_pool_user_data(TaskPool *pool);
diff --git a/graphics/blender/files/patch-source_blender_blenlib_intern_task__pool.cc b/graphics/blender/files/patch-source_blender_blenlib_intern_task__pool.cc
deleted file mode 100644
index d29dbe5a7329..000000000000
--- a/graphics/blender/files/patch-source_blender_blenlib_intern_task__pool.cc
+++ /dev/null
@@ -1,41 +0,0 @@
---- source/blender/blenlib/intern/task_pool.cc.orig 2020-11-25 19:01:32 UTC
-+++ source/blender/blenlib/intern/task_pool.cc
-@@ -131,6 +131,12 @@ class TBBTaskGroup : public tbb::task_group {
- public:
- TBBTaskGroup(TaskPriority priority)
- {
-+# if TBB_INTERFACE_VERSION_MAJOR >= 12
-+ /* TODO: support priorities in TBB 2021, where they are only available as
-+ * part of task arenas, no longer for task groups. Or remove support for
-+ * task priorities if they are no longer useful. */
-+ UNUSED_VARS(priority);
-+# else
- switch (priority) {
- case TASK_PRIORITY_LOW:
- my_context.set_priority(tbb::priority_low);
-@@ -139,6 +145,7 @@ class TBBTaskGroup : public tbb::task_group {
- my_context.set_priority(tbb::priority_normal);
- break;
- }
-+#endif
- }
-
- ~TBBTaskGroup()
-@@ -268,7 +275,7 @@ static bool tbb_task_pool_canceled(TaskPool *pool)
- {
- #ifdef WITH_TBB
- if (pool->use_threads) {
-- return pool->tbb_group.is_canceling();
-+ return tbb::is_current_task_group_canceling();
- }
- #else
- UNUSED_VARS(pool);
-@@ -520,7 +527,7 @@ void BLI_task_pool_cancel(TaskPool *pool)
- }
- }
-
--bool BLI_task_pool_canceled(TaskPool *pool)
-+bool BLI_task_pool_current_canceled(TaskPool *pool)
- {
- switch (pool->type) {
- case TASK_POOL_TBB:
diff --git a/graphics/blender/pkg-plist b/graphics/blender/pkg-plist
index 2bdd5078b034..c4a05cc92c41 100644
--- a/graphics/blender/pkg-plist
+++ b/graphics/blender/pkg-plist
@@ -1,5 +1,6 @@
bin/blender
-bin/blender-thumbnailer.py
+bin/blender-bin
+%%THUMBNAILER%%bin/blender-thumbnailer
%%DRACO%%%%PYTHON_SITELIBDIR%%/libextern_draco.so
man/man1/blender.1.gz
share/applications/blender.desktop
@@ -13,15 +14,15 @@ share/applications/blender.desktop
%%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/filmic/filmic_to_0-85_1-011.spi1d
%%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/filmic/filmic_to_0.99_1-0075.spi1d
%%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/filmic/filmic_to_1.20_1-00.spi1d
-%%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/luts/aces_to_xyz.spimtx
%%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/luts/dci_xyz.spi1d
%%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/luts/lg10.spi1d
%%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/luts/rec709.spi1d
-%%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/luts/rec709_to_aces.spimtx
%%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/luts/srgb.spi1d
%%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/luts/srgb_inv.spi1d
%%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/luts/srgb_to_xyz.spimtx
%%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/luts/vd16.spi1d
+%%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/luts/xyz_D65_to_E.spimtx
+%%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/luts/xyz_to_aces.spimtx
%%NLS%%%%DATADIR%%/%%VER%%/datafiles/fonts/bmonofont-i18n.ttf
%%NLS%%%%DATADIR%%/%%VER%%/datafiles/fonts/droidsans.ttf
%%DATADIR%%/%%VER%%/datafiles/icons/brush.gpencil_draw.draw.dat
@@ -63,6 +64,7 @@ share/applications/blender.desktop
%%DATADIR%%/%%VER%%/datafiles/icons/brush.sculpt.cloth.dat
%%DATADIR%%/%%VER%%/datafiles/icons/brush.sculpt.crease.dat
%%DATADIR%%/%%VER%%/datafiles/icons/brush.sculpt.displacement_eraser.dat
+%%DATADIR%%/%%VER%%/datafiles/icons/brush.sculpt.displacement_smear.dat
%%DATADIR%%/%%VER%%/datafiles/icons/brush.sculpt.draw.dat
%%DATADIR%%/%%VER%%/datafiles/icons/brush.sculpt.draw_face_sets.dat
%%DATADIR%%/%%VER%%/datafiles/icons/brush.sculpt.draw_sharp.dat
@@ -254,6 +256,7 @@ share/applications/blender.desktop
%%DATADIR%%/%%VER%%/datafiles/studiolights/matcap/toon.exr
%%DATADIR%%/%%VER%%/datafiles/studiolights/studio/basic.sl
%%DATADIR%%/%%VER%%/datafiles/studiolights/studio/outdoor.sl
+%%DATADIR%%/%%VER%%/datafiles/studiolights/studio/paint.sl
%%DATADIR%%/%%VER%%/datafiles/studiolights/studio/rim.sl
%%DATADIR%%/%%VER%%/datafiles/studiolights/studio/studio.sl
%%DATADIR%%/%%VER%%/datafiles/studiolights/world/city.exr
@@ -265,6 +268,8 @@ share/applications/blender.desktop
%%DATADIR%%/%%VER%%/datafiles/studiolights/world/studio.exr
%%DATADIR%%/%%VER%%/datafiles/studiolights/world/sunrise.exr
%%DATADIR%%/%%VER%%/datafiles/studiolights/world/sunset.exr
+%%DATADIR%%/%%VER%%/scripts/addons/.github/pull_request_template.md
+%%DATADIR%%/%%VER%%/scripts/addons/.github/stale.yml
%%DATADIR%%/%%VER%%/scripts/addons/add_camera_rigs/__init__.py
%%DATADIR%%/%%VER%%/scripts/addons/add_camera_rigs/build_rigs.py
%%DATADIR%%/%%VER%%/scripts/addons/add_camera_rigs/composition_guides_menu.py
@@ -407,152 +412,11 @@ share/applications/blender.desktop
%%DATADIR%%/%%VER%%/scripts/addons/archimesh/achm_window_maker.py
%%DATADIR%%/%%VER%%/scripts/addons/archimesh/achm_window_panel.py
%%DATADIR%%/%%VER%%/scripts/addons/archimesh/images/fabric_diffuse.png
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/__init__.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_2d.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_autoboolean.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_cutter.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_door.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_fence.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_floor.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_gl.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_handle.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_keymaps.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_manipulator.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_material.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_object.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_preset.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_progressbar.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_reference_point.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_rendering.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_roof.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_slab.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_snap.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_stair.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_thumbs.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_truss.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_wall2.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/archipack_window.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/bmesh_utils.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/icons/archipack.png
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/icons/detect.png
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/icons/door.png
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/icons/fence.png
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/icons/floor.png
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/icons/polygons.png
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/icons/roof.png
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/icons/selection.png
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/icons/slab.png
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/icons/stair.png
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/icons/truss.png
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/icons/union.png
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/icons/wall.png
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/icons/window.png
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/panel.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_door/160x200_dual.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_door/400x240_garage.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_door/80x200.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_fence/glass_panels.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_fence/inox_glass_concrete.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_fence/metal.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_fence/metal_glass.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_fence/wood.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_floor/boards_200x20.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_floor/herringbone_50x10.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_floor/herringbone_p_50x10.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_floor/hexagon_10.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_floor/hopscotch_30x30.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_floor/parquet_15x3.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_floor/stepping_stone_30x30.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_floor/tile_30x60.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_floor/windmill_30x30.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_materials/door.txt
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_materials/fence.txt
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_materials/floor.txt
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_materials/handle.txt
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_materials/roof.txt
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_materials/slab.txt
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_materials/stair.txt
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_materials/truss.txt
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_materials/wall2.txt
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_materials/window.txt
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_roof/braas_1.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_roof/braas_2.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_roof/eternit.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_roof/lauze.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_roof/metal.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_roof/ondule.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_roof/roman.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_roof/round.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_roof/square.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_stair/i_wood_over_concrete.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_stair/l_wood_over_concrete.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_stair/o_wood_over_concrete.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_stair/u_wood_over_concrete.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_window/120x110_flat_2.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_window/120x110_flat_2_elliptic.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_window/120x110_flat_2_oblique.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_window/120x110_flat_2_round.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_window/180x110_flat_3.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_window/180x210_flat_3.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_window/180x210_rail_2.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_window/240x210_rail_3.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_window/80x80_flat_1.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/archipack_window/80x80_flat_1_circle.py
-%%DATADIR%%/%%VER%%/scripts/addons/archipack/presets/missing.png
%%DATADIR%%/%%VER%%/scripts/addons/blender_id/CHANGELOG.md
%%DATADIR%%/%%VER%%/scripts/addons/blender_id/README.md
%%DATADIR%%/%%VER%%/scripts/addons/blender_id/__init__.py
%%DATADIR%%/%%VER%%/scripts/addons/blender_id/communication.py
%%DATADIR%%/%%VER%%/scripts/addons/blender_id/profiles.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/README.md
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/__init__.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/append_link.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/asset_inspector.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/autothumb.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/autothumb_material_bg.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/autothumb_model_bg.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/bg_blender.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/bkit_oauth.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/blendfiles/cleaned.blend
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/blendfiles/material_thumbnailer_cycles.blend
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/blendfiles/thumbnailer.blend
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/categories.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/colors.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/data/categories.json
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/download.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/icons.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/oauth.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/overrides.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/paths.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/ratings.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/rerequests.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/search.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/tasks_queue.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/arrow_left.png
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/arrow_right.png
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/bar_slider.png
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/flp.png
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/fp.png
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/locked.png
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/locked_large.png
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/rating_ui.png
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/rating_ui_empty.png
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/star_white.png
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/thumbnail_not_available.jpg
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/thumbnail_notready.jpg
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/vs_deleted.png
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/vs_on_hold.png
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/vs_ready.png
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/vs_rejected.png
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/vs_uploaded.png
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/vs_uploading.png
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/ui.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/ui_bgl.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/ui_panels.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/upload.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/upload_bg.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/utils.py
-%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/version_checker.py
%%DATADIR%%/%%VER%%/scripts/addons/bone_selection_sets.py
%%DATADIR%%/%%VER%%/scripts/addons/btrace/__init__.py
%%DATADIR%%/%%VER%%/scripts/addons/btrace/bTrace.py
@@ -623,6 +487,7 @@ share/applications/blender.desktop
%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_displacement.oso
%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_emission.oso
%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_environment_texture.oso
+%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_float_curve.oso
%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_fresnel.h
%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_fresnel.oso
%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_gamma.oso
@@ -698,15 +563,19 @@ share/applications/blender.desktop
%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/stdosl.h
%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/vector2.h
%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/vector4.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bake/bake.h
%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/bvh.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/bvh_embree.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/bvh_local.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/bvh_nodes.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/bvh_shadow_all.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/bvh_traversal.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/bvh_types.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/bvh_volume.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/bvh_volume_all.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/embree.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/local.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/nodes.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/shadow_all.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/traversal.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/types.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/util.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/volume.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/volume_all.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/camera/camera.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/camera/projection.h
%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/alloc.h
%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf.h
%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_ashikhmin_shirley.h
@@ -730,242 +599,190 @@ share/applications/blender.desktop
%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bssrdf.h
%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/emissive.h
%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/volume.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/filter/filter.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/filter/filter_defines.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/filter/filter_features.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/filter/filter_features_sse.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/filter/filter_kernel.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/filter/filter_nlm_cpu.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/filter/filter_nlm_gpu.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/filter/filter_prefilter.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/filter/filter_reconstruction.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/filter/filter_transform.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/filter/filter_transform_gpu.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/filter/filter_transform_sse.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/cuda/compat.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/cuda/config.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/cuda/globals.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/cuda/kernel.cu
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/gpu/image.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/gpu/kernel.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/gpu/parallel_active_index.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/gpu/parallel_prefix_sum.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/gpu/parallel_reduce.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/gpu/parallel_sorted_index.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/gpu/work_stealing.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/hip/compat.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/hip/config.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/hip/globals.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/hip/kernel.cpp
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/optix/compat.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/optix/globals.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/optix/kernel.cu
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/optix/kernel_shader_raytrace.cu
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/film/accumulate.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/film/adaptive_sampling.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/film/id_passes.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/film/passes.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/film/read.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/film/write_passes.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/attribute.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/curve.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/curve_intersect.h
%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/geom.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/geom_attribute.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/geom_curve.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/geom_curve_intersect.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/geom_motion_curve.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/geom_motion_triangle.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/geom_motion_triangle_intersect.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/geom_motion_triangle_shader.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/geom_object.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/geom_patch.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/geom_primitive.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/geom_subd_triangle.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/geom_triangle.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/geom_triangle_intersect.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/geom_volume.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_accumulate.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_adaptive_sampling.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_bake.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_camera.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_color.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_compat_cpu.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_compat_cuda.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_compat_opencl.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_compat_optix.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_differential.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_emission.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_film.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_globals.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_id_passes.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_jitter.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_light.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_light_background.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_light_common.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_math.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_montecarlo.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_passes.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_path.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_path_branched.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_path_common.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_path_state.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_path_subsurface.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_path_surface.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_path_volume.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_profiling.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_projection.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_queues.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_random.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_shader.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_shadow.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_subsurface.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_textures.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_types.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_volume.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_work_stealing.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_write_passes.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernels/cuda/filter.cu
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernels/cuda/kernel.cu
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernels/cuda/kernel_config.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernels/cuda/kernel_cuda_image.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernels/cuda/kernel_split.cu
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernels/opencl/filter.cl
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernels/opencl/kernel_adaptive_adjust_samples.cl
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernels/opencl/kernel_adaptive_filter_x.cl
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernels/opencl/kernel_adaptive_filter_y.cl
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernels/opencl/kernel_adaptive_stopping.cl
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernels/opencl/kernel_background.cl
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernels/opencl/kernel_bake.cl
*** 962 LINES SKIPPED ***