Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2014-04-18 01:16:12 +0400
committerThomas Dinges <blender@dingto.org>2014-04-18 01:17:04 +0400
commitd46e1b54f48dd476252e655b1f4ffda9873482c7 (patch)
treea33efed5c2952cbbbda91f5c717f954f351b2d68 /intern/cycles/app/cycles_standalone.cpp
parentad8a35a6593fc17f8b6bde3c813e7000bd2600b0 (diff)
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)
Diffstat (limited to 'intern/cycles/app/cycles_standalone.cpp')
-rw-r--r--intern/cycles/app/cycles_standalone.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp
index 75ecb78b200..839275e47f5 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();