diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-04 13:45:22 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-04 13:45:22 +0300 |
| commit | df2635099bfcc32aa71963684641be8077b524cb (patch) | |
| tree | 43f698c4142d3086830d80f89ee850db48a38a25 /source/blender/blenlib/intern/task.c | |
| parent | c6f47ffa98d3fe9c83b2e19b9310a133e842685b (diff) | |
| parent | 3f31ec83984b19efe174319ae1d86995a4c26ecc (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib/intern/task.c')
| -rw-r--r-- | source/blender/blenlib/intern/task.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/task.c b/source/blender/blenlib/intern/task.c index b8b54e192b4..047a7c0cc3b 100644 --- a/source/blender/blenlib/intern/task.c +++ b/source/blender/blenlib/intern/task.c @@ -1029,7 +1029,7 @@ static void parallel_range_func( } } -static void palallel_range_single_thread(const int start, int const stop, +static void parallel_range_single_thread(const int start, int const stop, void *userdata, TaskParallelRangeFunc func, const ParallelRangeSettings *settings) @@ -1089,7 +1089,7 @@ void BLI_task_parallel_range(const int start, const int stop, * do everything from the main thread. */ if (!settings->use_threading) { - palallel_range_single_thread(start, stop, + parallel_range_single_thread(start, stop, userdata, func, settings); @@ -1126,7 +1126,7 @@ void BLI_task_parallel_range(const int start, const int stop, max_ii(1, (stop - start) / state.chunk_size)); if (num_tasks == 1) { - palallel_range_single_thread(start, stop, + parallel_range_single_thread(start, stop, userdata, func, settings); |