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>2013-04-05 21:57:26 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-04-05 21:57:26 +0400
commit7404c1a553662c4dc1468a78b2237cd54c9598a2 (patch)
tree0fe3bc280d2e46024542419c15ec34986d41570d /intern/cycles/render/tile.h
parent93ac968db3bc47e3520c662671cf68e86c0f2204 (diff)
Fix another part of #34877: cycles progress status text not showing correct with
per render layer samples in addition to the progress bar. Also fixed job progress bar not working at all on high DPI / retina, was so small the actual progress was not visible.
Diffstat (limited to 'intern/cycles/render/tile.h')
-rw-r--r--intern/cycles/render/tile.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/render/tile.h b/intern/cycles/render/tile.h
index 99cffb49c08..0e9e5a73a42 100644
--- a/intern/cycles/render/tile.h
+++ b/intern/cycles/render/tile.h
@@ -58,6 +58,8 @@ public:
list<Tile> tiles;
} state;
+ int num_samples;
+
TileManager(bool progressive, int num_samples, int2 tile_size, int start_resolution,
bool preserve_tile_device, bool background, int tile_order, int num_devices = 1);
~TileManager();
@@ -82,7 +84,6 @@ protected:
void set_tiles();
bool progressive;
- int num_samples;
int2 tile_size;
int tile_order;
int start_resolution;