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/tile.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/tile.h')
-rw-r--r--intern/cycles/render/tile.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/intern/cycles/render/tile.h b/intern/cycles/render/tile.h
index 29f2b1ef9f9..d820f74e3bd 100644
--- a/intern/cycles/render/tile.h
+++ b/intern/cycles/render/tile.h
@@ -51,13 +51,13 @@ public:
BufferParams buffer;
int sample;
int num_samples;
- int resolution;
+ int resolution_divider;
int num_tiles;
int num_rendered_tiles;
list<Tile> tiles;
} state;
- TileManager(bool progressive, int num_samples, int2 tile_size, int resolution, int num_devices = 1);
+ TileManager(bool progressive, int num_samples, int2 tile_size, int start_resolution, int num_devices = 1);
~TileManager();
void reset(BufferParams& params, int num_samples);
@@ -72,10 +72,8 @@ protected:
bool progressive;
int num_samples;
int2 tile_size;
- int resolution;
- int num_devices;
-
int start_resolution;
+ int num_devices;
list<Tile>::iterator next_center_tile(int device = 0);
};