[Bf-blender-cvs] [d46e1b5] master: Cycles Standalone: Use progressive refine in background mode too.

[Thomas Dinges]

Commit: d46e1b54f48dd476252e655b1f4ffda9873482c7
Author: Thomas Dinges
Date:   Thu Apr 17 23:16:12 2014 +0200
https://developer.blender.org/rBd46e1b54f48dd476252e655b1f4ffda9873482c7

Cycles Standalone: Use progressive refine in background mode too.

This is only a workaround, with tiled rendering the image output has a wrong aspect ratio. (squashed image)

===================================================================

M	intern/cycles/app/cycles_standalone.cpp

===================================================================

diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp
index 75ecb78..839275e 100644
--- a/intern/cycles/app/cycles_standalone.cpp
+++ b/intern/cycles/app/cycles_standalone.cpp
@@ -371,15 +371,13 @@ static void options_parse(int argc, const char **argv)
 	else if(ssname == "svm")
 		options.scene_params.shadingsystem = SceneParams::SVM;
 
-#ifdef WITH_CYCLES_STANDALONE_GUI
-	/* Progressive rendering for GUI */
-	if(!options.session_params.background)
-		options.session_params.progressive = true;
-#else
-	/* When building without GUI, set background */
+#ifndef WITH_CYCLES_STANDALONE_GUI
 	options.session_params.background = true;
 #endif
 
+	/* Use progressive rendering */
+	options.session_params.progressive = true;
+
 	/* find matching device */
 	DeviceType device_type = Device::type_from_string(devicename.c_str());
 	vector<DeviceInfo>& devices = Device::available_devices();