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>2011-12-21 17:48:35 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-12-21 17:48:35 +0400
commit34909c64e57149c997ebb7e3d794c6ceff0541b0 (patch)
treeeddc440c3e8d9a0eaef3476411bca2219f266285 /intern/cycles/render/tile.cpp
parent045a91a37860dd40a2604f8208325b8d11c9e3a9 (diff)
Cycles: some small code refactoring related to buffer parameters.
Diffstat (limited to 'intern/cycles/render/tile.cpp')
-rw-r--r--intern/cycles/render/tile.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/intern/cycles/render/tile.cpp b/intern/cycles/render/tile.cpp
index b118a7ba478..40833e5b08b 100644
--- a/intern/cycles/render/tile.cpp
+++ b/intern/cycles/render/tile.cpp
@@ -55,10 +55,7 @@ void TileManager::reset(BufferParams& params_, int samples_)
samples = samples_;
- state.full_x = 0;
- state.full_y = 0;
- state.width = 0;
- state.height = 0;
+ state.buffer = BufferParams();
state.sample = -1;
state.resolution = start_resolution;
state.tiles.clear();
@@ -92,10 +89,13 @@ void TileManager::set_tiles()
}
}
- state.full_x = params.full_x/resolution;
- state.full_y = params.full_y/resolution;
- state.width = image_w;
- state.height = image_h;
+ state.buffer.width = image_w;
+ state.buffer.height = image_h;
+
+ state.buffer.full_x = params.full_x/resolution;
+ state.buffer.full_y = params.full_y/resolution;
+ state.buffer.full_width = max(1, params.full_width/resolution);
+ state.buffer.full_height = max(1, params.full_height/resolution);
}
bool TileManager::done()