diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-13 13:36:24 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-13 13:36:24 +0300 |
| commit | 224edde807d76dcccfdb2b204cfa1739d544eca0 (patch) | |
| tree | 034b5e1afecc9473d2932010b88bc8c642f9fe59 /intern/cycles/kernel/shaders/node_glass_bsdf.osl | |
| parent | af2d39d902c0e302a32b979a8d47ff8e067c0d65 (diff) | |
| parent | 617c4d6adbfe64b3a72b5c48f918f39d30aa18dc (diff) | |
Merge branch 'master' into custom-normals-bmeshcustom-normals-bmesh
Diffstat (limited to 'intern/cycles/kernel/shaders/node_glass_bsdf.osl')
| -rw-r--r-- | intern/cycles/kernel/shaders/node_glass_bsdf.osl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/shaders/node_glass_bsdf.osl b/intern/cycles/kernel/shaders/node_glass_bsdf.osl index 68bc107cc5e..8fd0a2fd714 100644 --- a/intern/cycles/kernel/shaders/node_glass_bsdf.osl +++ b/intern/cycles/kernel/shaders/node_glass_bsdf.osl @@ -19,7 +19,7 @@ shader node_glass_bsdf( color Color = 0.8, - string distribution = "Sharp", + string distribution = "sharp", float Roughness = 0.2, float IOR = 1.45, normal Normal = N, @@ -30,9 +30,9 @@ shader node_glass_bsdf( float cosi = dot(I, Normal); float Fr = fresnel_dielectric_cos(cosi, eta); - if (distribution == "Sharp") + if (distribution == "sharp") BSDF = Color * (Fr * reflection(Normal) + (1.0 - Fr) * refraction(Normal, eta)); - else if (distribution == "Beckmann") + else if (distribution == "beckmann") BSDF = Color * (Fr * microfacet_beckmann(Normal, Roughness) + (1.0 - Fr) * microfacet_beckmann_refraction(Normal, Roughness, eta)); else if (distribution == "GGX") |