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@gmail.com>2019-03-11 16:34:17 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-03-11 16:34:17 +0300
commitf60896454929080ae775a7143c30722788ab83df (patch)
tree33accd750fb55f00b33730c5bb601254799fd369 /intern/cycles/render/buffers.cpp
parent403ae48063d91126bd36ca56920290bcb53f504e (diff)
parent2c8bd1d8cb6dc0f1a182d77c6b8283b25a01f1eb (diff)
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/render/buffers.cpp')
-rw-r--r--intern/cycles/render/buffers.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp
index 0a60fcec096..678105aeeb1 100644
--- a/intern/cycles/render/buffers.cpp
+++ b/intern/cycles/render/buffers.cpp
@@ -184,6 +184,7 @@ bool RenderBuffers::get_denoising_pass_rect(int type, float exposure, int sample
if(type == DENOISING_PASS_CLEAN) {
/* The clean pass isn't changed by prefiltering, so we use the original one there. */
offset = type + params.get_denoising_offset();
+ scale /= sample;
}
else if (type == DENOISING_PASS_PREFILTERED_COLOR && !params.denoising_prefiltered_pass) {
/* If we're not saving the prefiltering result, return the original noisy pass. */