[Bf-blender-cvs] [5d4b4da] cycles_disney_bsdf_transmittance: Merge branch 'cycles_disney_brdf' into cycles_disney_bsdf_transmittance

[Pascal Schoen]

Commit: 5d4b4da1843bda21ff5a14ba996813d775f2bf80
Author: Pascal Schoen
Date:   Fri Dec 2 13:56:23 2016 +0100
Branches: cycles_disney_bsdf_transmittance
https://developer.blender.org/rB5d4b4da1843bda21ff5a14ba996813d775f2bf80

Merge branch 'cycles_disney_brdf' into cycles_disney_bsdf_transmittance

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



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

diff --cc intern/cycles/kernel/closure/bsdf.h
index 4f8180a,b46f6a7..41ea786
--- a/intern/cycles/kernel/closure/bsdf.h
+++ b/intern/cycles/kernel/closure/bsdf.h
@@@ -88,9 -88,11 +88,12 @@@ ccl_device_forceinline int bsdf_sample(
  				eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
  			break;
  		case CLOSURE_BSDF_MICROFACET_GGX_ID:
+ 		case CLOSURE_BSDF_MICROFACET_GGX_FRESNEL_ID:
+ 		case CLOSURE_BSDF_MICROFACET_GGX_CLEARCOAT_ID:
  		case CLOSURE_BSDF_MICROFACET_GGX_ANISO_ID:
+ 		case CLOSURE_BSDF_MICROFACET_GGX_ANISO_FRESNEL_ID:
  		case CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_ID:
 +		case CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_THIN_ID:
  			label = bsdf_microfacet_ggx_sample(kg, sc, ccl_fetch(sd, Ng), ccl_fetch(sd, I), ccl_fetch(sd, dI).dx, ccl_fetch(sd, dI).dy, randu, randv,
  				eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
  			break;
@@@ -205,9 -204,11 +210,12 @@@ float3 bsdf_eval(KernelGlobals *kg
  				eval = bsdf_transparent_eval_reflect(sc, ccl_fetch(sd, I), omega_in, pdf);
  				break;
  			case CLOSURE_BSDF_MICROFACET_GGX_ID:
+ 			case CLOSURE_BSDF_MICROFACET_GGX_FRESNEL_ID:
+ 			case CLOSURE_BSDF_MICROFACET_GGX_CLEARCOAT_ID:
  			case CLOSURE_BSDF_MICROFACET_GGX_ANISO_ID:
+ 			case CLOSURE_BSDF_MICROFACET_GGX_ANISO_FRESNEL_ID:
  			case CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_ID:
 +			case CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_THIN_ID:
  				eval = bsdf_microfacet_ggx_eval_reflect(sc, ccl_fetch(sd, I), omega_in, pdf);
  				break;
  			case CLOSURE_BSDF_MICROFACET_MULTI_GGX_ID:
@@@ -285,9 -284,11 +295,12 @@@
  				eval = bsdf_transparent_eval_transmit(sc, ccl_fetch(sd, I), omega_in, pdf);
  				break;
  			case CLOSURE_BSDF_MICROFACET_GGX_ID:
+ 			case CLOSURE_BSDF_MICROFACET_GGX_FRESNEL_ID:
+ 			case CLOSURE_BSDF_MICROFACET_GGX_CLEARCOAT_ID:
  			case CLOSURE_BSDF_MICROFACET_GGX_ANISO_ID:
+ 			case CLOSURE_BSDF_MICROFACET_GGX_ANISO_FRESNEL_ID:
  			case CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_ID:
 +			case CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_THIN_ID:
  				eval = bsdf_microfacet_ggx_eval_transmit(sc, ccl_fetch(sd, I), omega_in, pdf);
  				break;
  			case CLOSURE_BSDF_MICROFACET_MULTI_GGX_ID:
@@@ -356,9 -357,11 +373,12 @@@ ccl_device void bsdf_blur(KernelGlobal
  			bsdf_microfacet_multi_ggx_blur(sc, roughness);
  			break;
  		case CLOSURE_BSDF_MICROFACET_GGX_ID:
+ 		case CLOSURE_BSDF_MICROFACET_GGX_FRESNEL_ID:
+ 		case CLOSURE_BSDF_MICROFACET_GGX_CLEARCOAT_ID:
  		case CLOSURE_BSDF_MICROFACET_GGX_ANISO_ID:
+ 		case CLOSURE_BSDF_MICROFACET_GGX_ANISO_FRESNEL_ID:
  		case CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_ID:
 +		case CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_THIN_ID:
  			bsdf_microfacet_ggx_blur(sc, roughness);
  			break;
  		case CLOSURE_BSDF_MICROFACET_BECKMANN_ID:
@@@ -391,11 -394,15 +411,16 @@@ ccl_device bool bsdf_merge(ShaderClosur
  		case CLOSURE_BSDF_REFLECTION_ID:
  		case CLOSURE_BSDF_REFRACTION_ID:
  		case CLOSURE_BSDF_MICROFACET_GGX_ID:
+ 		case CLOSURE_BSDF_MICROFACET_GGX_FRESNEL_ID:
+ 		case CLOSURE_BSDF_MICROFACET_GGX_CLEARCOAT_ID:
  		case CLOSURE_BSDF_MICROFACET_GGX_ANISO_ID:
+ 		case CLOSURE_BSDF_MICROFACET_GGX_ANISO_FRESNEL_ID:
  		case CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_ID:
 +		case CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_THIN_ID:
  		case CLOSURE_BSDF_MICROFACET_MULTI_GGX_ID:
+ 		case CLOSURE_BSDF_MICROFACET_MULTI_GGX_FRESNEL_ID:
  		case CLOSURE_BSDF_MICROFACET_MULTI_GGX_GLASS_ID:
+ 		case CLOSURE_BSDF_MICROFACET_MULTI_GGX_GLASS_FRESNEL_ID:
  		case CLOSURE_BSDF_MICROFACET_BECKMANN_ID:
  		case CLOSURE_BSDF_MICROFACET_BECKMANN_ANISO_ID:
  		case CLOSURE_BSDF_MICROFACET_BECKMANN_REFRACTION_ID: