diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-02-15 17:13:46 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-15 17:13:46 +0300 |
commit | 2aef87bfae4a6a91f626780767aab68b7791c9d4 (patch) | |
tree | 8c920050c424fd30fc649ad5b9a374b517f2ebad /source/blender/nodes/texture | |
parent | ccdacf1c9b31b15e188aa9e9adb044ffd0ca0da4 (diff) |
Cleanup: rename BLI_thread.h API
- Use BLI_threadpool_ prefix for (deprecated)
thread/listbase API.
- Use BLI_thread as prefix for other functions.
See P614 to apply instead of manually resolving conflicts.
Diffstat (limited to 'source/blender/nodes/texture')
-rw-r--r-- | source/blender/nodes/texture/node_texture_tree.c | 4 | ||||
-rw-r--r-- | source/blender/nodes/texture/nodes/node_texture_image.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c index 714665c303b..bc48802a7ca 100644 --- a/source/blender/nodes/texture/node_texture_tree.c +++ b/source/blender/nodes/texture/node_texture_tree.c @@ -345,10 +345,10 @@ int ntreeTexExecTree( /* ensure execdata is only initialized once */ if (!exec) { - BLI_lock_thread(LOCK_NODES); + BLI_thread_lock(LOCK_NODES); if (!nodes->execdata) ntreeTexBeginExecTree(nodes); - BLI_unlock_thread(LOCK_NODES); + BLI_thread_unlock(LOCK_NODES); exec = nodes->execdata; } diff --git a/source/blender/nodes/texture/nodes/node_texture_image.c b/source/blender/nodes/texture/nodes/node_texture_image.c index 8e9821c0fcb..69c8f4b7262 100644 --- a/source/blender/nodes/texture/nodes/node_texture_image.c +++ b/source/blender/nodes/texture/nodes/node_texture_image.c @@ -64,10 +64,10 @@ static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **UNUSED(i if ( (!xsize) || (!ysize) ) return; if (!ibuf->rect_float) { - BLI_lock_thread(LOCK_IMAGE); + BLI_thread_lock(LOCK_IMAGE); if (!ibuf->rect_float) IMB_float_from_rect(ibuf); - BLI_unlock_thread(LOCK_IMAGE); + BLI_thread_unlock(LOCK_IMAGE); } while (px < 0) px += ibuf->x; |