[Bf-blender-cvs] [024a9d17d29] blender-v2.90-release: Revert "Enabled workaround to solve threading issues in draw manager"

Jeroen Bakker noreply at git.blender.org
Tue Aug 25 11:29:35 CEST 2020


Commit: 024a9d17d29d9461a22c715a9ce24084c2a61748
Author: Jeroen Bakker
Date:   Tue Aug 25 11:29:20 2020 +0200
Branches: blender-v2.90-release
https://developer.blender.org/rB024a9d17d29d9461a22c715a9ce24084c2a61748

Revert "Enabled workaround to solve threading issues in draw manager"

This reverts commit 141a8ff6b3b1170d5551ef08895f1b7fac145235.

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

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/draw/intern/draw_cache_impl_mesh.c
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 260b439d0fb..2b3c19f5f61 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 260b439d0fb15e3cd1efe5c120cf24f91d13d855
+Subproject commit 2b3c19f5f61fc72dba56a7edfdc4e55e2327dc1f
diff --git a/release/scripts/addons b/release/scripts/addons
index 97be901f077..49c39f59fbc 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 97be901f0772a0e57e2c8c99b9b6336b6be8aec5
+Subproject commit 49c39f59fbc464dd34388990123f271c39eacbf4
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index f2f4a8b3bfa..a52733b58d9 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit f2f4a8b3bfa36ee49f7bdb3a1acb40ef4b39ee3a
+Subproject commit a52733b58d95ce60ecde95a9eca242e7319c285a
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c
index d3a057b1016..361c66eca6e 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -1549,9 +1549,6 @@ void DRW_mesh_batch_cache_create_requested(struct TaskGraph *task_graph,
                                      scene,
                                      ts,
                                      use_hide);
-  /* TODO(jbakker): Work-around for threading issues in 2.90. See T79533, T79038. Needs to be
-   * solved or made permanent in 2.91. Underlying issue still needs to be researched. */
-  BLI_task_graph_work_and_wait(task_graph);
 #ifdef DEBUG
   drw_mesh_batch_cache_check_available(task_graph, me);
 #endif
diff --git a/source/tools b/source/tools
index 6a252de776d..896c5f78952 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 6a252de776d0b9dca3167c30a7621a4f1e9bc911
+Subproject commit 896c5f78952adb2d091d28c65086d46992dabdac



More information about the Bf-blender-cvs mailing list