forgot to use the thread setting function for rendering. (was only used for baking)
authorCampbell Barton <ideasman42@gmail.com>
Wed, 14 May 2008 16:49:33 +0000 (16:49 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 14 May 2008 16:49:33 +0000 (16:49 +0000)
source/blender/render/intern/source/pipeline.c

index 857269cb44db2243d6764c521e30eba886e63363..fb699f5b38273e7f085c3ff1b279604f4106e313 100644 (file)
@@ -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);
        }
 }