From 2be8b8cac94734d338532625547c5d4bf230d630 Mon Sep 17 00:00:00 2001 From: Dima Panov Date: Tue, 1 Feb 2022 19:57:51 +0300 Subject: 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. --- .../patch-intern_cycles_device_device__cpu.cpp | 38 ---------------------- 1 file changed, 38 deletions(-) delete mode 100644 graphics/blender/files/patch-intern_cycles_device_device__cpu.cpp (limited to 'graphics/blender/files/patch-intern_cycles_device_device__cpu.cpp') 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); -- cgit v1.2.3