diff options
| author | Julian Eisel <julian@blender.org> | 2021-06-05 18:51:46 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2021-06-05 18:51:46 +0300 |
| commit | 87a821397fa4db7b72ea809ee29c319cf4788a1a (patch) | |
| tree | 5b14c3657585b7e64ce1a3e14492925e0a79f473 /intern/cycles/util | |
| parent | d6e9b0ce5d61f64a3879459c9d39a151aabdea81 (diff) | |
| parent | edaaa2afddb2132e56f39791e559b084b6df8773 (diff) | |
Merge branch 'master' into asset-system-filelistasset-system-filelist
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_task.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/util/util_task.h b/intern/cycles/util/util_task.h index 7c39ed675b5..906bf420756 100644 --- a/intern/cycles/util/util_task.h +++ b/intern/cycles/util/util_task.h @@ -32,7 +32,7 @@ typedef function<void(void)> TaskRunFunction; /* Task Pool * - * Pool of tasks that will be executed by the central TaskScheduler.For each + * Pool of tasks that will be executed by the central TaskScheduler. For each * pool, we can wait for all tasks to be done, or cancel them before they are * done. * @@ -77,7 +77,7 @@ class TaskPool { /* Task Scheduler * - * Central scheduler that holds running threads ready to execute tasks. A singe + * Central scheduler that holds running threads ready to execute tasks. A single * queue holds the task from all pools. */ class TaskScheduler { |