[Bf-blender-cvs] [cea412a3c23] temp-compositor-scheduling: Fix crash when using TBB.

Jeroen Bakker noreply at git.blender.org
Fri Apr 2 09:53:37 CEST 2021


Commit: cea412a3c2380e1d927b69b0efe3bfd6319ac561
Author: Jeroen Bakker
Date:   Fri Apr 2 09:50:46 2021 +0200
Branches: temp-compositor-scheduling
https://developer.blender.org/rBcea412a3c2380e1d927b69b0efe3bfd6319ac561

Fix crash when using TBB.

===================================================================

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/compositor/intern/COM_WorkScheduler.cc
M	source/tools

===================================================================

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 2cef4877edc..ab4b259ab5f 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 2cef4877edc40875978c4e95322bb5193f5815bf
+Subproject commit ab4b259ab5f078e1276a5c915b62673f30c51296
diff --git a/release/scripts/addons b/release/scripts/addons
index 63492d3d033..08e9ab150d1 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 63492d3d0334e1827f611f8fe5a931f3ccbddfc0
+Subproject commit 08e9ab150d105ba4de2b977b94ab794efd6fd1f2
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index f948f658ba3..5523cbaed60 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit f948f658ba33eb670a65e0bba058d43138abea7e
+Subproject commit 5523cbaed60719960f5f7b2486925145ecbe81e5
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cc b/source/blender/compositor/intern/COM_WorkScheduler.cc
index 2fdca10e67d..ca3dfa9751b 100644
--- a/source/blender/compositor/intern/COM_WorkScheduler.cc
+++ b/source/blender/compositor/intern/COM_WorkScheduler.cc
@@ -407,7 +407,6 @@ static void threading_model_task_execute(TaskPool *__restrict UNUSED(pool), void
   CPUDevice device(BLI_task_parallel_thread_id(nullptr));
   BLI_thread_local_set(g_thread_device, &device);
   device.execute(package);
-  delete package;
 }
 
 static void threading_model_task_schedule(WorkPackage *package)
diff --git a/source/tools b/source/tools
index b66c22e1fb9..e6bcdc8a3ef 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit b66c22e1fb977bf8dd3797ebedc28fbe28f0305e
+Subproject commit e6bcdc8a3ef99a6cd23ab63202ef743713fa24ff



More information about the Bf-blender-cvs mailing list