diff options
author | Dima Panov <fluffy@FreeBSD.org> | 2022-02-01 19:57:51 +0300 |
---|---|---|
committer | Dima Panov <fluffy@FreeBSD.org> | 2022-02-01 20:04:15 +0300 |
commit | 2be8b8cac94734d338532625547c5d4bf230d630 (patch) | |
tree | 2e67217606c2e190325bda129a66e98c051a862f /graphics/blender/files/patch-intern_cycles_util_util__task.cpp | |
parent | graphics/blender-lts29: copy from graphics/blender and update to 2.93.6 (diff) |
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.
Diffstat (limited to 'graphics/blender/files/patch-intern_cycles_util_util__task.cpp')
-rw-r--r-- | graphics/blender/files/patch-intern_cycles_util_util__task.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
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 */ |