[Bf-blender-cvs] [7feef16] soc-2016-cycles_denoising: Cycles: Fix Denoising feature pass generation when using OSL

Lukas Stockner noreply at git.blender.org
Sun Jul 24 03:46:01 CEST 2016


Commit: 7feef16b0dd28aacb23a1d9ca3683b1e878b2277
Author: Lukas Stockner
Date:   Sun Jul 24 02:05:01 2016 +0200
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rB7feef16b0dd28aacb23a1d9ca3683b1e878b2277

Cycles: Fix Denoising feature pass generation when using OSL

===================================================================

M	intern/cycles/kernel/osl/osl_shader.cpp

===================================================================

diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/osl_shader.cpp
index 6cde741..52e4c03 100644
--- a/intern/cycles/kernel/osl/osl_shader.cpp
+++ b/intern/cycles/kernel/osl/osl_shader.cpp
@@ -202,6 +202,7 @@ static void flatten_surface_closure_tree(ShaderData *sd, int path_flag,
 						sc.data1 = bsdf->sc.data1;
 						sc.data2 = bsdf->sc.data2;
 						sc.prim = bsdf->sc.prim;
+						sc.roughness = bsdf->sc.roughness;
 						if(shaderdata_flag & SD_BSDF_HAS_CUSTOM) {
 							sc.custom1 = bsdf->sc.custom1;
 							sc.custom2 = bsdf->sc.custom2;




More information about the Bf-blender-cvs mailing list