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/buffers.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/render/buffers.cpp')
| -rw-r--r-- | intern/cycles/render/buffers.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp index 62dc17960ae..acdddb475d0 100644 --- a/intern/cycles/render/buffers.cpp +++ b/intern/cycles/render/buffers.cpp @@ -85,7 +85,7 @@ void RenderBuffers::reset(Device *device, int width_, int height_) device->mem_copy_to(rng_state); } -float4 *RenderBuffers::copy_from_device(float exposure, int pass) +float4 *RenderBuffers::copy_from_device(float exposure, int sample) { if(!buffer.device_pointer) return NULL; @@ -94,7 +94,7 @@ float4 *RenderBuffers::copy_from_device(float exposure, int pass) float4 *out = new float4[width*height]; float4 *in = (float4*)buffer.data_pointer; - float scale = 1.0f/(float)pass; + float scale = 1.0f/(float)sample; for(int i = width*height - 1; i >= 0; i--) { float4 rgba = in[i]*scale; |