Commit: aa2cff450914c945b6038b6413c2c0d951b0b0ea
Author: Sergey Sharybin
Date:   Fri Apr 21 11:50:35 2017 +0200
Branches: master
https://developer.blender.org/rBaa2cff450914c945b6038b6413c2c0d951b0b0ea

Cycles: Fix regression in SSS rendering after principled commit

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

M       intern/cycles/kernel/kernel_subsurface.h

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

diff --git a/intern/cycles/kernel/kernel_subsurface.h 
b/intern/cycles/kernel/kernel_subsurface.h
index 17b3cf033a1..fb4a054dcd0 100644
--- a/intern/cycles/kernel/kernel_subsurface.h
+++ b/intern/cycles/kernel/kernel_subsurface.h
@@ -162,7 +162,9 @@ ccl_device void 
subsurface_scatter_setup_diffuse_bsdf(ShaderData *sd, ShaderClos
                                bsdf->type = CLOSURE_BSDF_BSSRDF_PRINCIPLED_ID;
                        }
                }
-               else if(CLOSURE_IS_BSSRDF(bssrdf->type)) {
+               else if(CLOSURE_IS_BSDF_BSSRDF(bssrdf->type) ||
+                       CLOSURE_IS_BSSRDF(bssrdf->type))
+               {
                        DiffuseBsdf *bsdf = (DiffuseBsdf*)bsdf_alloc(sd, 
sizeof(DiffuseBsdf), weight);
 
                        if(bsdf) {

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to