Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-08-28 19:15:08 +02:00
parent 55263c8a4c 9fd0060c0f
commit 871b7ba892
71 changed files with 732 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/render/buffers.cpp
View File

@@ -160,7 +160,7 @@ bool RenderBuffers::get_denoising_pass_rect(int offset, float exposure, int samp
(offset == DENOISING_PASS_DEPTH_VAR) ||
(offset == DENOISING_PASS_COLOR_VAR);
if(offset == DENOISING_PASS_COLOR) {
if(offset == DENOISING_PASS_COLOR || offset == DENOISING_PASS_CLEAN) {
scale *= exposure;
}
else if(offset == DENOISING_PASS_COLOR_VAR) {