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/kernel/kernel.cpp | |
| 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/kernel/kernel.cpp')
| -rw-r--r-- | intern/cycles/kernel/kernel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel.cpp b/intern/cycles/kernel/kernel.cpp index 01682d11f33..7e5fa25c662 100644 --- a/intern/cycles/kernel/kernel.cpp +++ b/intern/cycles/kernel/kernel.cpp @@ -269,16 +269,16 @@ void kernel_tex_copy(KernelGlobals *kg, const char *name, device_ptr mem, size_t /* Path Tracing */ -void kernel_cpu_path_trace(KernelGlobals *kg, float4 *buffer, unsigned int *rng_state, int pass, int x, int y) +void kernel_cpu_path_trace(KernelGlobals *kg, float4 *buffer, unsigned int *rng_state, int sample, int x, int y) { - kernel_path_trace(kg, buffer, rng_state, pass, x, y); + kernel_path_trace(kg, buffer, rng_state, sample, x, y); } /* Tonemapping */ -void kernel_cpu_tonemap(KernelGlobals *kg, uchar4 *rgba, float4 *buffer, int pass, int resolution, int x, int y) +void kernel_cpu_tonemap(KernelGlobals *kg, uchar4 *rgba, float4 *buffer, int sample, int resolution, int x, int y) { - kernel_film_tonemap(kg, rgba, buffer, pass, resolution, x, y); + kernel_film_tonemap(kg, rgba, buffer, sample, resolution, x, y); } /* Displacement */ |