diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2018-01-28 17:41:04 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2018-01-28 17:41:04 +0300 |
commit | 471b410e439ec24c1e539bfda2074ba4076c72a5 (patch) | |
tree | b6a7ee14668a29defa1e8a1b0c58c1ef3c78d9a7 /source/blender | |
parent | 9e56f6357fd1c49c1ae9a5ae72a1f7ac1213bec2 (diff) |
Fix outdated usage of BLI_task_parallel_range.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/mesh_sample.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/mesh_sample.c b/source/blender/blenkernel/intern/mesh_sample.c index 0d40b6db367..fac28da63fb 100644 --- a/source/blender/blenkernel/intern/mesh_sample.c +++ b/source/blender/blenkernel/intern/mesh_sample.c @@ -836,7 +836,10 @@ static void generator_poissondisk_free(MSurfaceSampleGenerator_PoissonDisk *gen) MEM_freeN(gen); } -static void generator_poissondisk_uniform_sample_eval(void *userdata, const int iter) +static void generator_poissondisk_uniform_sample_eval( + void *__restrict userdata, + const int iter, + const ParallelRangeTLS *__restrict UNUSED(tls)) { void *(*ptrs)[3] = userdata; MSurfaceSampleGenerator_PoissonDisk *gen = (*ptrs)[0]; @@ -961,7 +964,12 @@ static void generator_poissondisk_bind(MSurfaceSampleGenerator_PoissonDisk *gen) MeshSample *samples = MEM_mallocN(sizeof(MeshSample) * gen->num_uniform_samples, "poisson disk uniform samples"); BKE_mesh_sample_generate_batch(gen->uniform_gen, samples, (int)gen->num_uniform_samples); void *ptrs[3] = { gen, samples, dm }; - BLI_task_parallel_range(0, (int)gen->num_uniform_samples, &ptrs, generator_poissondisk_uniform_sample_eval, true); + { + ParallelRangeSettings settings; + BLI_parallel_range_settings_defaults(&settings); + settings.use_threading = true; + BLI_task_parallel_range(0, (int)gen->num_uniform_samples, &ptrs, generator_poissondisk_uniform_sample_eval, &settings); + } MEM_freeN(samples); BKE_mesh_sample_generator_unbind(gen->uniform_gen); |