Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 4 Dec 2018 10:45:22 +0000 (11:45 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 4 Dec 2018 10:45:22 +0000 (11:45 +0100)
1  2 
source/blender/blenlib/intern/task.c

index b8b54e192b45e90d688f1e8386a764af79b919ce,f71c0d7a74818d2a7fcf97d357bb85305b711d79..047a7c0cc3b6e78930905e973db4cb2ec2f6eff6
@@@ -816,7 -816,7 +816,7 @@@ static void task_pool_push
                        return;
                }
        }
 -      /* Do push to a global execution ppol, slowest possible method,
 +      /* Do push to a global execution pool, slowest possible method,
         * causes quite reasonable amount of threading overhead.
         */
        task_scheduler_push(pool->scheduler, task, priority);
@@@ -1029,7 -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 +1089,7 @@@ void BLI_task_parallel_range(const int 
         * 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);
                           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);