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-08-28 17:55:59 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-08-28 17:55:59 +0400
commitbae896691aa3d7bb2a75292da3cc490894996b01 (patch)
tree9c3703f11ccdf76c575c2ea18b70dee1ff665913 /intern/cycles/render/session.h
parentd48e4fc92be346810baa8cac595ab0a735882a87 (diff)
Cycles:
* Add alpha pass output, to use set Transparent option in Film panel. * Add Holdout closure (OSL terminology), this is like the Sky option in the internal renderer, objects with this closure show the background / zero alpha. * Add option to use Gaussian instead of Box pixel filter in the UI. * Remove camera response curves for now, they don't really belong here in the pipeline, should be moved to compositor. * Output full float values for rendering now, previously was only byte precision. * Add a patch from Thomas to get a preview passes option, but still disabled because it isn't quite working right yet. * CUDA: don't compile shader graph evaluation inline. * Convert tabs to spaces in python files.
Diffstat (limited to 'intern/cycles/render/session.h')
-rw-r--r--intern/cycles/render/session.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h
index 3411dcd23c6..18983f55353 100644
--- a/intern/cycles/render/session.h
+++ b/intern/cycles/render/session.h
@@ -107,13 +107,15 @@ public:
void wait();
bool ready_to_reset();
- void reset(int w, int h);
+ void reset(int w, int h, int passes);
+ void set_passes(int passes);
protected:
struct DelayedReset {
thread_mutex mutex;
bool do_reset;
int w, h;
+ int passes;
} delayed_reset;
void run();
@@ -123,15 +125,15 @@ protected:
void tonemap();
void path_trace(Tile& tile);
- void reset_(int w, int h);
+ void reset_(int w, int h, int passes);
void run_cpu();
bool draw_cpu(int w, int h);
- void reset_cpu(int w, int h);
+ void reset_cpu(int w, int h, int passes);
void run_gpu();
bool draw_gpu(int w, int h);
- void reset_gpu(int w, int h);
+ void reset_gpu(int w, int h, int passes);
TileManager tile_manager;
bool device_use_gl;