diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-09-19 05:14:36 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-19 05:14:36 +0300 |
commit | f35e9f047a0381732a41ec331945b7a0654ee578 (patch) | |
tree | 5be3c632483cf2bc2960b21789849af27c9b2b59 /source/blender/imbuf | |
parent | 0ad183bf0289c3b9b1af0cd581bc30435cae3800 (diff) | |
parent | bb3ec3ebafbc2c0e5d8530148a433242e0adad30 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/intern/imageprocess.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/imbuf/intern/imageprocess.c b/source/blender/imbuf/intern/imageprocess.c index 2eec5da7bc4..507455c47f4 100644 --- a/source/blender/imbuf/intern/imageprocess.c +++ b/source/blender/imbuf/intern/imageprocess.c @@ -391,7 +391,7 @@ static void processor_apply_scanline_func(TaskPool * __restrict pool, int UNUSED(threadid)) { ScanlineGlobalData *data = BLI_task_pool_userdata(pool); - int start_scanline = GET_INT_FROM_POINTER(taskdata); + int start_scanline = POINTER_AS_INT(taskdata); int num_scanlines = min_ii(data->scanlines_per_task, data->total_scanlines - start_scanline); data->do_thread(data->custom_data, @@ -415,7 +415,7 @@ void IMB_processor_apply_threaded_scanlines(int total_scanlines, for (int i = 0, start_line = 0; i < total_tasks; i++) { BLI_task_pool_push(task_pool, processor_apply_scanline_func, - SET_INT_IN_POINTER(start_line), + POINTER_FROM_INT(start_line), false, TASK_PRIORITY_LOW); start_line += scanlines_per_task; |