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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-09-17 14:55:18 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-09-17 14:55:18 +0400
commit89eeae955b1c3904c0c511e93d63f3f1677773fb (patch)
tree49bbad1820d846f8d63737857b4e4f3108da6537 /intern/cycles/render/session.h
parentbd4de709fd74d4d134795b7c9b35e37d9ed2e2bb (diff)
Cycles: change preview "resolution divider" that gave the number of lower
resolutions to render, to a "start resolution" which gives the resolution to start at. This avoids unnecessary rendering of small resolutions in small viewports, and avoids long waiting on big viewports.
Diffstat (limited to 'intern/cycles/render/session.h')
-rw-r--r--intern/cycles/render/session.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h
index e45753d22a0..a3a2751fb23 100644
--- a/intern/cycles/render/session.h
+++ b/intern/cycles/render/session.h
@@ -48,7 +48,7 @@ public:
bool experimental;
int samples;
int2 tile_size;
- int resolution;
+ int start_resolution;
int threads;
double cancel_timeout;
@@ -64,7 +64,7 @@ public:
experimental = false;
samples = INT_MAX;
tile_size = make_int2(64, 64);
- resolution = 4;
+ start_resolution = INT_MAX;
threads = 0;
cancel_timeout = 0.1;
@@ -81,7 +81,7 @@ public:
&& progressive == params.progressive
&& experimental == params.experimental
&& tile_size == params.tile_size
- && resolution == params.resolution
+ && start_resolution == params.start_resolution
&& threads == params.threads
&& cancel_timeout == params.cancel_timeout
&& reset_timeout == params.reset_timeout