Commit: 17724e9d2dbffb1aaa61401224ecbf2349c1dac3
Author: Pascal Schoen
Date: Tue Jan 24 09:59:58 2017 +0100
Branches: cycles_disney_brdf
https://developer.blender.org/rB17724e9d2dbffb1aaa61401224ecbf2349c1dac3
Merge branch 'master' into cycles_disney_brdf
===================================================================
===================================================================
diff --cc intern/cycles/kernel/closure/bsdf_microfacet.h
index 9f5a8d03bd,4a1316fd2a..b74e8ab97c
--- a/intern/cycles/kernel/closure/bsdf_microfacet.h
+++ b/intern/cycles/kernel/closure/bsdf_microfacet.h
@@@ -585,16 -489,7 +587,18 @@@ ccl_device int bsdf_microfacet_ggx_samp
/* some high number for MIS */
*pdf = 1e6f;
*eval = make_float3(1e6f, 1e6f,
1e6f);
+
+ bool use_fresnel = (bsdf->type
== CLOSURE_BSDF_MICROFACET_GGX_FRESNEL_ID
+ ||
bsdf->type == CLOSURE_BSDF_MICROFACET_GGX_CLEARCOAT_ID
+ ||
bsdf->type == CLOSURE_BSDF_MICROFACET_GGX_ANISO_FRESNEL_ID);
+
+ /* if fresnel is used,
calculate the color with reflection_color(...) */
+ if(use_fresnel) {
+ *pdf = 1.0f;
+ *eval =
reflection_color(bsdf, *omega_in, m);
+ }
++
+ label = LABEL_REFLECT |
LABEL_SINGULAR;
}
else {
/* microfacet normal is visible
to this ray */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
