diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-16 17:14:02 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-16 17:14:02 +0400 |
commit | 66b1dfae89cc44953bd51c5da962cab437e76972 (patch) | |
tree | e7679b3e554fb4f1bb6f68775c8619bcde0da822 /intern/cycles/render/session.h | |
parent | 0a5fcf3da3e82fd114095c8c2903d927f15ffc31 (diff) |
Cycles: tweaks to properties and nodes
* Passes renamed to samples
* Camera lens radius renamed to aperature size/blades/rotation
* Glass and fresnel nodes input is now index of refraction
* Glossy and velvet fresnel socket removed
* Mix/add closure node renamed to mix/add shader node
* Blend weight node added for shader mixing weights
There is some version patching code for reading existing files, but it's not
perfect, so shaders may work a bit different.
Diffstat (limited to 'intern/cycles/render/session.h')
-rw-r--r-- | intern/cycles/render/session.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h index 4d5cf434098..82c14227d03 100644 --- a/intern/cycles/render/session.h +++ b/intern/cycles/render/session.h @@ -43,7 +43,7 @@ public: string output_path; bool progressive; - int passes; + int samples; int tile_size; int min_size; int threads; @@ -59,7 +59,7 @@ public: output_path = ""; progressive = false; - passes = INT_MAX; + samples = INT_MAX; tile_size = 64; min_size = 64; threads = 0; @@ -73,7 +73,7 @@ public: { return !(device_type == params.device_type && background == params.background && output_path == params.output_path - /* && passes == params.passes */ + /* && samples == params.samples */ && progressive == params.progressive && tile_size == params.tile_size && min_size == params.min_size @@ -97,7 +97,7 @@ public: DisplayBuffer *display; Progress progress; SessionParams params; - int pass; + int sample; Session(const SessionParams& params); ~Session(); @@ -107,8 +107,8 @@ public: void wait(); bool ready_to_reset(); - void reset(int w, int h, int passes); - void set_passes(int passes); + void reset(int w, int h, int samples); + void set_samples(int samples); void set_pause(bool pause); protected: @@ -116,7 +116,7 @@ protected: thread_mutex mutex; bool do_reset; int w, h; - int passes; + int samples; } delayed_reset; void run(); @@ -126,15 +126,15 @@ protected: void tonemap(); void path_trace(Tile& tile); - void reset_(int w, int h, int passes); + void reset_(int w, int h, int samples); void run_cpu(); bool draw_cpu(int w, int h); - void reset_cpu(int w, int h, int passes); + void reset_cpu(int w, int h, int samples); void run_gpu(); bool draw_gpu(int w, int h); - void reset_gpu(int w, int h, int passes); + void reset_gpu(int w, int h, int samples); TileManager tile_manager; bool device_use_gl; |