Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 12 Sep 2018 09:30:35 +0000 (11:30 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 12 Sep 2018 09:30:35 +0000 (11:30 +0200)
source/blender/render/intern/source/external_engine.c

index 2623d2c2c0fd2774517a0707e731a28fc6381882..a06389bfcd45f6e879b800e4c2cdce462e6bc303 100644 (file)
@@ -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) {