Merge branch 'blender-v2.90-release'

This commit is contained in:
Jeroen Bakker 2020-08-25 11:56:27 +02:00
commit ac8825621f
2 changed files with 6 additions and 1 deletions

View File

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

View File

@ -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));
}