blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

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

This reverts commit 141a8ff6b3.
This commit is contained in:
Jeroen Bakker 2020-08-25 11:29:20 +02:00
parent 8bb93ca80a
commit 024a9d17d2
5 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/datafiles/locale

@ -1 +1 @@
Subproject commit 260b439d0fb15e3cd1efe5c120cf24f91d13d855
Subproject commit 2b3c19f5f61fc72dba56a7edfdc4e55e2327dc1f

2
release/scripts/addons

@ -1 +1 @@
Subproject commit 97be901f0772a0e57e2c8c99b9b6336b6be8aec5
Subproject commit 49c39f59fbc464dd34388990123f271c39eacbf4

2
release/scripts/addons_contrib

@ -1 +1 @@
Subproject commit f2f4a8b3bfa36ee49f7bdb3a1acb40ef4b39ee3a
Subproject commit a52733b58d95ce60ecde95a9eca242e7319c285a

3
source/blender/draw/intern/draw_cache_impl_mesh.c
View File

@ -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

2
source/tools

@ -1 +1 @@
Subproject commit 6a252de776d0b9dca3167c30a7621a4f1e9bc911
Subproject commit 896c5f78952adb2d091d28c65086d46992dabdac