bugfix [#14796] -t <threads> command line switch doesn't work unless FIXED_THREADS has previously been turned on

Command line threads now override blendfile setting in background mode.
Command line Threads greater then 8 are now clamped.

1 files changed, 3 insertions, 3 deletions

diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index ebb52c49132..6a0af82b4d7 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2675,9 +2675,9 @@ void RE_set_max_threads(int threads)
 
 void RE_init_threadcount(Render *re) 
 {
-	if ((re->r.mode & R_FIXED_THREADS)==0 || commandline_threads == 0) { /* Automatic threads */
+        if(commandline_threads >= 1) { /* only set as an arg in background mode */
+		re->r.threads= MIN2(commandline_threads, BLENDER_MAX_THREADS);
+	} else if ((re->r.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;
 	}
 }