[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47521] trunk/blender/intern/cycles/kernel /osl/nodes: Cycles / OSL:

[Thomas Dinges]

Revision: 47521
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47521
Author:   dingto
Date:     2012-06-06 16:00:21 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
Cycles / OSL:
* Fixes for some silly typos in the checker shader.
* Added missing GPL licence block to node_fresnel.h.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/osl/nodes/node_checker_texture.osl
    trunk/blender/intern/cycles/kernel/osl/nodes/node_fresnel.h

Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_checker_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_checker_texture.osl	2012-06-06 14:48:39 UTC (rev 47520)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_checker_texture.osl	2012-06-06 16:00:21 UTC (rev 47521)
@@ -23,13 +23,13 @@
 
 float checker(point p)
 {
-	p[0] = (p[0] + 0.00001)*0.9999);
-	p[1] = (p[1] + 0.00001)*0.9999);
-	p[2] = (p[2] + 0.00001)*0.9999);
+	p[0] = (p[0] + 0.00001)*0.9999;
+	p[1] = (p[1] + 0.00001)*0.9999;
+	p[2] = (p[2] + 0.00001)*0.9999;
 	
-	int xi = fabs(floor(p[0]));
-	int yi = fabs(floor(p[1]));
-	int zi = fabs(floor(p[2]));
+	int xi = (int)fabs(floor(p[0]));
+	int yi = (int)fabs(floor(p[1]));
+	int zi = (int)fabs(floor(p[2]));
 
 	if((xi % 2 == yi % 2) == (zi % 2)) {
 		return 1.0;

Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_fresnel.h
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_fresnel.h	2012-06-06 14:48:39 UTC (rev 47520)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_fresnel.h	2012-06-06 16:00:21 UTC (rev 47521)
@@ -1,4 +1,19 @@
-
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+ 
 float fresnel_dielectric(vector Incoming, normal Normal, float eta)
 {
 	/* compute fresnel reflectance without explicitly computing