diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-12 12:30:35 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-12 12:30:35 +0300 |
| commit | 4464a86a6e0d368209995ea5ea52990e1656b356 (patch) | |
| tree | 1195466fd1bac89f17179ec83390c8f485bdc694 /source/blender/render | |
| parent | 8f1027a58b501422e458b24a113d24183a8da2d3 (diff) | |
| parent | f088bbae6af2224b49103d8cba5129f92796ffa6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/external_engine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index 2623d2c2c0f..a06389bfcd4 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -459,7 +459,7 @@ rcti* RE_engine_get_current_tiles(Render *re, int *r_total_tiles, bool *r_needs_ if (pa->status == PART_STATUS_IN_PROGRESS) { if (total_tiles >= allocation_size) { /* Just in case we're using crazy network rendering with more - * slaves as BLENDER_MAX_THREADS. + * workers than BLENDER_MAX_THREADS. */ allocation_size += allocation_step; if (tiles == tiles_static) { |