[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50319] trunk/blender/intern/cycles/kernel /osl/nodes: Fixed a number of OSL syntax errors from the updated 1.2 API.

[Lukas Toenne]

Revision: 50319
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50319
Author:   lukastoenne
Date:     2012-09-02 15:41:35 +0000 (Sun, 02 Sep 2012)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
    trunk/blender/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl
    trunk/blender/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl

Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl	2012-09-02 15:26:13 UTC (rev 50318)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl	2012-09-02 15:41:35 UTC (rev 50319)
@@ -34,8 +34,8 @@
 	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));
 }
 

Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl	2012-09-02 15:26:13 UTC (rev 50318)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl	2012-09-02 15:41:35 UTC (rev 50319)
@@ -29,9 +29,9 @@
 	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);
 
 }
 

Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl	2012-09-02 15:26:13 UTC (rev 50318)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl	2012-09-02 15:41:35 UTC (rev 50319)
@@ -27,6 +27,6 @@
 {
 	float sigma = clamp(Sigma, 0.0, 1.0);
 
-	BSDF = Color*ashikhmin_velvet(Normal, sigma);
+	BSDF = Color*ashikhmin_velvet(Normal, sigma, 1.0);
 }