From e1bca6cfc4ce2a530ca9bdc59daef163d2691d57 Mon Sep 17 00:00:00 2001 From: Lukas Toenne Date: Sun, 2 Sep 2012 15:41:35 +0000 Subject: [PATCH] Fixed a number of OSL syntax errors from the updated 1.2 API. Microfacet functions now all take an eta parameter, set to 1.0 if no IOR is given. --- intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl | 4 ++-- intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl | 4 ++-- intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl b/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl index cc2104af56f..52743669c99 100644 --- a/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl +++ b/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl @@ -34,8 +34,8 @@ shader node_glass_bsdf( if(distribution == "Sharp") BSDF = Color*(Fr*reflection(Normal) + (1.0-Fr)*refraction(Normal, eta)); else if(distribution == "Beckmann") - BSDF = Color*(Fr*microfacet_beckmann(Normal, Roughness) + (1.0-Fr)*microfacet_beckmann_refraction(Normal, Roughness, eta)); + BSDF = Color*(Fr*microfacet_beckmann(Normal, Roughness, eta) + (1.0-Fr)*microfacet_beckmann_refraction(Normal, Roughness, eta)); else if(distribution == "GGX") - BSDF = Color*(Fr*microfacet_ggx(Normal, Roughness) + (1.0-Fr)*microfacet_ggx_refraction(Normal, Roughness, eta)); + BSDF = Color*(Fr*microfacet_ggx(Normal, Roughness, eta) + (1.0-Fr)*microfacet_ggx_refraction(Normal, Roughness, eta)); } diff --git a/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl b/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl index aa446b66cfb..3890630e8a2 100644 --- a/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl +++ b/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl @@ -29,9 +29,9 @@ shader node_glossy_bsdf( if(distribution == "Sharp") BSDF = Color*reflection(Normal); else if(distribution == "Beckmann") - BSDF = Color*microfacet_beckmann(Normal, Roughness); + BSDF = Color*microfacet_beckmann(Normal, Roughness, 1.0); else if(distribution == "GGX") - BSDF = Color*microfacet_ggx(Normal, Roughness); + BSDF = Color*microfacet_ggx(Normal, Roughness, 1.0); } diff --git a/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl b/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl index 7a336c148db..5e0cae8cbd1 100644 --- a/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl +++ b/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl @@ -27,6 +27,6 @@ shader node_velvet_bsdf( { float sigma = clamp(Sigma, 0.0, 1.0); - BSDF = Color*ashikhmin_velvet(Normal, sigma); + BSDF = Color*ashikhmin_velvet(Normal, sigma, 1.0); }