[Bf-blender-cvs] [926519cdee] soc-2016-cycles_denoising: Cycles Denoising: Fix sample scaling for cross-denoising passes
Lukas Stockner
noreply at git.blender.org
Wed Feb 1 05:19:21 CET 2017
Commit: 926519cdee5269173ee515391bc963de81da8140
Author: Lukas Stockner
Date: Sun Jan 29 04:18:55 2017 +0100
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rB926519cdee5269173ee515391bc963de81da8140
Cycles Denoising: Fix sample scaling for cross-denoising passes
===================================================================
M intern/cycles/render/buffers.cpp
===================================================================
diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp
index dda07697be..8f00ea625f 100644
--- a/intern/cycles/render/buffers.cpp
+++ b/intern/cycles/render/buffers.cpp
@@ -240,13 +240,19 @@ bool RenderBuffers::get_denoising_rect(int type, float exposure, int sample, int
}
if(read_pixels) {
- scale = sample;
+ if(type == DENOISING_PASS_NOISY_B || type == DENOISING_PASS_NOISY_B_VAR) {
+ scale = sample/2;
+ }
+ else {
+ scale = sample;
+ }
}
int pass_offset = params.get_denoise_offset() + type_offset;
+ int pass_stride = params.get_passes_size();
+ assert(pass_offset + components <= pass_stride);
float *in = (float*)buffer.data_pointer + pass_offset;
- int pass_stride = params.get_passes_size();
in += params.width*params.height*pass_stride * frame;
if(components == 1) {
More information about the Bf-blender-cvs
mailing list