Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2020-04-21 16:36:35 +0300
committerJeroen Bakker <jeroen@blender.org>2020-04-21 16:37:36 +0300
commit2d6ad884664ec915f6704a6b0a67876150161669 (patch)
treee935e87314166e0bca47b63e42c9f9eff3721a95 /source/blender/editors
parent23919d2275f22b44e1da6bc3860a66db03579f2f (diff)
CleanUp: Renamed `BLI_task_pool_userdata` to `BLI_task_pool_user_data`
In preparation for {D7475}
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/render/render_opengl.c2
-rw-r--r--source/blender/editors/space_clip/clip_editor.c2
-rw-r--r--source/blender/editors/space_clip/clip_ops.c2
-rw-r--r--source/blender/editors/space_file/filelist.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index b2b00006939..b0444f25a8c 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -1035,7 +1035,7 @@ typedef struct WriteTaskData {
static void write_result_func(TaskPool *__restrict pool, void *task_data_v, int UNUSED(thread_id))
{
- OGLRender *oglrender = (OGLRender *)BLI_task_pool_userdata(pool);
+ OGLRender *oglrender = (OGLRender *)BLI_task_pool_user_data(pool);
WriteTaskData *task_data = (WriteTaskData *)task_data_v;
Scene *scene = &task_data->tmp_scene;
RenderResult *rr = task_data->rr;
diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c
index bb383383013..657635b845d 100644
--- a/source/blender/editors/space_clip/clip_editor.c
+++ b/source/blender/editors/space_clip/clip_editor.c
@@ -887,7 +887,7 @@ static uchar *prefetch_thread_next_frame(PrefetchQueue *queue,
static void prefetch_task_func(TaskPool *__restrict pool, void *task_data, int UNUSED(threadid))
{
- PrefetchQueue *queue = (PrefetchQueue *)BLI_task_pool_userdata(pool);
+ PrefetchQueue *queue = (PrefetchQueue *)BLI_task_pool_user_data(pool);
MovieClip *clip = (MovieClip *)task_data;
uchar *mem;
size_t size;
diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c
index 3204374b747..b849fbd9250 100644
--- a/source/blender/editors/space_clip/clip_ops.c
+++ b/source/blender/editors/space_clip/clip_ops.c
@@ -1370,7 +1370,7 @@ static uchar *proxy_thread_next_frame(ProxyQueue *queue,
static void proxy_task_func(TaskPool *__restrict pool, void *task_data, int UNUSED(threadid))
{
ProxyThread *data = (ProxyThread *)task_data;
- ProxyQueue *queue = (ProxyQueue *)BLI_task_pool_userdata(pool);
+ ProxyQueue *queue = (ProxyQueue *)BLI_task_pool_user_data(pool);
uchar *mem;
size_t size;
int cfra;
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index ac8fa413f07..fbaebb66e01 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -1268,7 +1268,7 @@ static void filelist_cache_preview_runf(TaskPool *__restrict pool,
void *taskdata,
int UNUSED(threadid))
{
- FileListEntryCache *cache = BLI_task_pool_userdata(pool);
+ FileListEntryCache *cache = BLI_task_pool_user_data(pool);
FileListEntryPreviewTaskData *preview_taskdata = taskdata;
FileListEntryPreview *preview = preview_taskdata->preview;