diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-05-14 20:49:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-05-14 20:49:33 +0400 |
| commit | d1b04a3a9d67f054d978c407461c3f92161a4cc8 (patch) | |
| tree | e73ea4509f053719e15a0480331911855b1aa053 /source/blender/render | |
| parent | 540c0e07952304aa67ec98be4dc01b17afa78cb1 (diff) | |
forgot to use the thread setting function for rendering. (was only used for baking)
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 857269cb44d..fb699f5b382 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -1118,11 +1118,7 @@ void RE_InitState(Render *re, Render *source, RenderData *rd, int winx, int winy /* we clip faces with a minimum of 2 pixel boundary outside of image border. see zbuf.c */ re->clipcrop= 1.0f + 2.0f/(float)(re->winx>re->winy?re->winy:re->winx); - if ((rd->mode & R_FIXED_THREADS)==0 || commandline_threads == 0) { /* Automatic threads */ - re->r.threads = BLI_system_thread_count(); - } else if(commandline_threads >= 1 && commandline_threads<=BLENDER_MAX_THREADS) { - re->r.threads= commandline_threads; - } + RE_init_threadcount(re); } } |