diff options
author | Jeroen Bakker <jeroen@blender.org> | 2020-08-25 12:56:27 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2020-08-25 12:56:27 +0300 |
commit | ac8825621f87dbfa9a2eadd895158843fe2e72a4 (patch) | |
tree | 994b885e97d3edc68ef0bc69fa936a933b39fe67 /source/blender | |
parent | 189ba40e9bd9ca6f54892038be8e41301645b7ce (diff) | |
parent | 263cf2ea945ac1224023f92a9767111956ecca24 (diff) |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/draw/intern/draw_cache_impl_mesh.c | 3 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_templates.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index 0e2be993787..4acae2fc816 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -1548,6 +1548,9 @@ 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/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c index 4f15cec8c84..654bb94cc78 100644 --- a/source/blender/editors/space_node/node_templates.c +++ b/source/blender/editors/space_node/node_templates.c @@ -281,7 +281,9 @@ static void node_socket_add_replace(const bContext *C, /* also preserve mapping for texture nodes */ if (node_from->typeinfo->nclass == NODE_CLASS_TEXTURE && - node_prev->typeinfo->nclass == NODE_CLASS_TEXTURE) { + node_prev->typeinfo->nclass == NODE_CLASS_TEXTURE && + /* White noise texture node does not have NodeTexBase. */ + node_from->storage != NULL && node_prev->storage != NULL) { memcpy(node_from->storage, node_prev->storage, sizeof(NodeTexBase)); } |