Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenlib / intern / task.c
index b8b54e192b45e90d688f1e8386a764af79b919ce..047a7c0cc3b6e78930905e973db4cb2ec2f6eff6 100644 (file)
@@ -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);