Commit: e26887598f6d8b72cff574aace14002f9110b51a
Author: Campbell Barton
Date: Fri Jul 16 12:04:07 2021 +1000
Branches: master
https://developer.blender.org/rBe26887598f6d8b72cff574aace14002f9110b51a
Fix error using uninitialized state in BLI_task_parallel_mempool
Single threaded operation used the state before it had variables
written into it.
Error in 15cdcb4e9085c3cf35528c2f7e559955b4ff531a.
===================================================================
M source/blender/blenlib/intern/task_iterator.c
===================================================================
diff --git a/source/blender/blenlib/intern/task_iterator.c
b/source/blender/blenlib/intern/task_iterator.c
index 33af4894b48..e9d63c6a4ea 100644
--- a/source/blender/blenlib/intern/task_iterator.c
+++ b/source/blender/blenlib/intern/task_iterator.c
@@ -429,7 +429,7 @@ void BLI_task_parallel_mempool(BLI_mempool *mempool,
userdata_chunk_local = MALLOCA(userdata_chunk_size);
memcpy(userdata_chunk_local, userdata_chunk, userdata_chunk_size);
if (settings->func_init != NULL) {
- settings->func_init(state.userdata, userdata_chunk_local);
+ settings->func_init(userdata, userdata_chunk_local);
}
tls.userdata_chunk = userdata_chunk_local;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
