[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14841] trunk/blender/source/blender/ render/intern/source/pipeline.c: forgot to use the thread setting function for rendering.

Campbell Barton ideasman42 at gmail.com
Wed May 14 18:49:33 CEST 2008


Revision: 14841
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14841
Author:   campbellbarton
Date:     2008-05-14 18:49:33 +0200 (Wed, 14 May 2008)

Log Message:
-----------
forgot to use the thread setting function for rendering. (was only used for baking)

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2008-05-14 16:40:25 UTC (rev 14840)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2008-05-14 16:49:33 UTC (rev 14841)
@@ -1118,11 +1118,7 @@
 		/* 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);
 	}
 }
 





More information about the Bf-blender-cvs mailing list