diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2020-04-21 16:36:35 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2020-04-21 16:37:36 +0300 |
| commit | 2d6ad884664ec915f6704a6b0a67876150161669 (patch) | |
| tree | e935e87314166e0bca47b63e42c9f9eff3721a95 /source/blender/blenkernel | |
| parent | 23919d2275f22b44e1da6bc3860a66db03579f2f (diff) | |
CleanUp: Renamed `BLI_task_pool_userdata` to `BLI_task_pool_user_data`
In preparation for {D7475}
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_evaluate.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/ocean.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c index e5be85b5ec7..78991ad063d 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.c +++ b/source/blender/blenkernel/intern/mesh_evaluate.c @@ -1302,7 +1302,7 @@ static void loop_split_worker_do(LoopSplitTaskDataCommon *common_data, static void loop_split_worker(TaskPool *__restrict pool, void *taskdata, int UNUSED(threadid)) { - LoopSplitTaskDataCommon *common_data = BLI_task_pool_userdata(pool); + LoopSplitTaskDataCommon *common_data = BLI_task_pool_user_data(pool); LoopSplitTaskData *data = taskdata; /* Temp edge vectors stack, only used when computing lnor spacearr. */ diff --git a/source/blender/blenkernel/intern/ocean.c b/source/blender/blenkernel/intern/ocean.c index 2683d384bc7..4835a4c6a62 100644 --- a/source/blender/blenkernel/intern/ocean.c +++ b/source/blender/blenkernel/intern/ocean.c @@ -457,7 +457,7 @@ static void ocean_compute_displacement_y(TaskPool *__restrict pool, void *UNUSED(taskdata), int UNUSED(threadid)) { - OceanSimulateData *osd = BLI_task_pool_userdata(pool); + OceanSimulateData *osd = BLI_task_pool_user_data(pool); const Ocean *o = osd->o; fftw_execute(o->_disp_y_plan); @@ -467,7 +467,7 @@ static void ocean_compute_displacement_x(TaskPool *__restrict pool, void *UNUSED(taskdata), int UNUSED(threadid)) { - OceanSimulateData *osd = BLI_task_pool_userdata(pool); + OceanSimulateData *osd = BLI_task_pool_user_data(pool); const Ocean *o = osd->o; const float scale = osd->scale; const float chop_amount = osd->chop_amount; @@ -498,7 +498,7 @@ static void ocean_compute_displacement_z(TaskPool *__restrict pool, void *UNUSED(taskdata), int UNUSED(threadid)) { - OceanSimulateData *osd = BLI_task_pool_userdata(pool); + OceanSimulateData *osd = BLI_task_pool_user_data(pool); const Ocean *o = osd->o; const float scale = osd->scale; const float chop_amount = osd->chop_amount; @@ -529,7 +529,7 @@ static void ocean_compute_jacobian_jxx(TaskPool *__restrict pool, void *UNUSED(taskdata), int UNUSED(threadid)) { - OceanSimulateData *osd = BLI_task_pool_userdata(pool); + OceanSimulateData *osd = BLI_task_pool_user_data(pool); const Ocean *o = osd->o; const float chop_amount = osd->chop_amount; int i, j; @@ -564,7 +564,7 @@ static void ocean_compute_jacobian_jzz(TaskPool *__restrict pool, void *UNUSED(taskdata), int UNUSED(threadid)) { - OceanSimulateData *osd = BLI_task_pool_userdata(pool); + OceanSimulateData *osd = BLI_task_pool_user_data(pool); const Ocean *o = osd->o; const float chop_amount = osd->chop_amount; int i, j; @@ -599,7 +599,7 @@ static void ocean_compute_jacobian_jxz(TaskPool *__restrict pool, void *UNUSED(taskdata), int UNUSED(threadid)) { - OceanSimulateData *osd = BLI_task_pool_userdata(pool); + OceanSimulateData *osd = BLI_task_pool_user_data(pool); const Ocean *o = osd->o; const float chop_amount = osd->chop_amount; int i, j; @@ -628,7 +628,7 @@ static void ocean_compute_normal_x(TaskPool *__restrict pool, void *UNUSED(taskdata), int UNUSED(threadid)) { - OceanSimulateData *osd = BLI_task_pool_userdata(pool); + OceanSimulateData *osd = BLI_task_pool_user_data(pool); const Ocean *o = osd->o; int i, j; @@ -649,7 +649,7 @@ static void ocean_compute_normal_z(TaskPool *__restrict pool, void *UNUSED(taskdata), int UNUSED(threadid)) { - OceanSimulateData *osd = BLI_task_pool_userdata(pool); + OceanSimulateData *osd = BLI_task_pool_user_data(pool); const Ocean *o = osd->o; int i, j; |